| # 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. |
| |
| # mf-layer.xml |
| Services/MergeVisualizers=\u5408\u5e76\u53ef\u89c6\u5316\u7a97\u53e3 |
| |
| GraphicalMergeVisualizer.displayName=\u56fe\u5f62\u5316\u5408\u5e76\u51b2\u7a81\u89e3\u51b3\u7a0b\u5e8f |
| |
| |
| # GraphicalMergeVisualizerBeanInfo |
| PROP_colorUnresolvedConflict=\u672a\u89e3\u51b3\u51b2\u7a81\u7684\u6587\u672c\u7684\u989c\u8272 |
| HINT_colorUnresolvedConflict=\u672a\u89e3\u51b3\u51b2\u7a81\u7684\u6587\u672c\u7684\u80cc\u666f\u8272\u3002 |
| PROP_colorResolvedConflict=\u5e94\u7528\u5230\u89e3\u51b3\u51b2\u7a81\u4e2d\u7684\u6587\u672c\u7684\u989c\u8272 |
| HINT_colorResolvedConflict=\u5e94\u7528\u5230\u89e3\u51b3\u51b2\u7a81\u7684\u6587\u672c\u7684\u80cc\u666f\u8272 |
| PROP_colorOtherConflict=\u672a\u5e94\u7528\u5230\u89e3\u51b3\u51b2\u7a81\u4e2d\u7684\u6587\u672c\u7684\u989c\u8272 |
| HINT_colorOtherConflict=\u672a\u5e94\u7528\u5230\u89e3\u51b3\u51b2\u7a81\u4e2d\u7684\u6587\u672c\u7684\u80cc\u666f\u8272 |
| |
| # MergeDialogComponent |
| MergeDialogComponent.title=\u5408\u5e76\u51b2\u7a81\u89e3\u51b3\u7a0b\u5e8f |
| ACSN_Merge_Dialog_Component=\u51b2\u7a81\u89e3\u51b3\u7a0b\u5e8f\u7ec4\u4ef6 |
| ACSD_Merge_Dialog_Component=\u56fe\u5f62\u5316\u5408\u5e76\u51b2\u7a81\u89e3\u51b3\u7a0b\u5e8f\u3002 |
| ACSN_Merge_Tabbed_Pane=\u5177\u6709\u51b2\u7a81\u7684\u6587\u4ef6 |
| ACSD_Merge_Tabbed_Pane=\u5177\u6709\u51b2\u7a81\u7684\u6587\u4ef6\u7684\u6807\u7b7e\u3002 |
| |
| # MergePanel |
| MergePanel.nextButton.toolTipText=\u4e0b\u4e00\u4e2a\u5dee\u5f02 |
| MergePanel.prevButton.toolTipText=\u4e0a\u4e00\u4e2a\u5dee\u5f02 |
| # Status of conflicts resolving: |
| # {0} .. current conflict |
| # {1} .. total number of conflicts |
| # {2} .. number of unresolved conflicts |
| MergePanel.statusLine=\u51b2\u7a81: {0} \u4e2a (\u5171 {1} \u4e2a), \u672a\u89e3\u51b3: {2} |
| ACS_EditorPane1A11yName=\u7b2c\u4e00\u4e2a\u6587\u4ef6 |
| ACS_EditorPane1A11yDescr=\u7b2c\u4e00\u4e2a\u6587\u4ef6\u7684\u5185\u5bb9\u3002 |
| ACS_EditorPane2A11yName=\u7b2c\u4e8c\u4e2a\u6587\u4ef6 |
| ACS_EditorPane2A11yDescr=\u7b2c\u4e8c\u4e2a\u6587\u4ef6\u7684\u5185\u5bb9\u3002 |
| ACS_EditorPane3A11yName=\u5408\u5e76\u7ed3\u679c |
| ACS_EditorPane3A11yDescr=\u5408\u5e76\u7ed3\u679c\u7684\u5185\u5bb9\u548c\u89e3\u51b3\u7684\u51b2\u7a81\u3002 |
| |
| |
| MergePanel.acceptLeftButton.text=\u63a5\u53d7 |
| MergePanel.acceptAndNextLeftButton=\u63a5\u53d7\u5e76\u8f6c\u81f3\u4e0b\u4e00\u4e2a |
| MergePanel.acceptRightButton.text=\u63a5\u53d7 |
| MergePanel.acceptAndNextRightButton=\u63a5\u53d7\u5e76\u8f6c\u81f3\u4e0b\u4e00\u4e2a |
| |
| ACS_MergePanel.acceptLeftButton.textA11yDesc=\u63a5\u53d7\u5de6\u8fb9\u7684\u9009\u9879\u3002 |
| ACS_MergePanel.acceptAndNextLeftButtonA11yDesc=\u63a5\u53d7\u5de6\u8fb9\u7684\u9009\u9879, \u7136\u540e\u8f6c\u81f3\u4e0b\u4e00\u4e2a\u51b2\u7a81\u3002 |
| ACS_MergePanel.acceptRightButton.textA11yDesc=\u63a5\u53d7\u53f3\u8fb9\u7684\u9009\u9879\u3002 |
| ACS_MergePanel.acceptAndNextRightButtonA11yDesc=\u63a5\u53d7\u53f3\u8fb9\u7684\u9009\u9879, \u7136\u540e\u8f6c\u81f3\u4e0b\u4e00\u4e2a\u51b2\u7a81\u3002 |
| |
| # {0} .. The name fo the file to be saved |
| SaveFileQuestion=\u5df2\u4fee\u6539\u6587\u4ef6{0}\u3002\u662f\u5426\u4fdd\u5b58? |
| # {0} .. The number of files to be saved |
| SaveFilesQuestion=\u5df2\u4fee\u6539 {0} \u4e2a\u6587\u4ef6\u3002\u662f\u5426\u4fdd\u5b58\u5b83\u4eec? |
| # Printed message, when the merge result saving fails. |
| # {0} .. the localized message reported by the IOException |
| MergeControl.failedToSave=\u65e0\u6cd5\u4fdd\u5b58\u5408\u5e76\u7ed3\u679c: {0} |
| BTN_OK=\u786e\u5b9a(&O) |
| ACS_BTN_OKA11yDesc=\u63a5\u53d7\u66f4\u6539\u5e76\u5173\u95ed\u5bf9\u8bdd\u6846\u3002 |
| BTN_Cancel=\u53d6\u6d88(&C) |
| ACS_BTN_CancelA11yDesc=\u53d6\u6d88\u66f4\u6539\u5e76\u5173\u95ed\u5bf9\u8bdd\u6846\u3002 |
| BTN_Help=\u5e2e\u52a9(&H) |
| ACS_BTN_HelpA11yDesc=\u663e\u793a\u6b64\u5bf9\u8bdd\u6846\u7684\u5e2e\u52a9\u4fe1\u606f\u3002 |
| |
| CloseAction=\u5173\u95ed |
| |
| SaveFileWarningQuestion=\u5df2\u4fee\u6539\u6587\u4ef6{0}, \u662f\u5426\u4fdd\u5b58\u5b83? \n\u5e76\u6ca1\u6709\u89e3\u51b3\u6240\u6709\u6587\u4ef6\u4e2d\u7684\u6240\u6709\u51b2\u7a81\u3002 |
| SaveFilesWarningQuestion=\u5df2\u4fee\u6539 {0} \u4e2a\u6587\u4ef6, \u662f\u5426\u4fdd\u5b58\u5b83\u4eec?\n\u5e76\u6ca1\u6709\u89e3\u51b3\u6240\u6709\u6587\u4ef6\u4e2d\u7684\u6240\u6709\u51b2\u7a81\u3002 |
| WarningQuestion=\u51b2\u7a81\u6ca1\u6709\u89e3\u51b3\u3002\u662f\u5426\u4ecd\u8981\u5173\u95ed\u53ef\u89c6\u5316\u7a97\u53e3? |
| MergePanel.declineLeftButton.text=\u62d2\u7edd(&D) |
| MergePanel.declineLeftButton.TTtext=\u62d2\u7edd\u5de6\u8fb9\u7684\u9009\u9879\u3002 |
| MergePanel.declineRightButton.text=\u62d2\u7edd(&L) |
| MergePanel.declineRightButton.TTtext=\u62d2\u7edd\u53f3\u8fb9\u7684\u9009\u9879\u3002 |
| MergePanel.acceptLeftRightButton.text=\u63a5\u53d7\u4e8c\u8005 |
| MergePanel.acceptRightLeftButton.text=\u63a5\u53d7\u4e8c\u8005 |
| MergePanel.acceptLeftRightButton.TTtext=\u63a5\u53d7\u5de6\u8fb9\u66f4\u6539\u548c\u53f3\u8fb9\u66f4\u6539\u7684\u5e8f\u5217 |
| MergePanel.acceptRightLeftButton.TTtext=\u63a5\u53d7\u53f3\u8fb9\u66f4\u6539\u548c\u5de6\u8fb9\u66f4\u6539\u7684\u5e8f\u5217\u3002 |
| |
