| # 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 = \u00c4nderungen verschmel&zen |
| |
| MSG_MERGE_PROGRESS = Zusammenf\u00fchren... |
| MSG_MERGE_TITLE = Mercurial Zusammenf\u00fchrung |
| MSG_MERGE_TITLE_SEP = --------------- |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = INFO: Die Zusammenf\u00fchrung wird in dieser Ansicht nicht unterst\u00fczt |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = Mercurial Zusammenf\u00fchrung |
| MSG_MERGE_NOT_SUPPORTED_INVIEW = Mercurial Zusammenf\u00fchrung |
| |
| MSG_NOTHING_TO_MERGE = In diesem Projekt gibt es nichts zum Zusammenf\u00fchren |
| |
| MSG_MERGE_INFO = \nINFO ZUSAMMENF\u00dcHRUNG: Wie wird die Unterst\u00fctzung f\u00fcr die Zusammenf\u00fchrung aufgesetzt |
| #MSG_MERGE_INFO_URL = http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram |
| MSG_MERGE_UNCOMMITTED = Es existieren nicht-eingereichte \u00c4nderungen.\n\nBitte vor der Durchf\u00fchrung einer anderen Zusammenf\u00fchrung einreichen. |
| MSG_MERGE_UNAVAILABLE = Das Zusammenf\u00fchren ist auf diesem System nicht konfiguriert.\n\nIm Ausgabefenster ist ein Link f\u00fcr die Unterst\u00fctzung der Zusammenf\u00fchrung angegeben. |
| MSG_MERGE_CONFLICT = INFO ZUSAMMENF\u00dcHRUNG: KONFLIKT - {0} |
| MSG_MERGE_DONE = INFO ZUSAMMENF\u00dcHRUNG: Zusammenf\u00fchrung beendet |
| MSG_MERGE_DONE_CONFLICTS = INFO ZUSAMMENF\u00dcHRUNG: KONFLIKT(E) entdeckt; manuell aufl\u00f6sen, oder den Men\u00fcbefehl "Konflikte aufl\u00f6sen" benutzen |
| MSG_Merge.ConflictsCreated = Konflikt(e) bei der Zusammenf\u00fchrung entdeckt; manuell aufl\u00f6sen, oder den Men\u00fcbefehl "Konflikte aufl\u00f6sen" benutzen |
| MSG_MERGE_WARN_MULTIPLE_HEADS = INFO ZUSAMMENF\u00dcHRUNG: Das Repositorium hat {0} heads: revs {1} |
| MSG_MERGE_DONE_MULTIPLE_HEADS = INFO ZUSAMMENF\u00dcHRUNG: Bitte mit einer spezifischen Revision mithilfe von hg merge [REV] zusammenf\u00fchren |
| MSG_MERGE_FAILED = WARNUNG ZUSAMMENF\u00dcHRUNG: Zusammenf\u00fchren fehlgeschlagen |
| |
| MSG_MERGE_WARN_NEEDED = WARNUNG ZUSAMMENF\u00dcHRUNG: Das Repositorium hat zwei Heads: revs {0} |
| MSG_MERGE_DO_NEEDED = INFO ZUSAMMENF\u00dcHRUNG: Zum Zusammenf\u00fchren den Men\u00fcbefehl "Zusammenf\u00fchren" benutzen |
| MSG_MERGE_WARN_TITLE = Zusammenf\u00fchren erforderlich |
| MSG_MERGE_WARN_TEXT = Das Repositorium hat mehrere Heads. Dadurch wird ein Zusammenf\u00fchren erforderlich\nBitte "Zusammenf\u00fchren" aufrufen |
| MSG_MERGE_CHOOSE_REVISION = Aus &Revisonen w\u00e4hlen: |
| |
| MSG_MERGE_REFRESHING_HEAD_VERSIONS = Headversionen aktualsieren |
| MSG_MERGE_HEAD_REVISION_DEFAULT = <keine Revision> |
| |
| ASCD_MERGE_DIALOG=Zusammenf\u00fchren mit Revision |
| |
| CTL_MergeForm_Action_Merge=Zusammenf\u00fchren |
| ACSD_MergeForm_Action_Merge=Zusammenf\u00fchren |
| CTL_MergeForm_Action_Cancel=Abbrechen |
| ACSD_MergeForm_Action_Cancel=Abbrechen |
| infoLabel.text = Inhalt des Arbeitsverzeichnisses mit der gew\u00e4hlten Revision zusammenf\u00fchren |
| infoLabel2.text = (Nach dem Zusammenf\u00fchren muss eingereicht werden) |
| |
