| # 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. |
| |
| CTL_MenuItem_Merge=\u5408\u5e76\u66f4\u6539(&M) |
| ##MergeAction.java |
| MSG_MERGE_PROGRESS = \u6b63\u5728\u5408\u5e76... |
| MSG_MERGE_TITLE = Mercurial \u5408\u5e76 |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = \u4fe1\u606f: \u6b64\u89c6\u56fe\u4e0d\u652f\u6301\u5408\u5e76\u64cd\u4f5c |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = Mercurial \u5408\u5e76 |
| MSG_MERGE_NOT_SUPPORTED_INVIEW = \u6b64\u89c6\u56fe\u4e0d\u652f\u6301\u5408\u5e76\u64cd\u4f5c |
| |
| MSG_NOTHING_TO_MERGE = \u6b64\u9879\u76ee\u6ca1\u6709\u8981\u5408\u5e76\u7684\u5185\u5bb9\u3002 |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_INFO = \n\u4fe1\u606f: \u5408\u5e76: \u5982\u4f55\u8bbe\u7f6e\u5408\u5e76\u652f\u6301 |
| |
| MSG_MERGE_UNCOMMITTED = \u5b58\u5728\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u3002\n\n\u8bf7\u5728\u4e0b\u6b21\u6267\u884c\u5408\u5e76\u64cd\u4f5c\u524d\u5148\u63d0\u4ea4\u8fd9\u4e9b\u66f4\u6539\u3002 |
| MSG_MERGE_UNAVAILABLE = \u7cfb\u7edf\u4e2d\u672a\u8bbe\u7f6e\u5408\u5e76\u652f\u6301\u3002\n\n\u8bf7\u53c2\u9605\u201c\u8f93\u51fa\u201d\u7a97\u53e3\u4e2d\u7684\u5408\u5e76\u652f\u6301\u94fe\u63a5\u3002 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_CONFLICT = INFO MERGE: CONFLICT - {0} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DONE = \u4fe1\u606f: \u5408\u5e76: \u5408\u5e76\u5b8c\u6bd5 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DONE_CONFLICTS = \u4fe1\u606f: \u5408\u5e76: \u68c0\u6d4b\u5230\u51b2\u7a81, \u8bf7\u624b\u52a8\u89e3\u51b3, \u6216\u4f7f\u7528\u83dc\u5355\u547d\u4ee4 "\u89e3\u51b3\u51b2\u7a81" \u6765\u89e3\u51b3 |
| MSG_Merge.ConflictsCreated = \u5728\u5408\u5e76\u8fc7\u7a0b\u4e2d\u68c0\u6d4b\u5230\u51b2\u7a81, \u8bf7\u624b\u52a8\u89e3\u51b3\u6216\u4f7f\u7528\u83dc\u5355\u547d\u4ee4 "\u89e3\u51b3\u51b2\u7a81" |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_MULTIPLE_HEADS = \u8b66\u544a: \u5408\u5e76: \u8d44\u6e90\u5e93\u6709 {0} \u4e2a\u5934: \u4fee\u8ba2\u7248\u672c {1} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated. Do not translate "REV" |
| MSG_MERGE_DONE_MULTIPLE_HEADS = \u4fe1\u606f: \u5408\u5e76: \u8bf7\u4f7f\u7528 hg merge [REV] \u6765\u5408\u5e76\u7279\u5b9a\u7684\u4fee\u8ba2\u7248\u672c |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_FAILED = \u8b66\u544a: \u5408\u5e76: \u5408\u5e76\u5931\u8d25 |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_NEEDED = \u8b66\u544a: \u5408\u5e76: \u8d44\u6e90\u5e93\u6709 2 \u4e2a\u5934: \u4fee\u8ba2\u7248\u672c {0} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DO_NEEDED = \u4fe1\u606f: MERGE: \u8bf7\u4f7f\u7528\u83dc\u5355\u547d\u4ee4 "\u5408\u5e76" \u8fdb\u884c\u5408\u5e76 |
| MSG_MERGE_WARN_TITLE = \u9700\u8981\u5408\u5e76 |
| MSG_MERGE_WARN_TEXT = \u8d44\u6e90\u5e93\u6709\u591a\u4e2a\u5934, \u56e0\u6b64\u9700\u8981\u5c06\u5176\u5408\u5e76\n\u8bf7\u8fd0\u884c "\u5408\u5e76" \u6765\u6267\u884c\u5408\u5e76\u64cd\u4f5c |
| MSG_MERGE_CHOOSE_REVISION = \u4ece\u4fee\u8ba2\u7248\u672c\u4e2d\u9009\u62e9(&R): |
| |
| MSG_MERGE_REFRESHING_HEAD_VERSIONS = \u5237\u65b0\u5934\u7248\u672c |
| MSG_MERGE_HEAD_REVISION_DEFAULT = <\u65e0\u4fee\u8ba2> |
| |
| MSG_MERGE_NEEDED_BRANCHES = \u8d44\u6e90\u5e93\u5305\u542b\u5177\u6709\u591a\u4e2a\u5934\u7684\u5206\u652f\u3002\n\u662f\u5426\u8981\u67e5\u770b\u8fd9\u4e9b\u5206\u652f? |
| TITLE_MERGE_NEEDED_BRANCHES = \u9700\u8981\u5408\u5e76 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_NEEDED_BRANCHES = \u8b66\u544a: \u5408\u5e76: \u67d0\u4e9b\u8d44\u6e90\u5e93\u5206\u652f\u5177\u6709\u591a\u4e2a\u5934 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DO_NEEDED_BRANCHES = \u4fe1\u606f: \u5408\u5e76: \u5c06\u5207\u6362\u5408\u5e76\u5230\u5206\u652f\u5e76\u5408\u5e76\u8fd9\u4e9b\u5934\u3002 |
| MSG_MERGE_WARN_NEEDED_IN_BRANCH = \u5206\u652f{0}\u5177\u6709\u4ee5\u4e0b\u5934: |
| |
| ASCD_MERGE_DIALOG=\u5408\u5e76\u4fee\u8ba2 |
| |
| CTL_MergeForm_Action_Merge=\u5408\u5e76 |
| ACSD_MergeForm_Action_Merge=\u5408\u5e76 |
| CTL_MergeForm_Action_Cancel=\u53d6\u6d88 |
| ACSD_MergeForm_Action_Cancel=\u53d6\u6d88 |
| infoLabel.text = \u5408\u5e76\u5177\u6709\u9009\u5b9a\u4fee\u8ba2\u7248\u672c\u7684\u5de5\u4f5c\u76ee\u5f55\u5185\u5bb9 |
| infoLabel2.text = (\u5408\u5e76\u540e\u5fc5\u987b\u6267\u884c\u63d0\u4ea4\u64cd\u4f5c) |
| |
