| # 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 = &Mezclar cambios |
| |
| MSG_MERGE_PROGRESS = Combinando... |
| MSG_MERGE_TITLE = Combinaciones de Mercurial |
| MSG_MERGE_TITLE_SEP = --------------- |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = INFO: Combinaci\u00f3n incompatible con esta Vista |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = Combinaciones de Mercurial |
| MSG_MERGE_NOT_SUPPORTED_INVIEW = Combinaci\u00f3n incompatible con esta Vista |
| |
| MSG_NOTHING_TO_MERGE = No hay nada que combinar en este proyecto |
| |
| MSG_MERGE_INFO = \nINFO MERGE: c\u00f3mo combinar el apoyo de instalaci\u00f3n |
| #MSG_MERGE_INFO_URL = http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram |
| MSG_MERGE_UNCOMMITTED = Hay cambios no confirmados. \n\nRealice Commit antes de hacer otra combinaci\u00f3n. |
| MSG_MERGE_UNAVAILABLE = Merge no est\u00e1 configurado en su sistema.\n\nConsulte para el v\u00ednculo de mezcla de apoyo en la ventana de resultados. |
| MSG_MERGE_CONFLICT = INFO MERGE: CONFLICTO - {0} |
| MSG_MERGE_DONE = INFO MERGE: Combinaci\u00f3n terminada |
| MSG_MERGE_DONE_CONFLICTS = INFO MERGE: CONFLICTO(S) detectado(s), resu\u00e9lvalos manualmente, o mediante la orden de men\u00fa "Resolver Conflictos" |
| MSG_Merge.ConflictsCreated = Conflict(s) detected during Merge, resolve manually or using the menu command, "Resolve Conflicts" |
| MSG_MERGE_WARN_MULTIPLE_HEADS = WARNING MERGE: El Repositorio tiene {0} cabeceras: revisiones {1} |
| MSG_MERGE_DONE_MULTIPLE_HEADS = INFO MERGE: combine con una revisi\u00f3n espec\u00edfica usando, hg merge [REV] |
| MSG_MERGE_FAILED = WARNING MERGE: La combinaci\u00f3n ha fallado |
| |
| MSG_MERGE_WARN_NEEDED = WARNING MERGE: El repositorio tiene 2 cabeceras: revisiones {0} |
| MSG_MERGE_DO_NEEDED = INFO MERGE: Para combinar, use la orden de men\u00fa "Combinar" |
| MSG_MERGE_WARN_TITLE = Combinaci\u00f3n necesaria |
| MSG_MERGE_WARN_TEXT = El repositorio tiene varios encabezados y una combinaci\u00f3n es necesaria \nEjecute "Merge" para ejecutar una combinaci\u00f3n |
| MSG_MERGE_CHOOSE_REVISION = Escoger de entre las &Revisiones: |
| |
| MSG_MERGE_REFRESHING_HEAD_VERSIONS = Actualizando las versiones de las cabeceras |
| MSG_MERGE_HEAD_REVISION_DEFAULT = <no existe la revisi\u00f3n> |
| |
| ASCD_MERGE_DIALOG=Combinar con Revisi\u00f3n |
| |
| CTL_MergeForm_Action_Merge=Combinar |
| ACSD_MergeForm_Action_Merge=Combinar |
| CTL_MergeForm_Action_Cancel=Cancelar |
| ACSD_MergeForm_Action_Cancel=Cancelar |
| infoLabel.text = Combinar el contenido del directorio de trabajo con la Revisi\u00f3n seleccionada |
| infoLabel2.text = (Debe realizarse un almacenamiento despu\u00e9s de una combinaci\u00f3n) |
| |
