| # 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. |
| |
| LBL_Merge.failed.title=\u65e0\u6cd5\u5408\u5e76 |
| LBL_MergeRevisionAction_Name=\u5408\u5e76\u4fee\u8ba2(&M)... |
| LBL_MergeRevisionAction_PopupName=\u5408\u5e76\u4fee\u8ba2... |
| LBL_MergeRevisionAction.progressName=\u6b63\u5728\u5408\u5e76\u5230 HEAD |
| MSG_Merge.failed.aborted.text=\u5408\u5e76\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u5e76\u4e14\u4e0d\u80fd\u662f\u5feb\u901f\u5411\u524d\u5408\u5e76\u3002\n\n\u662f\u5426\u8981\u91cd\u65b0\u542f\u52a8\u5408\u5e76\u4e14\u5141\u8bb8\u5408\u5e76\u63d0\u4ea4 (--ff \u9009\u9879)? |
| MSG_MergeRevisionAction.result=\u5408\u5e76\u7ed3\u679c: {0}\n |
| MSG_MergeRevisionAction.result.alreadyUpToDate=HEAD \u5df2\u5305\u542b\u4fee\u8ba2{0} |
| MSG_MergeRevisionAction.result.fastForward=\u5c06 HEAD \u4e0e{0}\u5408\u5e76:\n |
| MSG_MergeRevisionAction.result.merged=\u5c06 HEAD \u4e0e{0}\u5408\u5e76:\n |
| MSG_MergeRevisionAction.result.conflict=\u5c06 HEAD \u4e0e{0}\u5408\u5e76\u65f6, \u5c06\u5728\u4ee5\u4e0b\u4f4d\u7f6e\u4ea7\u751f\u51b2\u7a81:\n |
| MSG_MergeRevisionAction.result.failed=\u65e0\u6cd5\u5c06 HEAD \u4e0e{0}\u5408\u5e76\u3002\u6709\u5173\u66f4\u591a\u4fe1\u606f, \u8bf7\u53c2\u89c1\u8f93\u51fa\u3002 |
| MSG_MergeRevisionAction.result.failedFiles=\u7531\u4e8e\u4ee5\u4e0b\u6587\u4ef6, \u65e0\u6cd5\u5c06 HEAD \u4e0e{0}\u5408\u5e76:\n |
| MSG_MergeRevisionAction.result.aborted=\u5408\u5e76 HEAD \u548c{0}\u5931\u8d25, \u56e0\u4e3a\u5b83\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u5e76\u4e14\u4ec5\u5141\u8bb8\u5feb\u901f\u5411\u524d\u5408\u5e76\u3002 |
| MSG_MergeRevisionAction.result.unsupported=\u4e0d\u652f\u6301\u5408\u5e76\u3002 |
| LBL_MergeRevision.OKButton.text=\u5408\u5e76(&G) |
| LBL_MergeRevision.title=\u5408\u5e76\u4fee\u8ba2 |
| MergeRevisionPanel.jLabel1.text=\u9009\u62e9\u8981\u5408\u5e76\u5230 HEAD \u4e2d\u7684\u4fee\u8ba2\u7248\u672c |
| MergeRevision.ffoption.ff=\u5982\u679c\u53ef\u80fd, \u8bf7\u4f7f\u7528\u5feb\u901f\u5411\u524d (--ff) |
| MergeRevision.ffoption.ff.tt=\u5982\u679c\u53ef\u80fd, \u5408\u5e76\u5c06\u4e0d\u4f1a\u521b\u5efa\u65b0\u63d0\u4ea4, \u800c\u4f1a\u5c06\u5206\u652f\u79fb\u81f3\u5408\u5e76\u63d0\u4ea4\u3002 |
| MergeRevision.ffoption.ffonly=\u4ec5\u5feb\u901f\u5411\u524d (--ff-only) |
| MergeRevision.ffoption.ffonly.tt=\u5982\u679c\u9700\u8981\u5408\u5e76\u63d0\u4ea4, \u5408\u5e76\u5c06\u5931\u8d25 (\u4e24\u4e2a\u5206\u652f\u5404\u6709\u81ea\u5df1\u7684\u63d0\u4ea4) |
| MergeRevision.ffoption.noff=\u59cb\u7ec8\u521b\u5efa\u63d0\u4ea4 (--no-ff) |
| MergeRevision.ffoption.noff.tt=\u5408\u5e76\u5c06\u59cb\u7ec8\u521b\u5efa\u5408\u5e76\u63d0\u4ea4, \u8fd9\u9002\u7528\u4e8e\u5408\u5e76\u529f\u80fd\u5206\u652f\u3002 |
| MergeRevisionPanel.ffModePanel.text=\u9009\u62e9\u5feb\u901f\u5411\u524d\u6a21\u5f0f |
| |
