| # Licensed to the Apache Software Foundation (ASF) under one |
| # or more contributor license agreements. See the NOTICE file |
| # distributed with this work for additional information |
| # regarding copyright ownership. The ASF licenses this file |
| # to you under the Apache License, Version 2.0 (the |
| # "License"); you may not use this file except in compliance |
| # with the License. You may obtain a copy of the License at |
| # |
| # http://www.apache.org/licenses/LICENSE-2.0 |
| # |
| # Unless required by applicable law or agreed to in writing, |
| # software distributed under the License is distributed on an |
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| # KIND, either express or implied. See the License for the |
| # specific language governing permissions and limitations |
| # under the License. |
| |
| #MarkResolvedAction |
| LBL_MarkResolvedAction_Name=\u89e3\u6c7a\u3068\u30de\u30fc\u30af(&M) |
| LBL_MarkResolvedAction_PopupName = \u89e3\u6c7a\u3068\u30de\u30fc\u30af |
| LBL_MarkingProgress = \u89e3\u6c7a\u6e08\u3068\u3057\u3066\u30de\u30fc\u30af |
| LBL_NoConflicts = \u7af6\u5408\u306a\u3057 |
| LBL_ResolveAllConflictsAction_Name=\u3059\u3079\u3066\u306e\u7af6\u5408\u3092\u89e3\u6c7a - \u30ea\u30dd\u30b8\u30c8\u30ea |
| LBL_ResolveConflictsAction_Name=\u7af6\u5408\u3092\u89e3\u6c7a(&F) |
| MSG_NoConflicts = \u9078\u629e\u3055\u308c\u305f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u89e3\u6c7a\u3059\u3079\u304d\u7af6\u5408\u306f\u3042\u308a\u307e\u305b\u3093\u3002 |
| |
| LBL_ResolveConflictsAction_PopupName = \u7af6\u5408\u3092\u89e3\u6c7a |
| MSG_PreparingMerge = \u30de\u30fc\u30b8\u3092\u6e96\u5099\u3057\u3066\u3044\u307e\u3059 |
| |
| #ResolveConflictsExecutor |
| Merge.titleResult = \u30de\u30fc\u30b8\u5f8c\u306e\u7d50\u679c |
| Diff.titleWorkingFile = \u30ed\u30fc\u30ab\u30eb\u4f5c\u696d\u30d5\u30a1\u30a4\u30eb |
| LBL_TreeConflict_ResolveButton.title = \u89e3\u6c7a |
| LBL_TreeConflict.title = \u30c4\u30ea\u30fc\u306e\u7af6\u5408\u3092\u89e3\u6c7a\u3057\u3066\u3044\u307e\u3059 |
| |
| |
| ResolveTreeConflictPanel.jLabel1.text=\u89e3\u6c7a\u51e6\u7406\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044: |
| |
| ResolveTreeConflictPanel.rbRemove.text=\u7d22\u5f15\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664(&R) |
| ResolveTreeConflictPanel.rbRemove.TTtext=\u7d22\u5f15\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6b21\u56de\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u3068\u304d\u306b\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u524a\u9664\u3055\u308c\u307e\u3059\u3002 |
| ResolveTreeConflictPanel.rbAdd.text=\u73fe\u5728\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u3092\u7dad\u6301(&K) |
| ResolveTreeConflictPanel.rbAdd.toolTipText=\u73fe\u5728\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u72b6\u614b\u3092\u7d22\u5f15\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6b21\u56de\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u3068\u304d\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u6b8b\u308a\u307e\u3059\u3002 |
| |
| MSG_ResolveTreeConflictPanel.file.text = \u30d5\u30a1\u30a4\u30eb{0}\u306f\u30c4\u30ea\u30fc\u306e\u7af6\u5408\u306e\u72b6\u614b\u3067\u3059 |
| |
| |
