| # 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. |
| |
| CTL_MenuItem_Merge=\u5909\u66f4\u3092\u30de\u30fc\u30b8(&M) |
| ##MergeAction.java |
| MSG_MERGE_PROGRESS = \u30de\u30fc\u30b8\u4e2d... |
| MSG_MERGE_TITLE = Mercurial\u30de\u30fc\u30b8 |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = \u60c5\u5831: \u3053\u306e\u30d3\u30e5\u30fc\u3067\u306f\u30de\u30fc\u30b8\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093 |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = Mercurial\u30de\u30fc\u30b8 |
| MSG_MERGE_NOT_SUPPORTED_INVIEW = \u3053\u306e\u30d3\u30e5\u30fc\u3067\u306f\u30de\u30fc\u30b8\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093 |
| |
| MSG_NOTHING_TO_MERGE = \u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u30de\u30fc\u30b8\u3059\u308b\u3082\u306e\u306f\u3042\u308a\u307e\u305b\u3093\u3002 |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_INFO = \n\u60c5\u5831\u30de\u30fc\u30b8: \u30de\u30fc\u30b8\u30fb\u30b5\u30dd\u30fc\u30c8\u306e\u8a2d\u5b9a\u65b9\u6cd5 |
| |
| MSG_MERGE_UNCOMMITTED = \u30b3\u30df\u30c3\u30c8\u3092\u884c\u306a\u3063\u3066\u3044\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u3002\n\n\u5225\u306e\u30de\u30fc\u30b8\u3092\u5b9f\u884c\u3059\u308b\u524d\u306b\u305d\u308c\u3089\u3092\u30b3\u30df\u30c3\u30c8\u3057\u3066\u304f\u3060\u3055\u3044\u3002 |
| MSG_MERGE_UNAVAILABLE = \u4f7f\u7528\u4e2d\u306e\u30b7\u30b9\u30c6\u30e0\u3067\u30de\u30fc\u30b8\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\n\n\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u300c\u30de\u30fc\u30b8\u306e\u30b5\u30dd\u30fc\u30c8\u300d\u306e\u30ea\u30f3\u30af\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_CONFLICT = INFO MERGE: CONFLICT - {0} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DONE = \u60c5\u5831 - \u30de\u30fc\u30b8: \u30de\u30fc\u30b8\u5b8c\u4e86 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DONE_CONFLICTS = \u60c5\u5831 - \u30de\u30fc\u30b8: \u7af6\u5408\u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u3002\u624b\u52d5\u3001\u307e\u305f\u306f\u30e1\u30cb\u30e5\u30fc\u30fb\u30b3\u30de\u30f3\u30c9"\u7af6\u5408\u3092\u89e3\u6c7a"\u3092\u4f7f\u7528\u3057\u3066\u89e3\u6c7a\u3057\u3066\u304f\u3060\u3055\u3044 |
| MSG_Merge.ConflictsCreated = \u30de\u30fc\u30b8\u4e2d\u306b\u7af6\u5408\u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u3002\u624b\u52d5\u3001\u307e\u305f\u306f\u30e1\u30cb\u30e5\u30fc\u30fb\u30b3\u30de\u30f3\u30c9\u300c\u7af6\u5408\u3092\u89e3\u6c7a\u300d\u3092\u4f7f\u7528\u3057\u3066\u89e3\u6c7a\u3057\u3066\u304f\u3060\u3055\u3044 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_MULTIPLE_HEADS = \u8b66\u544a - \u30de\u30fc\u30b8: \u30ea\u30dd\u30b8\u30c8\u30ea\u306b{0}\u500b\u306e\u30d8\u30c3\u30c9\u304c\u3042\u308a\u307e\u3059: \u30ea\u30d3\u30b8\u30e7\u30f3{1} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated. Do not translate "REV" |
| MSG_MERGE_DONE_MULTIPLE_HEADS = \u60c5\u5831 - \u30de\u30fc\u30b8: \u300chg merge [\u30ea\u30d3\u30b8\u30e7\u30f3]\u300d\u3092\u4f7f\u7528\u3057\u3066\u7279\u5b9a\u306e\u30ea\u30d3\u30b8\u30e7\u30f3\u3068\u30de\u30fc\u30b8\u3057\u3066\u304f\u3060\u3055\u3044 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_FAILED = \u8b66\u544a - \u30de\u30fc\u30b8: \u30de\u30fc\u30b8\u306b\u5931\u6557\u3057\u307e\u3057\u305f |
| |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_NEEDED = \u8b66\u544a - \u30de\u30fc\u30b8: \u30ea\u30dd\u30b8\u30c8\u30ea\u306b2\u500b\u306e\u30d8\u30c3\u30c9\u304c\u3042\u308a\u307e\u3059: \u30ea\u30d3\u30b8\u30e7\u30f3{0} |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DO_NEEDED = \u60c5\u5831 - \u30de\u30fc\u30b8: \u30de\u30fc\u30b8\u3059\u308b\u306b\u306f\u30e1\u30cb\u30e5\u30fc\u30fb\u30b3\u30de\u30f3\u30c9"\u30de\u30fc\u30b8"\u3092\u4f7f\u7528\u3057\u307e\u3059 |
| MSG_MERGE_WARN_TITLE = \u30de\u30fc\u30b8\u304c\u5fc5\u8981 |
| MSG_MERGE_WARN_TEXT = \u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u306f\u8907\u6570\u306e\u30d8\u30c3\u30c9\u304c\u3042\u308b\u305f\u3081\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u3067\u3059\n"\u30de\u30fc\u30b8"\u3067\u30de\u30fc\u30b8\u3092\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044 |
| MSG_MERGE_CHOOSE_REVISION = \u30ea\u30d3\u30b8\u30e7\u30f3\u304b\u3089\u9078\u629e(&R): |
| |
| MSG_MERGE_REFRESHING_HEAD_VERSIONS = \u30d8\u30c3\u30c9\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059 |
| MSG_MERGE_HEAD_REVISION_DEFAULT = <\u30ea\u30d3\u30b8\u30e7\u30f3\u306a\u3057> |
| |
| MSG_MERGE_NEEDED_BRANCHES = \u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u8907\u6570\u306e\u30d8\u30c3\u30c9\u306e\u3042\u308b\u5206\u5c90\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\n\u305d\u308c\u3089\u3092\u78ba\u8a8d\u3057\u307e\u3059\u304b? |
| TITLE_MERGE_NEEDED_BRANCHES = \u30de\u30fc\u30b8\u304c\u5fc5\u8981\u3067\u3059 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_WARN_NEEDED_BRANCHES = \u8b66\u544a - \u30de\u30fc\u30b8: \u4e00\u90e8\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u5206\u5c90\u306b\u8907\u6570\u306e\u30d8\u30c3\u30c9\u304c\u3042\u308a\u307e\u3059 |
| # Capitalized letters used intentionally to emphasize the words in an output window, should be translated |
| MSG_MERGE_DO_NEEDED_BRANCHES = \u60c5\u5831 - \u30de\u30fc\u30b8: \u30de\u30fc\u30b8\u3059\u308b\u306b\u306f\u3001\u5206\u5c90\u306b\u5207\u66ff\u3048\u3001\u30d8\u30c3\u30c9\u3092\u30de\u30fc\u30b8\u3057\u307e\u3059\u3002 |
| MSG_MERGE_WARN_NEEDED_IN_BRANCH = \u5206\u5c90{0}\u306b\u6b21\u306e\u30d8\u30c3\u30c9\u304c\u3042\u308a\u307e\u3059: |
| |
| ASCD_MERGE_DIALOG=\u30ea\u30d3\u30b8\u30e7\u30f3\u3068\u30de\u30fc\u30b8 |
| |
| CTL_MergeForm_Action_Merge=\u30de\u30fc\u30b8 |
| ACSD_MergeForm_Action_Merge=\u30de\u30fc\u30b8 |
| CTL_MergeForm_Action_Cancel=\u53d6\u6d88 |
| ACSD_MergeForm_Action_Cancel=\u53d6\u6d88 |
| infoLabel.text = \u9078\u629e\u3057\u305f\u30ea\u30d3\u30b8\u30e7\u30f3\u3067\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u5185\u5bb9\u3092\u30de\u30fc\u30b8 |
| infoLabel2.text = (\u30de\u30fc\u30b8\u5f8c\u306b\u30b3\u30df\u30c3\u30c8\u3092\u5b9f\u884c\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093) |
| |
