You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by em...@apache.org on 2017/10/08 19:18:24 UTC
incubator-netbeans git commit: [NETBEANS-54] Module Review i18n
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 6175d325e -> 55d6e787c
[NETBEANS-54] Module Review i18n
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/55d6e787
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/55d6e787
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/55d6e787
Branch: refs/heads/master
Commit: 55d6e787c85ec3d00f5bf43ad0d7d07f0cc87a6c
Parents: 6175d32
Author: oktak <ok...@users.noreply.github.com>
Authored: Mon Oct 9 03:17:19 2017 +0800
Committer: Emilian Bold <em...@gmail.com>
Committed: Sun Oct 8 22:17:19 2017 +0300
----------------------------------------------------------------------
.../netbeans/modules/i18n/jsp/Bundle.properties | 48 ++++++--------------
.../modules/i18n/java/resources/JFrame.txt | 19 ++++++++
2 files changed, 33 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/55d6e787/i18n/src/org/netbeans/modules/i18n/jsp/Bundle.properties
----------------------------------------------------------------------
diff --git a/i18n/src/org/netbeans/modules/i18n/jsp/Bundle.properties b/i18n/src/org/netbeans/modules/i18n/jsp/Bundle.properties
index beeec9a..9f5a387 100644
--- a/i18n/src/org/netbeans/modules/i18n/jsp/Bundle.properties
+++ b/i18n/src/org/netbeans/modules/i18n/jsp/Bundle.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 (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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT 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):
# placeholder needed by i18n tool
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/55d6e787/i18n/test/unit/src/org/netbeans/modules/i18n/java/resources/JFrame.txt
----------------------------------------------------------------------
diff --git a/i18n/test/unit/src/org/netbeans/modules/i18n/java/resources/JFrame.txt b/i18n/test/unit/src/org/netbeans/modules/i18n/java/resources/JFrame.txt
index 9a737f7..15552d4 100644
--- a/i18n/test/unit/src/org/netbeans/modules/i18n/java/resources/JFrame.txt
+++ b/i18n/test/unit/src/org/netbeans/modules/i18n/java/resources/JFrame.txt
@@ -1,3 +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.
+ */
+
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.