| # 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. |
| |
| MSG_MERGE_PROGRESS = \u6b63\u5728\u5408\u4f75... |
| MSG_MERGE_TITLE = Mercurial \u5408\u4f75 |
| MSG_MERGE_TITLE_SEP = --------------- |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = INFO\uff1a\u6b64\u6aa2\u8996\u4e2d\u4e0d\u652f\u63f4\u5408\u4f75 |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = Mercurial \u5408\u4f75 |
| MSG_MERGE_NOT_SUPPORTED_INVIEW = \u6b64\u6aa2\u8996\u4e2d\u4e0d\u652f\u63f4\u5408\u4f75 |
| |
| MSG_NOTHING_TO_MERGE = \u6b64\u5c08\u6848\u6c92\u6709\u53ef\u5408\u4f75\u7684\u9805\u76ee\u3002 |
| |
| MSG_MERGE_INFO = \nINFO MERGE\uff1a\u5982\u4f55\u8a2d\u5b9a\u5408\u4f75\u652f\u63f4 |
| #MSG_MERGE_INFO_URL = http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram |
| MSG_MERGE_UNCOMMITTED = \u6709\u672a\u63d0\u4ea4\u7684\u8b8a\u66f4\u3002\n\n\u8acb\u5148\u63d0\u4ea4\u9019\u4e9b\u8b8a\u66f4\u4e4b\u5f8c\u518d\u57f7\u884c\u5176\u4ed6\u5408\u4f75\u3002 |
| MSG_MERGE_UNAVAILABLE = \u7cfb\u7d71\u4e0a\u672a\u8a2d\u5b9a\u5408\u4f75\u3002\n\n\u8acb\u53c3\u8003 [\u8f38\u51fa] \u8996\u7a97\u4e2d\u7684\u300c\u5408\u4f75\u652f\u63f4\u300d\u9023\u7d50\u3002 |
| MSG_MERGE_CONFLICT = INFO MERGE\uff1a\u885d\u7a81 - {0} |
| MSG_MERGE_DONE = INFO MERGE\uff1a\u5408\u4f75\u5df2\u5b8c\u6210 |
| MSG_MERGE_DONE_CONFLICTS = INFO MERGE\uff1a\u5075\u6e2c\u5230\u885d\u7a81\uff0c\u8acb\u624b\u52d5\u89e3\u6c7a\uff0c\u6216\u4f7f\u7528\u529f\u80fd\u8868\u6307\u4ee4\u300c\u89e3\u6c7a\u885d\u7a81\u300d |
| MSG_MERGE_WARN_MULTIPLE_HEADS = WARNING MERGE\uff1a\u5132\u5b58\u5eab\u6709 {0} \u500b\u8868\u982d\uff1a\u4fee\u8a02 {1} |
| MSG_MERGE_DONE_MULTIPLE_HEADS = INFO MERGE\uff1a\u8acb\u4f7f\u7528 hg merge [REV] \u4f86\u8207\u7279\u5b9a\u7684\u4fee\u8a02\u5408\u4f75 |
| MSG_MERGE_FAILED = WARNING MERGE\uff1a\u5408\u4f75\u5931\u6557 |
| |
| MSG_MERGE_WARN_NEEDED = WARNING MERGE\uff1a\u5132\u5b58\u5eab\u6709 2 \u500b\u8868\u982d\uff1a\u4fee\u8a02 {0} |
| MSG_MERGE_DO_NEEDED = INFO MERGE\uff1a\u82e5\u8981\u5408\u4f75\uff0c\u8acb\u4f7f\u7528\u529f\u80fd\u8868\u6307\u4ee4\u300c\u5408\u4f75\u300d |
| MSG_MERGE_WARN_TITLE = \u9700\u8981\u5408\u4f75 |
| MSG_MERGE_WARN_TEXT = \u5132\u5b58\u5eab\u6709\u591a\u91cd\u8868\u982d\uff0c\u9700\u8981\u5408\u4f75\n\u8acb\u57f7\u884c\u300c\u5408\u4f75\u300d\u4f86\u9032\u884c\u5408\u4f75 |
| MSG_MERGE_CHOOSE_REVISION = \u9078\u64c7\u4fee\u8a02(&R)\uff1a |
| |
| MSG_MERGE_REFRESHING_HEAD_VERSIONS = \u6b63\u5728\u91cd\u65b0\u6574\u7406\u8868\u982d\u7248\u672c |
| MSG_MERGE_HEAD_REVISION_DEFAULT = <\u7121\u4fee\u8a02> |
| |
| ASCD_MERGE_DIALOG=\u4f7f\u7528\u4fee\u8a02\u5408\u4f75 |
| |
| CTL_MergeForm_Action_Merge=\u5408\u4f75 |
| ACSD_MergeForm_Action_Merge=\u5408\u4f75 |
| CTL_MergeForm_Action_Cancel=\u53d6\u6d88 |
| ACSD_MergeForm_Action_Cancel=\u53d6\u6d88 |
| infoLabel.text = \u4f7f\u7528\u9078\u5b9a\u7684\u4fee\u8a02\u5408\u4f75\u5de5\u4f5c\u76ee\u9304\u7684\u5167\u5bb9 |
| infolabel2.text = (\u5408\u4f75\u4e4b\u5f8c\u5fc5\u9808\u57f7\u884c\u63d0\u4ea4) |
