summaryrefslogtreecommitdiffstats
path: root/po/fr.po
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2005-06-21 21:57:14 +0000
committerAndreas Gruenbacher <agruen@suse.de>2005-06-21 21:57:14 +0000
commitdd0f1ff558ce1d329174f58d8b0bef40e36f8968 (patch)
treef01d0878de42d5f3fb8ed6232849f26a9e3dcad5 /po/fr.po
parent31a5851d6372712fa6bafd4a6081f21ecee1c570 (diff)
downloadquilt-dd0f1ff558ce1d329174f58d8b0bef40e36f8968.tar.gz
- add command: "File %s added to patch %s" message goes to stdout
and not to stderr (Jean Delvare). - Don't fail when popping missing patches (Jerome Lacoste, Jean Delvare, I).
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po46
1 files changed, 26 insertions, 20 deletions
diff --git a/po/fr.po b/po/fr.po
index 4886cc1..8e750e7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -75,20 +75,20 @@ msgstr "Le fichier %s n'est pas dans le patch %s.\\n"
#: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76
#: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116
-#: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62
-#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53
+#: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62
+#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../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:99 ../quilt/diff.in:239 ../quilt/graph.in:121
-#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74
+#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74
msgid "Patch %s is not applied\\n"
msgstr "Le patch %s n'est pas appliqué\\n"
#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247
#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72
-#: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349
+#: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350
#: ../quilt/refresh.in:162 ../quilt/remove.in:81
msgid "No patches applied\\n"
msgstr "Aucun patch n'est appliqué\\n"
@@ -681,19 +681,24 @@ msgstr ""
"Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)"
"\\n"
-#: ../quilt/pop.in:178
+#: ../quilt/pop.in:181
+#, fuzzy
+msgid "Patch %s appears to be empty, removing\\n"
+msgstr "Le patch %s semble vide.\\n"
+
+#: ../quilt/pop.in:185
msgid "Removing patch %s\\n"
msgstr "Retrait de %s\\n"
-#: ../quilt/pop.in:262
+#: ../quilt/pop.in:269
msgid "Patch %s needs to be refreshed first.\\n"
msgstr "Le patch %s doit être rafraichi au préalable.\\n"
-#: ../quilt/pop.in:272
+#: ../quilt/pop.in:279
msgid "No patch removed\\n"
msgstr "Aucun patch retiré\\n"
-#: ../quilt/pop.in:295 ../quilt/push.in:371
+#: ../quilt/pop.in:302 ../quilt/push.in:372
msgid "Now at patch %s\\n"
msgstr "Le patch %s est maintenant au sommet\\n"
@@ -779,40 +784,41 @@ msgstr ""
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:96
-msgid "Patch %s appears to be empty\\n"
-msgstr "Le patch %s semble vide.\\n"
-
-#: ../quilt/push.in:160
+#: ../quilt/push.in:157
msgid "Applying patch %s\\n"
msgstr "Application de %s\\n"
-#: ../quilt/push.in:192
+#: ../quilt/push.in:189
+#, fuzzy
+msgid "Patch %s does not exist, applied\\n"
+msgstr "Le patch %s n'est pas appliqué\\n"
+
+#: ../quilt/push.in:193
msgid "Patch %s appears to be empty, applied\\n"
msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
-#: ../quilt/push.in:196
+#: ../quilt/push.in:197
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
-#: ../quilt/push.in:201
+#: ../quilt/push.in:202
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:240
+#: ../quilt/push.in:241
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:328
+#: ../quilt/push.in:329
msgid "Patch %s is already applied\\n"
msgstr "Le patch %s est déjà appliqué.\\n"
-#: ../quilt/push.in:337
+#: ../quilt/push.in:338
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:351
+#: ../quilt/push.in:352
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"