| # 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. |
| |
| ## libs/svnclientadapter/manifest.mf |
| OpenIDE-Module-Name=\u8fdc\u7a0b Git \u5ba2\u6237\u7aef\u5e93 |
| OpenIDE-Module-Display-Category=\u672c\u673a\u652f\u6301\u5de5\u5177 |
| OpenIDE-Module-Short-Description=\u8fdc\u7a0b Git \u5ba2\u6237\u7aef API |
| |
| #GitRepositoryState |
| LBL_RepositoryInfo_Bare = \u7a7a |
| LBL_RepositoryInfo_Safe = \u5b89\u5168 |
| LBL_RepositoryInfo_Merging = \u5408\u5e76 |
| LBL_RepositoryInfo_Merged = \u5df2\u5408\u5e76 |
| LBL_RepositoryInfo_Rebasing = \u91cd\u5b9a\u57fa\u5740 |
| LBL_RepositoryInfo_Apply = \u5e94\u7528 |
| LBL_RepositoryInfo_Bisecting = \u7b49\u5206 |
| LBL_RepositoryInfo_CherryPicking=\u6b63\u5728\u6311\u9009 |
| LBL_RepositoryInfo_CherryPickingResolved=\u5df2\u6311\u9009 |
| |
| #GitException |
| MSG_Exception_ObjectDoesNotExist = {0} [{1}] \u4e0d\u5b58\u5728 |
| MSG_Exception_CheckoutConflicts = \u5728\u68c0\u51fa\u671f\u95f4\u53d1\u751f\u51b2\u7a81 |
| |
| #GitConflictDescriptor |
| MSG_GitConflictDescriptor_BOTH_DELETED.desc = \u6587\u4ef6\u5df2\u5728\u6240\u6709\u5206\u652f\u4e2d\u5220\u9664 |
| MSG_GitConflictDescriptor_ADDED_BY_US.desc = \u5728\u5f53\u524d\u5206\u652f\u4e2d\u6dfb\u52a0\u4e86\u8be5\u6587\u4ef6 |
| MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = \u6587\u4ef6\u5df2\u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u5220\u9664 |
| MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = \u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u6dfb\u52a0\u4e86\u8be5\u6587\u4ef6 |
| MSG_GitConflictDescriptor_DELETED_BY_US.desc = \u5728\u5f53\u524d\u5206\u652f\u4e2d\u5220\u9664\u4e86\u8be5\u6587\u4ef6 |
| MSG_GitConflictDescriptor_BOTH_ADDED.desc = \u6587\u4ef6\u5df2\u6dfb\u52a0\u5230\u6240\u6709\u5206\u652f\u4e2d |
| MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = \u6587\u4ef6\u5df2\u5728\u6240\u6709\u5206\u652f\u4e2d\u4fee\u6539 |
| |
