| # 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. |
| |
| LBL_Merge.failed.title=N\u00e3o \u00c9 Poss\u00edvel Mesclar |
| LBL_MergeRevisionAction_Name=&Mesclar Revis\u00e3o... |
| LBL_MergeRevisionAction_PopupName=Mesclar Revis\u00e3o... |
| LBL_MergeRevisionAction.progressName=Mesclando ao HEAD |
| MSG_Merge.failed.aborted.text=A mesclagem requer um commit de mesclagem e n\u00e3o pode ser uma mesclagem de avan\u00e7o r\u00e1pido.\n\nDeseja reiniciar a mesclagem e permitir commits de mesclagem (op\u00e7\u00e3o --ff)? |
| MSG_MergeRevisionAction.result=Mesclar Resultado: {0}\n |
| MSG_MergeRevisionAction.result.alreadyUpToDate=O HEAD j\u00e1 cont\u00e9m a revis\u00e3o {0} |
| MSG_MergeRevisionAction.result.fastForward=Mesclagem de HEAD com {0}:\n |
| MSG_MergeRevisionAction.result.merged=Mesclagem de HEAD com {0}:\n |
| MSG_MergeRevisionAction.result.conflict=A mesclagem de HEAD com {0} produziu conflitos em:\n |
| MSG_MergeRevisionAction.result.failed=A mesclagem de HEAD com {0} falhou. Para obter mais informa\u00e7\u00f5es, consulte a sa\u00edda. |
| MSG_MergeRevisionAction.result.failedFiles=A mesclagem de HEAD com {0} falhou por causa destes arquivos:\n |
| MSG_MergeRevisionAction.result.aborted=A mesclagem de HEAD com {0} falhou porque ela requer um commit de mesclagem e s\u00f3 s\u00e3o permitidas mesclagens de avan\u00e7o r\u00e1pido. |
| MSG_MergeRevisionAction.result.unsupported=A mesclagem n\u00e3o \u00e9 suportada. |
| LBL_MergeRevision.OKButton.text=Me&sclar |
| LBL_MergeRevision.title=Mesclar Revis\u00e3o... |
| MergeRevisionPanel.jLabel1.text=Selecionar uma revis\u00e3o para mesclar ao HEAD |
| MergeRevision.ffoption.ff=Avan\u00e7o r\u00e1pido se poss\u00edvel (--ff) |
| MergeRevision.ffoption.ff.tt=Quando poss\u00edvel, a mesclagem n\u00e3o criar\u00e1 um novo commit, mas mover\u00e1 a ramifica\u00e7\u00e3o para o commit mesclado. |
| MergeRevision.ffoption.ffonly=S\u00f3 avan\u00e7o r\u00e1pido (--ff-only) |
| MergeRevision.ffoption.ffonly.tt=A mesclagem falhar\u00e1 se o commit de mesclagem for obrigat\u00f3rio (as duas ramifica\u00e7\u00f5es t\u00eam seus pr\u00f3prios commits) |
| MergeRevision.ffoption.noff=Sempre criar commit (--no-ff) |
| MergeRevision.ffoption.noff.tt=A mesclagem sempre criar\u00e1 um commit de mesclagem, o que \u00e9 \u00fatil para mesclar ramifica\u00e7\u00f5es de funcionalidade. |
| MergeRevisionPanel.ffModePanel.text=Selecionar modo de Avan\u00e7o R\u00e1pido |
| |
