1
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5
# The contents of this file are subject to the terms of either the GNU
6
# General Public License Version 2 only ("GPL") or the Common
7
# Development and Distribution License("CDDL") (collectively, the
8
# "License"). You may not use this file except in compliance with the
9
# License. You can obtain a copy of the License at
10
# http://www.netbeans.org/cddl-gplv2.html
11
# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
12
# specific language governing permissions and limitations under the
13
# License. When distributing the software, include this License Header
14
# Notice in each file and include the License file at
15
# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
16
# particular file as subject to the "Classpath" exception as provided
17
# by Sun in the GPL Version 2 section of the License file that
18
# accompanied this code. If applicable, add the following below the
19
# License Header, with the fields enclosed by brackets [] replaced by
20
# your own identifying information:
21
# "Portions Copyrighted [year] [name of copyright owner]"
25
# The Original Software is NetBeans. The Initial Developer of the Original
26
# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
27
# Microsystems, Inc. All Rights Reserved.
29
# If you wish your version of this file to be governed by only the CDDL
30
# or only the GPL Version 2, indicate your decision by adding
31
# "[Contributor] elects to include this software in this distribution
32
# under the [CDDL or GPL Version 2] license." If you do not indicate a
33
# single choice of license, a recipient has the option to distribute
34
# your version of this file under either the CDDL, the GPL Version 2 or
35
# to extend the choice of license to its licensees as provided above.
36
# However, if you add GPL Version 2 code and therefore, elected the GPL
37
# Version 2 license, then the option applies only if the new code is
38
# made subject to such option by the copyright holder.
41
Services/MergeVisualizers=Merge Visualizers
43
GraphicalMergeVisualizer.displayName=Graphical Merge Conflicts Resolver
44
GraphicalMergeVisualizer.shortDescription=
46
# GraphicalMergeVisualizerBeanInfo
47
PROP_colorUnresolvedConflict=Color of Text of Unresolved Conflict
48
HINT_colorUnresolvedConflict=The background color of text of unresolved conflict.
49
PROP_colorResolvedConflict=Color of Text Applied To Resolve Conflict
50
HINT_colorResolvedConflict=The background color of text applied to resolve the conflict
51
PROP_colorOtherConflict=Color of Text Not Applied To Resolve Conflict
52
HINT_colorOtherConflict=The background color of text not applied to resolve the conflict
54
# MergeDialogComponent
55
MergeDialogComponent.title=Merge Conflicts Resolver
56
ACSN_Merge_Dialog_Component=Conflict Resolver Component
57
ACSD_Merge_Dialog_Component=Graphical resolver of merge conflicts.
58
ACSN_Merge_Tabbed_Pane=Files With Conflicts
59
ACSD_Merge_Tabbed_Pane=Tabs of files with conflicts.
62
MergePanel.nextButton.toolTipText=&Next Difference
63
MergePanel.prevButton.toolTipText=&Previous Difference
64
# Status of conflicts resolving:
65
# {0} .. current conflict
66
# {1} .. total number of conflicts
67
# {2} .. number of unresolved conflicts
68
MergePanel.statusLine=Conflict: {0} of {1}, Unresolved: {2}
69
ACS_EditorPane1A11yName=The First File
70
ACS_EditorPane1A11yDescr=The content of the first file.
71
ACS_EditorPane2A11yName=The Second File
72
ACS_EditorPane2A11yDescr=The content of the second file.
73
ACS_EditorPane3A11yName=The Result of Merge
74
ACS_EditorPane3A11yDescr=The content of the result of the merge and resolved conflicts.
77
MergePanel.acceptLeftButton.text=&Accept
78
MergePanel.acceptAndNextLeftButton=Acc&ept & Next
79
MergePanel.acceptRightButton.text=Accep&t
80
MergePanel.acceptAndNextRightButton=Accept & Ne&xt
82
ACS_MergePanel.acceptLeftButton.textA11yDesc=Accept the left option.
83
ACS_MergePanel.acceptAndNextLeftButtonA11yDesc=Accept the left option and go to the next conflict.
84
ACS_MergePanel.acceptRightButton.textA11yDesc=Accept the right option.
85
ACS_MergePanel.acceptAndNextRightButtonA11yDesc=Accept the right option and go to the next conflict.
87
# {0} .. The name fo the file to be saved
88
SaveFileQuestion=File {0} is modified. Save it?
89
# {0} .. The number of files to be saved
90
SaveFilesQuestion={0} files are modified. Save them?
91
# Printed message, when the merge result saving fails.
92
# {0} .. the localized message reported by the IOException
93
MergeControl.failedToSave=Failed to save the merge result: {0}
95
ACS_BTN_OKA11yDesc=Accept changes and close dialog.
97
ACS_BTN_CancelA11yDesc=Cancel changes and close dialog.
99
ACS_BTN_HelpA11yDesc=Show help for this dialog.
103
SaveFileWarningQuestion=File {0} is modified, save it?\nNot all conflicts in all files have been resolved.
104
SaveFilesWarningQuestion={0} files are modified, save them?\nNot all conflicts in all files have been resolved.
105
WarningQuestion=Conflicts are not resolved. Close vizualizer anyway?