diff options
Diffstat (limited to 'po')
-rw-r--r-- | po/de.po | 27 | ||||
-rw-r--r-- | po/fr.po | 35 | ||||
-rw-r--r-- | po/quilt.pot | 27 |
3 files changed, 54 insertions, 35 deletions
@@ -45,7 +45,7 @@ msgstr "" "\tDer Patch, zu dem die Dateien hinzugefügt werden sollen." #: ../quilt/add.in:75 ../quilt/delete.in:69 ../quilt/files.in:74 -#: ../quilt/push.in:166 ../quilt/remove.in:75 +#: ../quilt/push.in:175 ../quilt/remove.in:75 msgid "No patch applied" msgstr "Kein Patch angewandt" @@ -220,11 +220,11 @@ msgstr "Konnte temporäre Dateien nicht patchen" msgid "Cannot change to source directory" msgstr "Kann nicht in Quellverzeichnis wechseln" -#: ../quilt/diff.in:298 ../quilt/refresh.in:144 +#: ../quilt/diff.in:292 ../quilt/refresh.in:144 msgid "Diff failed, aborting." msgstr "Diff fehlgeschlagen, Abbruch." -#: ../quilt/diff.in:305 +#: ../quilt/diff.in:299 msgid "More recent patches modify files in $last_patch." msgstr "Später angewandte Patches verändern Dateien von $last_patch." @@ -474,7 +474,7 @@ msgstr "" "-v\tViele Meldungen ausgeben.\n" "\n" -#: ../quilt/pop.in:83 ../quilt/push.in:82 +#: ../quilt/pop.in:83 ../quilt/push.in:86 msgid "Patch $stop_at_patch not found in file series" msgstr "Patch $stop_at_patch in series-Datei nicht gefunden" @@ -486,15 +486,15 @@ msgstr "Patch $stop_at_patch ist nicht angewandt." msgid "No patch removed" msgstr "Kein Patch entfernt" -#: ../quilt/pop.in:180 ../quilt/push.in:183 +#: ../quilt/pop.in:180 ../quilt/push.in:192 msgid "Interrupted by user" msgstr "Unterbrechung durch Benutzer" -#: ../quilt/pop.in:189 ../quilt/push.in:192 +#: ../quilt/pop.in:189 ../quilt/push.in:201 msgid "No patches applied" msgstr "Keine Patches angewandt" -#: ../quilt/pop.in:191 ../quilt/push.in:194 +#: ../quilt/pop.in:191 ../quilt/push.in:203 msgid "Now at patch $patch" msgstr "Jetzt in Patch $patch" @@ -525,6 +525,7 @@ msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]" msgstr "Verwendung: quilt push [-afqv] [--leave-rejects] [num|patch]" #: ../quilt/push.in:25 +#, fuzzy msgid "" "\n" "\n" @@ -544,7 +545,11 @@ msgid "" "--leave-rejects\n" "\tLeave around the reject files patch produced, even if the patch\n" "\tis not actually applied.\n" -"\t\n" +"\n" +"--interactive\n" +"\tAllow the patch utility to ask hwo to deal with conflicts. If\n" +"\tthis option is not given, the -f patch optionch will be used.\n" +"\n" msgstr "" "\n" "\n" @@ -567,11 +572,11 @@ msgstr "" "\tnicht sauber angewandt werden kann.\n" "\t\n" -#: ../quilt/push.in:153 +#: ../quilt/push.in:162 msgid "Patch $stop_at_patch is already applied." msgstr "Patch $stop_at_patch ist bereits angewandt." -#: ../quilt/push.in:168 +#: ../quilt/push.in:177 msgid "File series fully applied, ends at patch $top" msgstr "series-Datei vollständig angewandt, endet in Patch $top" @@ -831,7 +836,7 @@ msgstr "Patch $patch angewandt (erzwungen, muß aufgefrischt werden (Refresh))" msgid "Patch $patch does not apply (enforce with -f)" msgstr "Patch $patch läßt sich nicht anwenden (erzwingen mit -f)" -#: ../scripts/apatch.in:181 ../scripts/rpatch.in:238 +#: ../scripts/apatch.in:186 ../scripts/rpatch.in:238 msgid "The topmost patch $top needs to be refreshed first." msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)." @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: quilt 0.22\n" -"PO-Revision-Date: 2003-02-17 10:10+0100\n" +"PO-Revision-Date: 2003-06-25 15:40+0200\n" "Last-Translator: Martin Quinson <Martin.Quinson@tuxfamily.org>\n" "Language-Team: French <traduc@traduc.org>\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "" "\tPatch auquel les fichiers doivent être ajoutés." #: ../quilt/add.in:75 ../quilt/delete.in:69 ../quilt/files.in:74 -#: ../quilt/push.in:166 ../quilt/remove.in:75 +#: ../quilt/push.in:176 ../quilt/remove.in:75 msgid "No patch applied" msgstr "Aucun patch n'est appliqué" @@ -221,11 +221,11 @@ msgstr "Impossible de patcher les fichiers temporaires" msgid "Cannot change to source directory" msgstr "Impossible d'entrer dans le répertoire source" -#: ../quilt/diff.in:298 ../quilt/refresh.in:144 +#: ../quilt/diff.in:292 ../quilt/refresh.in:144 msgid "Diff failed, aborting." msgstr "Le diff a échoué. Abandon." -#: ../quilt/diff.in:305 +#: ../quilt/diff.in:299 msgid "More recent patches modify files in $last_patch." msgstr "Un patch plus recent modifie des fichiers communs à $last_patch." @@ -473,7 +473,7 @@ msgstr "" "-v\tOpère verbeusement.\n" "\n" -#: ../quilt/pop.in:83 ../quilt/push.in:82 +#: ../quilt/pop.in:83 ../quilt/push.in:87 msgid "Patch $stop_at_patch not found in file series" msgstr "Le patch $stop_at_patch est introuvable dans le fichier de série" @@ -485,15 +485,15 @@ msgstr "Le patch $stop_at_patch n'est pas appliqué." msgid "No patch removed" msgstr "Aucun patch retiré" -#: ../quilt/pop.in:180 ../quilt/push.in:183 +#: ../quilt/pop.in:180 ../quilt/push.in:193 msgid "Interrupted by user" msgstr "Interrompu par l'utilisateur" -#: ../quilt/pop.in:189 ../quilt/push.in:192 +#: ../quilt/pop.in:189 ../quilt/push.in:202 msgid "No patches applied" msgstr "Aucun patch n'est appliqué" -#: ../quilt/pop.in:191 ../quilt/push.in:194 +#: ../quilt/pop.in:191 ../quilt/push.in:204 msgid "Now at patch $patch" msgstr "Le patch $patch est maintenant au sommet" @@ -543,7 +543,12 @@ msgid "" "--leave-rejects\n" "\tLeave around the reject files patch produced, even if the patch\n" "\tis not actually applied.\n" -"\t\n" +"\n" +"--interactive\n" +"\tAllow the patch utility to ask how to deal with conflicts. If\n" +"\tthis option is not given, the option -f will be passed to the \n" +"\tpatch program.\n" +"\n" msgstr "" "\n" "\n" @@ -565,14 +570,18 @@ msgstr "" "\tLaisse les fichiers de rejets produits, même si l'application du\n" "\tpatch a échoué et qu'il n'est finalement pas appliqué.\n" "\n" +"--interactive\n" +"\tLaisse l'utilitaire patch demander comment résoudre les conflits.\n" +"\tSi cette option n'est pas donnée, l'option -f sera passée au \n" +"\tprogramme patch.\n" -#: ../quilt/push.in:153 +#: ../quilt/push.in:163 msgid "Patch $stop_at_patch is already applied." msgstr "Le patch $stop_at_patch est déjà appliqué." -#: ../quilt/push.in:168 +#: ../quilt/push.in:178 msgid "File series fully applied, ends at patch $top" -msgstr "La série est complètement appliqué. Le dernier patch est $top." +msgstr "La série est complètement appliquée. Le dernier patch est $top." #: ../quilt/refresh.in:27 msgid "Usage: quilt refresh [-p n] [-f] [patch]" @@ -833,7 +842,7 @@ msgid "Patch $patch does not apply (enforce with -f)" msgstr "" "Le patch $patch ne s'applique pas proprement (forcez l'application avec -f)" -#: ../scripts/apatch.in:181 ../scripts/rpatch.in:238 +#: ../scripts/apatch.in:186 ../scripts/rpatch.in:238 msgid "The topmost patch $top needs to be refreshed first." msgstr "Le patch au sommet $top doit être rafraichi au préalable." diff --git a/po/quilt.pot b/po/quilt.pot index c1df7a8..4a30ed4 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -23,7 +23,7 @@ msgid "" msgstr "" #: ../quilt/add.in:75 ../quilt/delete.in:69 ../quilt/files.in:74 -#: ../quilt/push.in:166 ../quilt/remove.in:75 +#: ../quilt/push.in:176 ../quilt/remove.in:75 msgid "No patch applied" msgstr "" @@ -165,11 +165,11 @@ msgstr "" msgid "Cannot change to source directory" msgstr "" -#: ../quilt/diff.in:298 ../quilt/refresh.in:144 +#: ../quilt/diff.in:292 ../quilt/refresh.in:144 msgid "Diff failed, aborting." msgstr "" -#: ../quilt/diff.in:305 +#: ../quilt/diff.in:299 msgid "More recent patches modify files in $last_patch." msgstr "" @@ -356,7 +356,7 @@ msgid "" "\n" msgstr "" -#: ../quilt/pop.in:83 ../quilt/push.in:82 +#: ../quilt/pop.in:83 ../quilt/push.in:87 msgid "Patch $stop_at_patch not found in file series" msgstr "" @@ -368,15 +368,15 @@ msgstr "" msgid "No patch removed" msgstr "" -#: ../quilt/pop.in:180 ../quilt/push.in:183 +#: ../quilt/pop.in:180 ../quilt/push.in:193 msgid "Interrupted by user" msgstr "" -#: ../quilt/pop.in:189 ../quilt/push.in:192 +#: ../quilt/pop.in:189 ../quilt/push.in:202 msgid "No patches applied" msgstr "" -#: ../quilt/pop.in:191 ../quilt/push.in:194 +#: ../quilt/pop.in:191 ../quilt/push.in:204 msgid "Now at patch $patch" msgstr "" @@ -419,14 +419,19 @@ msgid "" "--leave-rejects\n" "\tLeave around the reject files patch produced, even if the patch\n" "\tis not actually applied.\n" -"\t\n" +"\n" +"--interactive\n" +"\tAllow the patch utility to ask how to deal with conflicts. If\n" +"\tthis option is not given, the option -f will be passed to the \n" +"\tpatch program.\n" +"\n" msgstr "" -#: ../quilt/push.in:153 +#: ../quilt/push.in:163 msgid "Patch $stop_at_patch is already applied." msgstr "" -#: ../quilt/push.in:168 +#: ../quilt/push.in:178 msgid "File series fully applied, ends at patch $top" msgstr "" @@ -629,7 +634,7 @@ msgstr "" msgid "Patch $patch does not apply (enforce with -f)" msgstr "" -#: ../scripts/apatch.in:181 ../scripts/rpatch.in:238 +#: ../scripts/apatch.in:186 ../scripts/rpatch.in:238 msgid "The topmost patch $top needs to be refreshed first." msgstr "" |