| # 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=\u30de\u30fc\u30b8\u8868\u793a\u6a5f\u80fd |
| |
| GraphicalMergeVisualizer.displayName=\u30b0\u30e9\u30d5\u30a3\u30ab\u30eb\u306a\u30de\u30fc\u30b8\u7af6\u5408\u30ea\u30be\u30eb\u30d0 |
| |
| |
| # GraphicalMergeVisualizerBeanInfo |
| PROP_colorUnresolvedConflict=\u7af6\u5408\u304c\u672a\u89e3\u6c7a\u306a\u30c6\u30ad\u30b9\u30c8\u306e\u8272 |
| HINT_colorUnresolvedConflict=\u7af6\u5408\u304c\u672a\u89e3\u6c7a\u306a\u30c6\u30ad\u30b9\u30c8\u306e\u80cc\u666f\u8272 |
| PROP_colorResolvedConflict=\u7af6\u5408\u89e3\u6c7a\u3092\u9069\u7528\u3059\u308b\u30c6\u30ad\u30b9\u30c8\u306e\u8272 |
| HINT_colorResolvedConflict=\u7af6\u5408\u89e3\u6c7a\u3092\u9069\u7528\u3059\u308b\u30c6\u30ad\u30b9\u30c8\u306e\u80cc\u666f\u8272 |
| PROP_colorOtherConflict=\u7af6\u5408\u89e3\u6c7a\u3092\u9069\u7528\u3057\u306a\u3044\u30c6\u30ad\u30b9\u30c8\u306e\u8272 |
| HINT_colorOtherConflict=\u7af6\u5408\u89e3\u6c7a\u3092\u9069\u7528\u3057\u306a\u3044\u30c6\u30ad\u30b9\u30c8\u306e\u80cc\u666f\u8272 |
| |
| # MergeDialogComponent |
| MergeDialogComponent.title=\u30de\u30fc\u30b8\u7af6\u5408\u30ea\u30be\u30eb\u30d0 |
| ACSN_Merge_Dialog_Component=\u7af6\u5408\u30ea\u30be\u30eb\u30d0\u30fb\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8 |
| ACSD_Merge_Dialog_Component=\u7af6\u5408\u3092\u30de\u30fc\u30b8\u3059\u308b\u30b0\u30e9\u30d5\u30a3\u30ab\u30eb\u306a\u30ea\u30be\u30eb\u30d0 |
| ACSN_Merge_Tabbed_Pane=\u7af6\u5408\u306e\u3042\u308b\u30d5\u30a1\u30a4\u30eb |
| ACSD_Merge_Tabbed_Pane=\u7af6\u5408\u306e\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u30bf\u30d6 |
| |
| # MergePanel |
| MergePanel.nextButton.toolTipText=\u6b21\u306e\u5dee\u5206 |
| MergePanel.prevButton.toolTipText=\u524d\u306e\u5dee\u5206 |
| # Status of conflicts resolving: |
| # {0} .. current conflict |
| # {1} .. total number of conflicts |
| # {2} .. number of unresolved conflicts |
| MergePanel.statusLine=\u7af6\u5408: {1}\u306e{0}\u304c\u672a\u89e3\u6c7a: {2} |
| ACS_EditorPane1A11yName=1\u756a\u76ee\u306e\u30d5\u30a1\u30a4\u30eb |
| ACS_EditorPane1A11yDescr=1\u756a\u76ee\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9 |
| ACS_EditorPane2A11yName=2\u756a\u76ee\u306e\u30d5\u30a1\u30a4\u30eb |
| ACS_EditorPane2A11yDescr=2\u756a\u76ee\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9 |
| ACS_EditorPane3A11yName=\u30de\u30fc\u30b8\u306e\u7d50\u679c |
| ACS_EditorPane3A11yDescr=\u30de\u30fc\u30b8\u3068\u7af6\u5408\u89e3\u6c7a\u306e\u7d50\u679c\u306e\u5185\u5bb9 |
| |
| |
| MergePanel.acceptLeftButton.text=\u53d7\u5165\u308c |
| MergePanel.acceptAndNextLeftButton=\u53d7\u3051\u5165\u308c\u3066\u6b21 |
| MergePanel.acceptRightButton.text=\u53d7\u5165\u308c |
| MergePanel.acceptAndNextRightButton=\u53d7\u3051\u5165\u308c\u3066\u6b21 |
| |
| ACS_MergePanel.acceptLeftButton.textA11yDesc=\u5de6\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u53d7\u3051\u5165\u308c\u307e\u3059\u3002 |
| ACS_MergePanel.acceptAndNextLeftButtonA11yDesc=\u5de6\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u53d7\u3051\u5165\u308c\u3001\u6b21\u306e\u7af6\u5408\u306b\u9032\u307f\u307e\u3059\u3002 |
| ACS_MergePanel.acceptRightButton.textA11yDesc=\u53f3\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u53d7\u3051\u5165\u308c\u307e\u3059\u3002 |
| ACS_MergePanel.acceptAndNextRightButtonA11yDesc=\u53f3\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u53d7\u3051\u5165\u308c\u3001\u6b21\u306e\u7af6\u5408\u306b\u9032\u307f\u307e\u3059\u3002 |
| |
| # {0} .. The name fo the file to be saved |
| SaveFileQuestion=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4fdd\u5b58\u3057\u307e\u3059\u304b? |
| # {0} .. The number of files to be saved |
| SaveFilesQuestion={0}\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4fdd\u5b58\u3057\u307e\u3059\u304b? |
| # Printed message, when the merge result saving fails. |
| # {0} .. the localized message reported by the IOException |
| MergeControl.failedToSave=\u30de\u30fc\u30b8\u7d50\u679c\u306e\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} |
| BTN_OK=OK(&O) |
| ACS_BTN_OKA11yDesc=\u5909\u66f4\u3092\u53d7\u3051\u5165\u308c\u3066\u3001\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u9589\u3058\u307e\u3059\u3002 |
| BTN_Cancel=\u53d6\u6d88\u3057(&C) |
| ACS_BTN_CancelA11yDesc=\u5909\u66f4\u3092\u53d6\u6d88\u3057\u3066\u3001\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u9589\u3058\u307e\u3059\u3002 |
| BTN_Help=\u30d8\u30eb\u30d7(&H) |
| ACS_BTN_HelpA11yDesc=\u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u306e\u30d8\u30eb\u30d7\u3092\u8868\u793a\u3057\u307e\u3059\u3002 |
| |
| CloseAction=\u9589\u3058\u308b |
| |
| SaveFileWarningQuestion=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u4fee\u6b63\u3055\u308c\u307e\u3057\u305f\u304c\u4fdd\u5b58\u3057\u307e\u3059\u304b?\n\u3059\u3079\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u3059\u3079\u3066\u306e\u7af6\u5408\u304c\u89e3\u6c7a\u3057\u305f\u308f\u3051\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 |
| SaveFilesWarningQuestion={0}\u30d5\u30a1\u30a4\u30eb\u306f\u4fee\u6b63\u3055\u308c\u307e\u3057\u305f\u304c\u4fdd\u5b58\u3057\u307e\u3059\u304b?\n\u3059\u3079\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u3059\u3079\u3066\u306e\u7af6\u5408\u304c\u89e3\u6c7a\u3057\u305f\u308f\u3051\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 |
| WarningQuestion=\u7af6\u5408\u304c\u89e3\u6c7a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u8868\u793a\u6a5f\u80fd\u3092\u9589\u3058\u307e\u3059\u304b? |
| MergePanel.declineLeftButton.text=\u62d2\u5426(&D) |
| MergePanel.declineLeftButton.TTtext=\u5de6\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u62d2\u5426\u3057\u307e\u3059\u3002 |
| MergePanel.declineRightButton.text=\u62d2\u5426(&L) |
| MergePanel.declineRightButton.TTtext=\u53f3\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u62d2\u5426\u3057\u307e\u3059\u3002 |
| MergePanel.acceptLeftRightButton.text=\u4e21\u65b9\u3092\u53d7\u5165\u308c |
| MergePanel.acceptRightLeftButton.text=\u4e21\u65b9\u3092\u53d7\u5165\u308c |
| MergePanel.acceptLeftRightButton.TTtext=\u5de6\u304a\u3088\u3073\u53f3\u306e\u5909\u66f4\u306e\u30b7\u30fc\u30b1\u30f3\u30b9\u3092\u53d7\u3051\u5165\u308c\u307e\u3059 |
| MergePanel.acceptRightLeftButton.TTtext=\u53f3\u304a\u3088\u3073\u5de6\u306e\u5909\u66f4\u306e\u30b7\u30fc\u30b1\u30f3\u30b9\u3092\u53d7\u3051\u5165\u308c\u307e\u3059\u3002 |
| |
