| # 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=\u30de\u30fc\u30b8\u3067\u304d\u307e\u305b\u3093 |
| LBL_MergeRevisionAction_Name=\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u30de\u30fc\u30b8(&M)... |
| LBL_MergeRevisionAction_PopupName=\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u30de\u30fc\u30b8... |
| LBL_MergeRevisionAction.progressName=HEAD\u306b\u30de\u30fc\u30b8\u3057\u3066\u3044\u307e\u3059 |
| MSG_Merge.failed.aborted.text=\u30de\u30fc\u30b8\u306b\u306f\u30de\u30fc\u30b8\u30fb\u30b3\u30df\u30c3\u30c8\u304c\u5fc5\u8981\u3067\u3042\u308a\u3001\u65e9\u9001\u308a\u30de\u30fc\u30b8\u306f\u3067\u304d\u307e\u305b\u3093\u3002\n\n\u30de\u30fc\u30b8\u3092\u518d\u958b\u3057\u3001\u30de\u30fc\u30b8\u30fb\u30b3\u30df\u30c3\u30c8\u3092\u8a31\u53ef\u3057\u307e\u3059\u304b(--ff\u30aa\u30d7\u30b7\u30e7\u30f3)\u3002 |
| MSG_MergeRevisionAction.result=\u30de\u30fc\u30b8\u7d50\u679c: {0}\n |
| MSG_MergeRevisionAction.result.alreadyUpToDate=HEAD\u306b\u306f\u3059\u3067\u306b\u30ea\u30d3\u30b8\u30e7\u30f3{0}\u304c\u542b\u307e\u308c\u307e\u3059 |
| MSG_MergeRevisionAction.result.fastForward={0}\u3068HEAD\u306e\u30de\u30fc\u30b8:\n |
| MSG_MergeRevisionAction.result.merged={0}\u3068HEAD\u306e\u30de\u30fc\u30b8:\n |
| MSG_MergeRevisionAction.result.conflict={0}\u3068HEAD\u306e\u30de\u30fc\u30b8\u306b\u3088\u3063\u3066\u7af6\u5408\u304c\u767a\u751f\u3057\u307e\u3057\u305f:\n |
| MSG_MergeRevisionAction.result.failed={0}\u3068HEAD\u306e\u30de\u30fc\u30b8\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001\u51fa\u529b\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002 |
| MSG_MergeRevisionAction.result.failedFiles={0}\u3068HEAD\u306e\u30de\u30fc\u30b8\u306f\u3053\u308c\u3089\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u305f\u3081\u5931\u6557\u3057\u307e\u3057\u305f:\n |
| MSG_MergeRevisionAction.result.aborted={0}\u3092\u6301\u3064HEAD\u306e\u30de\u30fc\u30b8\u306f\u3001\u30de\u30fc\u30b8\u30fb\u30b3\u30df\u30c3\u30c8\u304c\u5fc5\u8981\u3067\u3001\u65e9\u9001\u308a\u30de\u30fc\u30b8\u306e\u307f\u8a31\u53ef\u3055\u308c\u3066\u3044\u305f\u305f\u3081\u5931\u6557\u3057\u307e\u3057\u305f\u3002 |
| MSG_MergeRevisionAction.result.unsupported=\u30de\u30fc\u30b8\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 |
| LBL_MergeRevision.OKButton.text=\u30de\u30fc\u30b8(&G) |
| LBL_MergeRevision.title=\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u30de\u30fc\u30b8 |
| MergeRevisionPanel.jLabel1.text=HEAD\u306b\u30de\u30fc\u30b8\u3059\u308b\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044 |
| MergeRevision.ffoption.ff=\u53ef\u80fd\u306a\u5834\u5408\u306f\u65e9\u9001\u308a(--ff) |
| MergeRevision.ffoption.ff.tt=\u53ef\u80fd\u306a\u5834\u5408\u3001\u30de\u30fc\u30b8\u3067\u306f\u65b0\u898f\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u305b\u305a\u3001\u5206\u5c90\u3092\u30de\u30fc\u30b8\u3055\u308c\u305f\u30b3\u30df\u30c3\u30c8\u306b\u79fb\u52d5\u3057\u307e\u3059\u3002 |
| MergeRevision.ffoption.ffonly=\u65e9\u9001\u308a\u306e\u307f(--ff-only) |
| MergeRevision.ffoption.ffonly.tt=\u30de\u30fc\u30b8\u30fb\u30b3\u30df\u30c3\u30c8\u304c\u5fc5\u8981\u306a\u5834\u5408\u306f\u30de\u30fc\u30b8\u304c\u5931\u6557\u3057\u307e\u3059(\u4e21\u65b9\u306e\u5206\u5c90\u306b\u305d\u308c\u305e\u308c\u72ec\u81ea\u306e\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308a\u307e\u3059) |
| MergeRevision.ffoption.noff=\u5e38\u306b\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210(--no-ff) |
| MergeRevision.ffoption.noff.tt=\u30de\u30fc\u30b8\u306f\u5e38\u306b\u30de\u30fc\u30b8\u30fb\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002\u6a5f\u80fd\u5206\u5c90\u306e\u30de\u30fc\u30b8\u306b\u4fbf\u5229\u3067\u3059\u3002 |
| MergeRevisionPanel.ffModePanel.text=\u65e9\u9001\u308a\u30e2\u30fc\u30c9\u306e\u9078\u629e |
| |
