| # 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=\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3(&M) |
| LBL_MarkResolvedAction_PopupName=\u89e3\u6790\u6807\u8bb0 |
| LBL_MarkingProgress=\u6b63\u5728\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3 |
| LBL_NoConflicts=\u65e0\u51b2\u7a81 |
| LBL_ResolveAllConflictsAction_Name=\u89e3\u51b3\u6240\u6709\u51b2\u7a81 - \u8d44\u6e90\u5e93 |
| LBL_ResolveConflictsAction_Name=\u89e3\u51b3\u51b2\u7a81(&F) |
| MSG_NoConflicts=\u5728\u9009\u5b9a\u7684\u4e0a\u4e0b\u6587\u4e2d\u6ca1\u6709\u8981\u89e3\u51b3\u7684\u51b2\u7a81\u3002 |
| |
| LBL_ResolveConflictsAction_PopupName=\u89e3\u51b3\u51b2\u7a81 |
| MSG_PreparingMerge=\u6b63\u5728\u51c6\u5907\u5408\u5e76 |
| |
| #ResolveConflictsExecutor |
| Merge.titleResult=\u5408\u5e76\u540e\u7684\u7ed3\u679c |
| Diff.titleWorkingFile=\u672c\u5730\u5de5\u4f5c\u6587\u4ef6 |
| LBL_TreeConflict_ResolveButton.title=\u89e3\u51b3 |
| LBL_TreeConflict.title=\u89e3\u51b3\u6811\u51b2\u7a81 |
| |
| |
| ResolveTreeConflictPanel.jLabel1.text=\u8bf7\u9009\u62e9\u89e3\u51b3\u64cd\u4f5c: |
| |
| ResolveTreeConflictPanel.rbRemove.text=\u4ece\u7d22\u5f15\u4e2d\u5220\u9664\u6587\u4ef6(&R) |
| ResolveTreeConflictPanel.rbRemove.TTtext=\u5c06\u4ece\u7d22\u5f15\u4e2d\u5220\u9664\u6587\u4ef6\u3002\u4e0b\u6b21\u63d0\u4ea4\u65f6, \u5c06\u4ece\u8d44\u6e90\u5e93\u4e2d\u5220\u9664\u6587\u4ef6\u3002 |
| ResolveTreeConflictPanel.rbAdd.text=\u4fdd\u7559\u5f53\u524d\u6587\u4ef6\u7684\u5185\u5bb9(&K) |
| ResolveTreeConflictPanel.rbAdd.toolTipText=\u5c06\u5f53\u524d\u6587\u4ef6\u7684\u72b6\u6001\u6dfb\u52a0\u5230\u7d22\u5f15\u4e2d\u3002\u4e0b\u6b21\u63d0\u4ea4\u65f6, \u8be5\u6587\u4ef6\u5c06\u4fdd\u7559\u5728\u8d44\u6e90\u5e93\u4e2d |
| |
| MSG_ResolveTreeConflictPanel.file.text=\u6587\u4ef6{0}\u53d1\u751f\u6811\u51b2\u7a81 |
| |
| |