| # 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=Zusammenf\u00fchrungsanzeige |
| |
| GraphicalMergeVisualizer.displayName=Graphisches Aufl\u00f6sen von Zusammenf\u00fchrungskonflikten |
| GraphicalMergeVisualizer.shortDescription= |
| |
| # GraphicalMergeVisualizerBeanInfo |
| PROP_colorUnresolvedConflict=Farbe des Textes f\u00fcr ungel\u00f6ste Konflikte |
| HINT_colorUnresolvedConflict=Hintergrundfarbe des Textes f\u00fcr ungel\u00f6ste Konflikte |
| PROP_colorResolvedConflict=Farbe des eingetragenen Textes f\u00fcr gel\u00f6ste Konflikte |
| HINT_colorResolvedConflict=Hintergrundfarbe des eingetragenen Textes f\u00fcr gel\u00f6ste Konflikte |
| PROP_colorOtherConflict=Farbe des nicht eingetragenen Textes f\u00fcr gel\u00f6ste Konflikte |
| HINT_colorOtherConflict=Hintergrundfarbe des nicht eingetragenen Textes f\u00fcr gel\u00f6ste Konflikte |
| |
| # MergeDialogComponent |
| MergeDialogComponent.title=Zusammenf\u00fchrungskonfliktaufl\u00f6sung |
| ACSN_Merge_Dialog_Component=Komponente der Zusammenf\u00fchrungskonfliktaufl\u00f6sung |
| ACSD_Merge_Dialog_Component=Graphische Aufl\u00f6sung von Zusammenf\u00fchrungskonflikten. |
| ACSN_Merge_Tabbed_Pane=Dateien mit Konflikten |
| ACSD_Merge_Tabbed_Pane=Register von Dateien mit Konflikten. |
| |
| # MergePanel |
| MergePanel.nextButton.toolTipText=&N\u00e4chster Unterschied |
| MergePanel.prevButton.toolTipText=&Vorheriger Unterschied |
| # Status of conflicts resolving: |
| # {0} .. current conflict |
| # {1} .. total number of conflicts |
| # {2} .. number of unresolved conflicts |
| MergePanel.statusLine=Konflikt: {0} von {1}, ungel\u00f6st: {2} |
| ACS_EditorPane1A11yName=Erste Datei |
| ACS_EditorPane1A11yDescr=Inhalt der ersten Datei. |
| ACS_EditorPane2A11yName=Zweite Datei |
| ACS_EditorPane2A11yDescr=Inhalt der zweiten Datei. |
| ACS_EditorPane3A11yName=Ergebnis der Zusammenf\u00fchrung |
| ACS_EditorPane3A11yDescr=Inhalt des Ergebnisses von zusammengef\u00fchrten und gel\u00f6sten Konflikten |
| |
| |
| MergePanel.acceptLeftButton.text=&Akzeptieren |
| MergePanel.acceptAndNextLeftButton=Akz&eptieren & n\u00e4chsten |
| MergePanel.acceptRightButton.text=Akzep&tieren |
| MergePanel.acceptAndNextRightButton=Akzeptieren & n\u00e4&chsten |
| |
| ACS_MergePanel.acceptLeftButton.textA11yDesc=Akzeptiere linke Option. |
| ACS_MergePanel.acceptAndNextLeftButtonA11yDesc=Akzeptiere linke Option und gehe zum n\u00e4chsten Konflikt. |
| ACS_MergePanel.acceptRightButton.textA11yDesc=Akzeptiere rechte Option. |
| ACS_MergePanel.acceptAndNextRightButtonA11yDesc=Akzeptiere rechte Option und gehe zum n\u00e4chsten Konflikt. |
| |
| # {0} .. The name fo the file to be saved |
| SaveFileQuestion=Datei {0} wurde ge\u00e4ndert. Abspeichern? |
| # {0} .. The number of files to be saved |
| SaveFilesQuestion={0} Dateien wurden ge\u00e4ndert. Sollen sie gespeichert werden? |
| # Printed message, when the merge result saving fails. |
| # {0} .. the localized message reported by the IOException |
| MergeControl.failedToSave=Fehler beim Speichern des Zusammenf\u00fchrungsgebnisses: {0} |
| BTN_OK=&OK |
| ACS_BTN_OKA11yDesc=\u00c4nderungen akzeptieren und Dialog schlie\u00dfen. |
| BTN_Cancel=Abbre&chen |
| ACS_BTN_CancelA11yDesc=\u00c4nderungen verwerfen und Dialog schlie\u00dfen. |
| BTN_Help=&Hilfe |
| ACS_BTN_HelpA11yDesc=Hilfe f\u00fcr diesen Dialog anzeigen. |
| |
| CloseAction=Schlie\u00dfen |
| |
| SaveFileWarningQuestion=Datei {0} wurde ge\u00e4ndert, speichern?\nEs wurden nicht alle Konflikte in allen Dateien aufgel\u00f6st. |
| SaveFilesWarningQuestion={0} Dateien wurden ge\u00e4ndert, speichern?\nEs wurden nicht alle Konflikte in allen Dateien aufgel\u00f6st. |
| WarningQuestion=Konflikte wurden nicht aufgel\u00f6st. Anzeige trotzdem schlie\u00dfen? |
| |
