/projects/netbeans-7.3/mercurial/bin/org/netbeans/modules/mercurial/ui/merge/Bundle.properties

# 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.

##MergeAction.java
CTL_MenuItem_Merge = &Merge Changes

MSG_MERGE_PROGRESS = Merging...
MSG_MERGE_TITLE =     Mercurial Merge
MSG_MERGE_TITLE_SEP = ---------------
# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = INFO: Merge is not supported in this View
MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = Mercurial Merge
MSG_MERGE_NOT_SUPPORTED_INVIEW = Merge is not supported in this View

MSG_NOTHING_TO_MERGE = Nothing to Merge for this project.

# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_INFO = \nINFO MERGE: How to setup Merge Support
MSG_MERGE_INFO_URL = http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram
MSG_MERGE_UNCOMMITTED = There are uncommitted changes.\n\nPlease commit them before doing another merge.
MSG_MERGE_UNAVAILABLE = Merge is not setup on your system.\n\nRefer to the Merge Support link in the Output window.
# 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 = INFO MERGE: Merge completed
# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_DONE_CONFLICTS = INFO MERGE: CONFLICT(S) detected, resolve manually or using the menu command, "Resolve Conflicts"
MSG_Merge.ConflictsCreated = Conflict(s) detected during Merge, resolve manually or using the menu command, "Resolve Conflicts"
# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_WARN_MULTIPLE_HEADS = WARNING MERGE: Repository has {0} heads: revs {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 = INFO MERGE: please merge with a specific rev using, hg merge [REV]
# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_FAILED = WARNING MERGE: Merge failed

# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_WARN_NEEDED = WARNING MERGE: Repository has 2 heads: revs {0}
# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_DO_NEEDED = INFO MERGE: To merge use the menu command, "Merge"
MSG_MERGE_WARN_TITLE = Merge Required
MSG_MERGE_WARN_TEXT = The repository has multiple heads and a Merge is required\nRun "Merge" to perform a merge
MSG_MERGE_CHOOSE_REVISION = Choose from &Revisions:

MSG_MERGE_REFRESHING_HEAD_VERSIONS = Refreshing Head Versions
MSG_MERGE_HEAD_REVISION_DEFAULT = <no revision>

MSG_MERGE_NEEDED_BRANCHES = Repository contains branches with multiple heads.\nDo you want to review them?
TITLE_MERGE_NEEDED_BRANCHES = Merge Needed
# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_WARN_NEEDED_BRANCHES = WARNING MERGE: Some repository branches have multiple heads
# Capitalized letters used intentionally to emphasize the words in an output window, should be translated
MSG_MERGE_DO_NEEDED_BRANCHES = INFO MERGE: To merge switch to the branch and merge the heads.
MSG_MERGE_WARN_NEEDED_IN_BRANCH = Branch {0} has following heads:

ASCD_MERGE_DIALOG=Merge with Revision
 
CTL_MergeForm_Action_Merge=Merge
ACSD_MergeForm_Action_Merge=Merge
CTL_MergeForm_Action_Cancel=Cancel
ACSD_MergeForm_Action_Cancel=Cancel
infoLabel.text = Merge contents of working directory with selected Revision
infoLabel2.text = (Commit must be performed after merge)