| # 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. |
| |
| # mf-layer.xml |
| Services/MergeVisualizers=Merge Visualizers |
| |
| GraphicalMergeVisualizer.displayName=Graphical Merge Conflicts Resolver |
| GraphicalMergeVisualizer.shortDescription= |
| |
| # GraphicalMergeVisualizerBeanInfo |
| PROP_colorUnresolvedConflict=Color of Text of Unresolved Conflict |
| HINT_colorUnresolvedConflict=The background color of text of unresolved conflict. |
| PROP_colorResolvedConflict=Color of Text Applied To Resolve Conflict |
| HINT_colorResolvedConflict=The background color of text applied to resolve the conflict |
| PROP_colorOtherConflict=Color of Text Not Applied To Resolve Conflict |
| HINT_colorOtherConflict=The background color of text not applied to resolve the conflict |
| |
| # MergeDialogComponent |
| MergeDialogComponent.title=Merge Conflicts Resolver |
| ACSN_Merge_Dialog_Component=Conflict Resolver Component |
| ACSD_Merge_Dialog_Component=Graphical resolver of merge conflicts. |
| ACSN_Merge_Tabbed_Pane=Files With Conflicts |
| ACSD_Merge_Tabbed_Pane=Tabs of files with conflicts. |
| |
| # MergePanel |
| MergePanel.nextButton.toolTipText=&Next Difference |
| MergePanel.prevButton.toolTipText=&Previous Difference |
| # Status of conflicts resolving: |
| # {0} .. current conflict |
| # {1} .. total number of conflicts |
| # {2} .. number of unresolved conflicts |
| MergePanel.statusLine=Conflict: {0} of {1}, Unresolved: {2} |
| ACS_EditorPane1A11yName=The First File |
| ACS_EditorPane1A11yDescr=The content of the first file. |
| ACS_EditorPane2A11yName=The Second File |
| ACS_EditorPane2A11yDescr=The content of the second file. |
| ACS_EditorPane3A11yName=The Result of Merge |
| ACS_EditorPane3A11yDescr=The content of the result of the merge and resolved conflicts. |
| |
| |
| MergePanel.acceptLeftButton.text=&Accept |
| MergePanel.acceptAndNextLeftButton=Acc&ept & Next |
| MergePanel.acceptRightButton.text=Accep&t |
| MergePanel.acceptAndNextRightButton=Accept & Ne&xt |
| |
| ACS_MergePanel.acceptLeftButton.textA11yDesc=Accept the left option. |
| ACS_MergePanel.acceptAndNextLeftButtonA11yDesc=Accept the left option and go to the next conflict. |
| ACS_MergePanel.acceptRightButton.textA11yDesc=Accept the right option. |
| ACS_MergePanel.acceptAndNextRightButtonA11yDesc=Accept the right option and go to the next conflict. |
| |
| # {0} .. The name fo the file to be saved |
| SaveFileQuestion=Bestand {0} is gewijzigd. Oplaan? |
| # {0} .. The number of files to be saved |
| SaveFilesQuestion={0} files are modified. Save them? |
| # Printed message, when the merge result saving fails. |
| # {0} .. the localized message reported by the IOException |
| MergeControl.failedToSave=Failed to save the merge result: {0} |
| BTN_OK=&Ok |
| ACS_BTN_OKA11yDesc=Accept changes and close dialog. |
| BTN_Cancel=&Annuleren |
| ACS_BTN_CancelA11yDesc=Cancel changes and close dialog. |
| BTN_Help=&Hulp |
| ACS_BTN_HelpA11yDesc=Show help for this dialog. |
| |
| CloseAction=Afsluiten |
| |
| SaveFileWarningQuestion=File {0} is modified, save it?\nNot all conflicts in all files have been resolved. |
| SaveFilesWarningQuestion={0} files are modified, save them?\nNot all conflicts in all files have been resolved. |
| WarningQuestion=Conflicts are not resolved. Close vizualizer anyway? |
| |
