diff options
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 136 |
1 files changed, 67 insertions, 69 deletions
@@ -68,20 +68,20 @@ msgstr "" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 #: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:129 ../quilt/previous.in:62 ../quilt/push.in:145 +#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:150 +#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143 +#: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqué\\n" @@ -257,7 +257,7 @@ msgstr "Le patch %s n'est pas appliqué avant %s\\n." msgid "Cannot change into directory %s\\n" msgstr "Impossible d'entrer dans le répertoire %s\\n" -#: ../quilt/diff.in:318 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n" @@ -265,7 +265,7 @@ msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n" msgid "Cannot change to temporary directory\\n" msgstr "Impossible d'entrer dans le répertoire temporaire\\n" -#: ../quilt/diff.in:348 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" @@ -571,15 +571,25 @@ msgstr "" "\n" "-v\tOpère verbeusement.\n" -#: ../quilt/pop.in:160 +#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" +msgstr "" +"Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" +"\\n" + +#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +msgid "Removing patch %s\\n" +msgstr "Retrait de %s\\n" + +#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +msgid "Patch %s needs to be refreshed first.\\n" +msgstr "Le patch %s doit être rafraichi au préalable.\\n" + +#: ../quilt/pop.in:270 msgid "No patch removed\\n" msgstr "Aucun patch retiré\\n" -#: ../quilt/pop.in:176 ../quilt/push.in:212 -msgid "Interrupted by user\\n" -msgstr "Interrompu par l'utilisateur\\n" - -#: ../quilt/pop.in:192 ../quilt/push.in:223 +#: ../quilt/pop.in:293 ../quilt/push.in:321 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -657,26 +667,44 @@ msgstr "" "\tSi cette option n'est pas donnée, l'option -f sera passée au \n" "\tprogramme patch.\n" -#: ../quilt/push.in:87 +#: ../quilt/push.in:59 ../scripts/apatch.in:29 +msgid "Interrupted by user; patch %s was not applied.\\n" +msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n" + +#: ../quilt/push.in:71 ../scripts/apatch.in:41 +msgid "Patch %s appears to be empty\\n" +msgstr "Le patch %s semble vide.\\n" + +#: ../quilt/push.in:109 ../scripts/apatch.in:79 +msgid "Applying patch %s\\n" +msgstr "Application de %s\\n" + +#: ../quilt/push.in:159 ../scripts/apatch.in:130 +msgid "Patch %s appears to be empty, applied\\n" +msgstr "Le patch %s semble vide. Il a été appliqué.\\n" + +#: ../quilt/push.in:163 ../scripts/apatch.in:134 +msgid "Applied patch %s (forced; needs refresh)\\n" +msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n" + +#: ../quilt/push.in:168 ../scripts/apatch.in:139 +msgid "Patch %s does not apply (enforce with -f)\\n" +msgstr "" +"Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n" + +#: ../quilt/push.in:207 msgid "Patch %s not found in file series\\n" msgstr "Le patch %s est introuvable dans le fichier de série\\n" -#: ../quilt/push.in:168 +#: ../quilt/push.in:282 msgid "Patch %s is already applied\\n" msgstr "Le patch %s est déjà appliqué.\\n" -#: ../quilt/push.in:187 -msgid "" -"The topmost patch %s is not in the series file anymore;\n" -"cannot determine the next patch from the series file.\n" -"Please pop -f the top patch and check your series file.\\n" -msgstr "" -"Le patch du sommet %s n'apparait plus dans la série;\n" -"Impossible de déterminer le prochain patch de la série.\n" -"Veuillez utiliser pop -f pour le patch du sommet, et vérifier \n" -"votre fichier de série.\\n" +#: ../quilt/push.in:291 ../scripts/apatch.in:197 +msgid "The topmost patch %s needs to be refreshed first.\\n" +msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n" -#: ../quilt/push.in:193 +#: ../quilt/push.in:305 msgid "File series fully applied, ends at patch %s\\n" msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n" @@ -979,36 +1007,7 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname\\n" msgstr "Usage : $0 [-fqv] patchname\\n" -#: ../scripts/apatch.in:29 -msgid "Interrupted by user; patch %s was not applied.\\n" -msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n" - -#: ../scripts/apatch.in:41 -msgid "Patch %s appears to be empty\\n" -msgstr "Le patch %s semble vide.\\n" - -#: ../scripts/apatch.in:81 -msgid "Applying patch %s\\n" -msgstr "Application de %s\\n" - -#: ../scripts/apatch.in:117 -msgid "Patch %s appears to be empty, applied\\n" -msgstr "Le patch %s semble vide. Il a été appliqué.\\n" - -#: ../scripts/apatch.in:121 -msgid "Applied patch %s (forced; needs refresh)\\n" -msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n" - -#: ../scripts/apatch.in:126 -msgid "Patch %s does not apply (enforce with -f)\\n" -msgstr "" -"Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n" - -#: ../scripts/apatch.in:184 -msgid "The topmost patch %s needs to be refreshed first.\\n" -msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n" - -#: ../scripts/patchfns.in:702 +#: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1020,7 +1019,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n" -#: ../scripts/patchfns.in:769 +#: ../scripts/patchfns.in:770 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1032,16 +1031,15 @@ msgstr "" msgid "Usage: %s [-fRq] patchname\\n" msgstr "Usage: %s [-fRq] nom_de_patch\\n" -#: ../scripts/rpatch.in:100 -msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" -msgstr "" -"Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" -"\\n" - -#: ../scripts/rpatch.in:123 -msgid "Removing patch %s\\n" -msgstr "Retrait de %s\\n" - -#: ../scripts/rpatch.in:179 -msgid "Patch %s needs to be refreshed first.\\n" -msgstr "Le patch %s doit être rafraichi au préalable.\\n" +#~ msgid "Interrupted by user\\n" +#~ msgstr "Interrompu par l'utilisateur\\n" + +#~ msgid "" +#~ "The topmost patch %s is not in the series file anymore;\n" +#~ "cannot determine the next patch from the series file.\n" +#~ "Please pop -f the top patch and check your series file.\\n" +#~ msgstr "" +#~ "Le patch du sommet %s n'apparait plus dans la série;\n" +#~ "Impossible de déterminer le prochain patch de la série.\n" +#~ "Veuillez utiliser pop -f pour le patch du sommet, et vérifier \n" +#~ "votre fichier de série.\\n" |