| # 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 = Fusionner les &modifications |
| |
| MSG_MERGE_PROGRESS = Fusion... |
| MSG_MERGE_TITLE = Fusion mercurial |
| MSG_MERGE_TITLE_SEP = --------------- |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_INFO = INFO: La fusion n'est pas prise en charge dans cette vue |
| MSG_MERGE_NOT_SUPPORTED_INVIEW_TITLE = Fusion mercurial |
| MSG_MERGE_NOT_SUPPORTED_INVIEW = La fusion n'est pas prise en charge dans cette vue |
| |
| MSG_NOTHING_TO_MERGE = Rien \u00e0 fusionner dans ce projet. |
| |
| MSG_MERGE_INFO = \nINFO MERGE: Comment pr\u00e9parer la prise en charge de la fusion |
| #MSG_MERGE_INFO_URL = http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram |
| MSG_MERGE_UNCOMMITTED = Il y a des modifications non committ\u00e9es.\n\nCommittez-les avant de lancer une autre fusion. |
| MSG_MERGE_UNAVAILABLE = La fusion n'est pas param\u00e9tr\u00e9e sur votre syst\u00e8me.\n\nR\u00e9f\u00e9rez-vous au lien Prise en charge de la fusion dans la fen\u00eatre de sortie. |
| MSG_MERGE_CONFLICT = INFO MERGE: CONFLIT - {0} |
| MSG_MERGE_DONE = INFO MERGE: Fusion termin\u00e9e |
| MSG_MERGE_DONE_CONFLICTS = INFO MERGE: CONFLIT(S) d\u00e9tect\u00e9s, r\u00e9solvez-les manuellement ou en utilisant la commande "R\u00e9soudre les conflits" dans le menu |
| MSG_Merge.ConflictsCreated = Conflit(s) d\u00e9tect\u00e9(s) pendant la fusion, r\u00e9solvez-les manuellement ou en utilisant la commande "R\u00e9soudre les conflits" dans le menu |
| MSG_MERGE_WARN_MULTIPLE_HEADS = WARNING MERGE: Le r\u00e9f\u00e9rentiel a {0} heads: revs {1} |
| MSG_MERGE_DONE_MULTIPLE_HEADS = INFO MERGE: fusionnez avec une r\u00e9vision sp\u00e9cifique en utilisant hg merge [REV] |
| MSG_MERGE_FAILED = WARNING MERGE: La fusion a \u00e9chou\u00e9 |
| |
| MSG_MERGE_WARN_NEEDED = WARNING MERGE: Le r\u00e9f\u00e9rentiel a 2 heads: revs {0} |
| MSG_MERGE_DO_NEEDED = INFO MERGE: Pour fusionner, utilisez la commande "Fusionner" dans le menu |
| MSG_MERGE_WARN_TITLE = Une fusion est requise |
| MSG_MERGE_WARN_TEXT = Le r\u00e9f\u00e9rentiel a plusieurs heads et une fusion est requise\nEx\u00e9cutez "Fusionner" pour r\u00e9aliser une fusion |
| MSG_MERGE_CHOOSE_REVISION = Choisir dans les &r\u00e9visions: |
| |
| MSG_MERGE_REFRESHING_HEAD_VERSIONS = Actualisation des versions Head |
| MSG_MERGE_HEAD_REVISION_DEFAULT = <pas de r\u00e9vision> |
| |
| ASCD_MERGE_DIALOG=Fusionner avec la r\u00e9vision |
| |
| CTL_MergeForm_Action_Merge=Fusionner |
| ACSD_MergeForm_Action_Merge=Fusionner |
| CTL_MergeForm_Action_Cancel=Annuler |
| ACSD_MergeForm_Action_Cancel=Annuler |
| infoLabel.text = Fusionner le contenu du r\u00e9pertoire de travail avec la r\u00e9vision s\u00e9lectionn\u00e9e |
| infoLabel2.text = (Il faut committer apr\u00e8s la fusion) |
| |
