| # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
| # |
| # Copyright 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]" |
| # |
| # 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. |
| # |
| # Contributor(s): |
| # |
| # Portions Copyrighted 2010 Sun Microsystems, Inc. |
| |
| #MarkResolvedAction |
| LBL_MarkResolvedAction_Name=&Marcar Resolvido |
| LBL_MarkResolvedAction_PopupName=Marcar Resolvido |
| LBL_MarkingProgress=Marcando como solucionado |
| LBL_NoConflicts=Nenhum Conflito |
| LBL_ResolveAllConflictsAction_Name=Resolver Todos os Conflitos - Reposit\u00f3rio |
| LBL_ResolveConflictsAction_Name=Resolver Con&flitos |
| MSG_NoConflicts=N\u00e3o h\u00e1 conflitos para solucionar no contexto selecionado. |
| |
| LBL_ResolveConflictsAction_PopupName=Resolver Conflitos |
| MSG_PreparingMerge=Preparando mesclagem |
| |
| #ResolveConflictsExecutor |
| Merge.titleResult=Resultado depois de mesclagem |
| Diff.titleWorkingFile=Arquivo de Trabalho Local |
| LBL_TreeConflict_ResolveButton.title=Resolver |
| LBL_TreeConflict.title=Resolvendo o Conflito de \u00c1rvore |
| |
| |
| ResolveTreeConflictPanel.jLabel1.text=Selecione a a\u00e7\u00e3o de solu\u00e7\u00e3o: |
| |
| ResolveTreeConflictPanel.rbRemove.text=&Remover arquivo do \u00edndice |
| ResolveTreeConflictPanel.rbRemove.TTtext=Remover\u00e1 o arquivo do \u00edndice. O arquivo ser\u00e1 removido do reposit\u00f3rio da pr\u00f3xima vez que voc\u00ea fizer commit. |
| ResolveTreeConflictPanel.rbAdd.text=&Manter conte\u00fado atual do arquivo |
| ResolveTreeConflictPanel.rbAdd.toolTipText=Adicionar\u00e1 o estado atual do arquivo ao \u00edndice. O arquivo permanecer\u00e1 no reposit\u00f3rio na pr\u00f3xima vez que voc\u00ea fizer commit |
| |
| MSG_ResolveTreeConflictPanel.file.text=O arquivo {0} est\u00e1 em um conflito de \u00e1rvore |
| |
| |