| # 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 2010 Sun Microsystems, Inc. |
| |
| #MarkResolvedAction |
| LBL_MarkResolvedAction_Name=\u89e3\u6c7a\u3068\u30de\u30fc\u30af(&M) |
| LBL_MarkResolvedAction_PopupName=\u89e3\u6c7a\u3068\u30de\u30fc\u30af |
| LBL_MarkingProgress=\u89e3\u6c7a\u6e08\u3068\u3057\u3066\u30de\u30fc\u30af |
| LBL_NoConflicts=\u7af6\u5408\u306a\u3057 |
| LBL_ResolveAllConflictsAction_Name=\u3059\u3079\u3066\u306e\u7af6\u5408\u3092\u89e3\u6c7a - \u30ea\u30dd\u30b8\u30c8\u30ea |
| LBL_ResolveConflictsAction_Name=\u7af6\u5408\u3092\u89e3\u6c7a(&F) |
| MSG_NoConflicts=\u9078\u629e\u3055\u308c\u305f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u89e3\u6c7a\u3059\u3079\u304d\u7af6\u5408\u306f\u3042\u308a\u307e\u305b\u3093\u3002 |
| |
| LBL_ResolveConflictsAction_PopupName=\u7af6\u5408\u3092\u89e3\u6c7a |
| MSG_PreparingMerge=\u30de\u30fc\u30b8\u3092\u6e96\u5099\u3057\u3066\u3044\u307e\u3059 |
| |
| #ResolveConflictsExecutor |
| Merge.titleResult=\u30de\u30fc\u30b8\u5f8c\u306e\u7d50\u679c |
| Diff.titleWorkingFile=\u30ed\u30fc\u30ab\u30eb\u4f5c\u696d\u30d5\u30a1\u30a4\u30eb |
| LBL_TreeConflict_ResolveButton.title=\u89e3\u6c7a |
| LBL_TreeConflict.title=\u30c4\u30ea\u30fc\u306e\u7af6\u5408\u3092\u89e3\u6c7a\u3057\u3066\u3044\u307e\u3059 |
| |
| |
| ResolveTreeConflictPanel.jLabel1.text=\u89e3\u6c7a\u51e6\u7406\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044: |
| |
| ResolveTreeConflictPanel.rbRemove.text=\u7d22\u5f15\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664(&R) |
| ResolveTreeConflictPanel.rbRemove.TTtext=\u7d22\u5f15\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6b21\u56de\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u3068\u304d\u306b\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u524a\u9664\u3055\u308c\u307e\u3059\u3002 |
| ResolveTreeConflictPanel.rbAdd.text=\u73fe\u5728\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u3092\u7dad\u6301(&K) |
| ResolveTreeConflictPanel.rbAdd.toolTipText=\u73fe\u5728\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u72b6\u614b\u3092\u7d22\u5f15\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6b21\u56de\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u3068\u304d\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u6b8b\u308a\u307e\u3059\u3002 |
| |
| MSG_ResolveTreeConflictPanel.file.text=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u30c4\u30ea\u30fc\u306e\u7af6\u5408\u306e\u72b6\u614b\u3067\u3059 |
| |
| |
