| # 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=Fusionner les visualiseurs |
| |
| GraphicalMergeVisualizer.displayName=Interpr\u00e9teur des conflits de fusion graphique |
| GraphicalMergeVisualizer.shortDescription= |
| |
| # GraphicalMergeVisualizerBeanInfo |
| PROP_colorUnresolvedConflict=Couleur de texte des conflits non interpr\u00e9t\u00e9s |
| HINT_colorUnresolvedConflict=Couleur d'arri\u00e8re-plan du texte des conflits non interpr\u00e9t\u00e9s. |
| PROP_colorResolvedConflict=Couleur de texte appliqu\u00e9e aux conflits \u00e0 interpr\u00e9ter |
| HINT_colorResolvedConflict=Couleur d'arri\u00e8re-plan du texte appliqu\u00e9e aux conflits \u00e0 interpr\u00e9ter |
| PROP_colorOtherConflict=Couleur de texte non appliqu\u00e9e aux conflits \u00e0 interpr\u00e9ter |
| HINT_colorOtherConflict=Couleur d'arri\u00e8re-plan du texte non appliqu\u00e9e aux conflits \u00e0 interpr\u00e9ter |
| |
| # MergeDialogComponent |
| MergeDialogComponent.title=Interpr\u00e9teur des conflits de fusion |
| ACSN_Merge_Dialog_Component=Composant Interpr\u00e9teur des conflits |
| ACSD_Merge_Dialog_Component=Interpr\u00e9teur des conflits de fusion. |
| ACSN_Merge_Tabbed_Pane=Fichiers avec conflits |
| ACSD_Merge_Tabbed_Pane=Onglets des fichiers pr\u00e9sentant des conflits. |
| |
| # MergePanel |
| MergePanel.nextButton.toolTipText=Diff\u00e9re&nce suivante |
| MergePanel.prevButton.toolTipText=Diff\u00e9rence &pr\u00e9c\u00e9dente |
| # Status of conflicts resolving: |
| # {0} .. current conflict |
| # {1} .. total number of conflicts |
| # {2} .. number of unresolved conflicts |
| MergePanel.statusLine=Conflit\u00a0 {0} sur {1}, non interpr\u00e9t\u00e9\u00a0 {2} |
| ACS_EditorPane1A11yName=Premier fichier |
| ACS_EditorPane1A11yDescr=Contenu du premier fichier. |
| ACS_EditorPane2A11yName=Second fichier |
| ACS_EditorPane2A11yDescr=Contenu du second fichier. |
| ACS_EditorPane3A11yName=R\u00e9sultat de la fusion |
| ACS_EditorPane3A11yDescr=Contenu des r\u00e9sultats de la fusion et des conflits interpr\u00e9t\u00e9s. |
| |
| |
| MergePanel.acceptLeftButton.text=&Accepter |
| MergePanel.acceptAndNextLeftButton=Acc&epter et passer \u00e0 la suivante |
| MergePanel.acceptRightButton.text=Accep&ter |
| MergePanel.acceptAndNextRightButton=Accepter et passer \u00e0 la suivante |
| |
| ACS_MergePanel.acceptLeftButton.textA11yDesc=Accepter l'option de gauche. |
| ACS_MergePanel.acceptAndNextLeftButtonA11yDesc=Accepter l'option de gauche et passer au conflit suivant. |
| ACS_MergePanel.acceptRightButton.textA11yDesc=Accepter l'option de droite. |
| ACS_MergePanel.acceptAndNextRightButtonA11yDesc=Accepter l'option de droite et passer au conflit suivant. |
| |
| # {0} .. The name fo the file to be saved |
| SaveFileQuestion=Le fichier {0} a \u00e9t\u00e9 modifi\u00e9. L'enregistrer ? |
| # {0} .. The number of files to be saved |
| SaveFilesQuestion={0} fichiers modifi\u00e9s. Les enregistrer? |
| # Printed message, when the merge result saving fails. |
| # {0} .. the localized message reported by the IOException |
| MergeControl.failedToSave=\u00c9chec de l''enregistrement du r\u00e9sultat de fusion\u00a0 {0} |
| BTN_OK=&OK |
| ACS_BTN_OKA11yDesc=Accepter les modifications et fermer la bo\u00eete de dialogue. |
| BTN_Cancel=&Annuler |
| ACS_BTN_CancelA11yDesc=Annuler les modifications et fermer la bo\u00eete de dialogue. |
| BTN_Help=A&ide |
| ACS_BTN_HelpA11yDesc=Afficher l'aide de cette bo\u00eete de dialogue. |
| |
| CloseAction=Fermer |
| |
| SaveFileWarningQuestion=Le fichier {0} est modifi\u00e9; l''enregistrer?\nTous les conflits n'ont pas \u00e9t\u00e9 r\u00e9solus. |
| SaveFilesWarningQuestion={0} fichiers modifi\u00e9s; les enregistrer?\nTous les conflits n'ont pas \u00e9t\u00e9 r\u00e9solus. |
| WarningQuestion=Les conflits ne sont pas r\u00e9solus. Fermer quand m\u00eame l'outil de visualisation? |
| |
