diff options
Diffstat (limited to 'po')
-rw-r--r-- | po/de.po | 219 | ||||
-rw-r--r-- | po/fr.po | 162 | ||||
-rw-r--r-- | po/quilt.pot | 123 |
3 files changed, 284 insertions, 220 deletions
@@ -45,11 +45,12 @@ 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:175 ../quilt/remove.in:75 +#: ../quilt/push.in:176 ../quilt/remove.in:75 msgid "No patch applied" msgstr "Kein Patch angewandt" -#: ../quilt/add.in:80 ../quilt/refresh.in:113 ../quilt/remove.in:80 +#: ../quilt/add.in:80 ../quilt/applied.in:71 ../quilt/refresh.in:113 +#: ../quilt/remove.in:80 msgid "Patch $patch is not applied" msgstr "Patch $patch ist nicht angewandt" @@ -61,26 +62,29 @@ msgstr "Datei $file ist bereits in Patch $patch enthalten" msgid "File $file modified by patch $next_patch" msgstr "Datei $file wird von Patch $next_patch verändert" -#: ../quilt/add.in:104 +#: ../quilt/add.in:103 msgid "Failed to back up file $file" msgstr "Konnte Datei $file nicht sichern" -#: ../quilt/add.in:124 +#: ../quilt/add.in:123 msgid "File $file added to patch $patch" msgstr "Datei $file zu Patch $patch hinzugefügt" #: ../quilt/applied.in:22 -msgid "Usage: quilt applied [patch]" +#, fuzzy +msgid "Usage: quilt applied [-n] [patch]" msgstr "Verwendung: quilt applied [patch]" #: ../quilt/applied.in:25 +#, fuzzy msgid "" "\n" "\n" "Print a list of applied patches, or all patches up to and including the\n" "specified patch in the file series.\n" "\n" -"-n\tPrint patch file names instead of patch names." +"-n\tPrint patch file names instead of patch names.\n" +"\n" msgstr "" "\n" "\n" @@ -125,6 +129,7 @@ msgstr "" "Verwendung: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [datei ...]" #: ../quilt/diff.in:31 +#, fuzzy msgid "" "\n" "\n" @@ -140,7 +145,8 @@ msgid "" "\n" "-c patch\n" "\tCreate a combined diff for all patches between this patch and\n" -"\tthe patch specified with -P.\n" +"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" +"\tto specifying the first applied patch.\n" "\n" "-R\tCreate a reverse diff.\n" "\n" @@ -169,62 +175,60 @@ msgstr "" "-z\tÄnderungen relativ zum angewandten Patch ausgeben.\n" "\n" -#: ../quilt/diff.in:131 -msgid "Options \\`-c patch' and \\`-z' cannot be combined." +#: ../quilt/diff.in:140 +#, fuzzy +msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." msgstr "Die Optionen \\`-c patch' and \\`-z' können nicht kombiniert werden." -#: ../quilt/diff.in:140 ../quilt/refresh.in:106 +#: ../quilt/diff.in:149 ../quilt/refresh.in:106 msgid "No patch seem to be applied" msgstr "Es ist kein Patch angewandt" -#: ../quilt/diff.in:147 +#: ../quilt/diff.in:156 msgid "Patch $last_patch is not applied" msgstr "Patch $last_patch ist nicht angewandt" -#: ../quilt/diff.in:157 +#: ../quilt/diff.in:166 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." -#: ../quilt/diff.in:165 -msgid "refresh_patches_per_file failed." -msgstr "Fehler in refresh_patches_per_file." - -#: ../quilt/diff.in:178 -msgid "Patch $opt_combine not applied before $last_patch." +#: ../quilt/diff.in:200 +#, fuzzy +msgid "Patch $first_patch not applied before $last_patch." msgstr "Patch $opt_combine ist nicht vor Patch $last_patch angewandt." -#: ../quilt/diff.in:212 -msgid "File $file is not being modified." -msgstr "Datei $file wird nicht verändert." - -#: ../quilt/diff.in:229 +#: ../quilt/diff.in:234 msgid "Cannot change into .pc/$last_patch" msgstr "Kann nicht in Verzeichnis .pc/$last_patch wechseln." -#: ../quilt/diff.in:234 +#: ../quilt/diff.in:239 ../scripts/rpatch.in:61 msgid "Failed to copy files to temporary directory" msgstr "Konnte Dateien nicht in ein temporäres Verzeichnis kopieren" -#: ../quilt/diff.in:239 +#: ../quilt/diff.in:250 msgid "Cannot change to temporary directory" msgstr "Kann nicht in temporäres Verzeichnis wechseln" -#: ../quilt/diff.in:256 +#: ../quilt/diff.in:267 ../scripts/rpatch.in:89 msgid "Failed to patch temporary files" msgstr "Konnte temporäre Dateien nicht patchen" -#: ../quilt/diff.in:263 +#: ../quilt/diff.in:274 msgid "Cannot change to source directory" msgstr "Kann nicht in Quellverzeichnis wechseln" -#: ../quilt/diff.in:292 ../quilt/refresh.in:144 +#: ../quilt/diff.in:292 +msgid "File $file is not being modified." +msgstr "Datei $file wird nicht verändert." + +#: ../quilt/diff.in:311 ../quilt/refresh.in:144 msgid "Diff failed, aborting." msgstr "Diff fehlgeschlagen, Abbruch." -#: ../quilt/diff.in:299 +#: ../quilt/diff.in:318 msgid "More recent patches modify files in $last_patch." msgstr "Später angewandte Patches verändern Dateien von $last_patch." @@ -408,10 +412,13 @@ msgid "Usage: quilt patches {file}" msgstr "Verwendung: quilt patches {file}" #: ../quilt/patches.in:25 +#, fuzzy msgid "" "\n" "\n" -"Print the list of patches that modify the specified file.\n" +"Print the list of patches that modify the specified file. (Uses a\n" +"heuristic to determine which files are modified by unapplied patches.\n" +"Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-n\tPrint the patch file names instead of the patch names.\n" "\n" @@ -474,32 +481,29 @@ msgstr "" "-v\tViele Meldungen ausgeben.\n" "\n" -#: ../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" - -#: ../quilt/pop.in:156 +#: ../quilt/pop.in:146 msgid "Patch $stop_at_patch is not applied." msgstr "Patch $stop_at_patch ist nicht angewandt." -#: ../quilt/pop.in:166 +#: ../quilt/pop.in:156 msgid "No patch removed" msgstr "Kein Patch entfernt" -#: ../quilt/pop.in:180 ../quilt/push.in:192 +#: ../quilt/pop.in:170 ../quilt/push.in:201 msgid "Interrupted by user" msgstr "Unterbrechung durch Benutzer" -#: ../quilt/pop.in:189 ../quilt/push.in:201 +#: ../quilt/pop.in:179 ../quilt/push.in:210 msgid "No patches applied" msgstr "Keine Patches angewandt" -#: ../quilt/pop.in:191 ../quilt/push.in:203 +#: ../quilt/pop.in:181 ../quilt/push.in:212 msgid "Now at patch $patch" msgstr "Jetzt in Patch $patch" #: ../quilt/previous.in:22 -msgid "Usage: quilt previous [patch]" +#, fuzzy +msgid "Usage: quilt previous [-n] [patch]" msgstr "Verwendung: quilt previous [patch]" #: ../quilt/previous.in:25 @@ -547,8 +551,9 @@ msgid "" "\tis not actually applied.\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" +"\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" @@ -572,11 +577,22 @@ msgstr "" "\tnicht sauber angewandt werden kann.\n" "\t\n" -#: ../quilt/push.in:162 +#: ../quilt/push.in:87 +msgid "Patch $stop_at_patch not found in file series" +msgstr "Patch $stop_at_patch in series-Datei nicht gefunden" + +#: ../quilt/push.in:163 msgid "Patch $stop_at_patch is already applied." msgstr "Patch $stop_at_patch ist bereits angewandt." -#: ../quilt/push.in:177 +#: ../quilt/push.in:180 +msgid "" +"The topmost patch $top 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." +msgstr "" + +#: ../quilt/push.in:186 msgid "File series fully applied, ends at patch $top" msgstr "series-Datei vollständig angewandt, endet in Patch $top" @@ -645,7 +661,7 @@ msgstr "" msgid "Nothing in patch $patch" msgstr "Patch $patch is leer" -#: ../quilt/refresh.in:197 +#: ../quilt/refresh.in:199 msgid "Refreshed patch $patch" msgstr "Patch $patch aufgefrischt." @@ -682,7 +698,7 @@ msgstr "Datei $file ist nicht in Patch $patch enthalten." msgid "Failed to remove file $file from patch $patch" msgstr "Konnte Datei $file nicht aus Patch $patch entfernen." -#: ../quilt/remove.in:116 +#: ../quilt/remove.in:110 msgid "File $file removed from patch $patch" msgstr "Datei $file aus Patch $patch entfernt." @@ -722,43 +738,55 @@ msgid "" "file must contain the name of the relevant tar archive, in addition to\n" "the list of patches.\n" "\n" -msgstr "" -"\n" -"\n" -"Baut einen Quellen-Baum aus einer series-Datei auf. Die series-Datei\n" -"muß neben der Liste der Patches auch den Namen der entsprechenden\n" -"Tar-Datei enthalten.\n" +"-d\tThe directory that contains the archives and patches. Defaults\n" +"\tto the directory of the series/spec file.\n" "\n" +"-l\tMake the patches directory a symbolic link. If a series file is\n" +"\tspecified, also create a symlink to the series file.\n" +msgstr "" -#: ../quilt/setup.in:100 +#: ../quilt/setup.in:108 msgid "Series file $series_file not found" msgstr "Seriendatei $series_file nicht gefunden" -#: ../quilt/setup.in:125 +#: ../quilt/setup.in:134 msgid "Reading sources from $arg" msgstr "Quellen werden von $arg gelesen" -#: ../quilt/setup.in:128 +#: ../quilt/setup.in:138 msgid "Unpacking archive $source/$arg" msgstr "Entpacke Archiv source/$arg" -#: ../quilt/setup.in:138 +#: ../quilt/setup.in:148 msgid "Directory $packagedir exists already." msgstr "Verzeichnis $packagedir existiert bereits." -#: ../quilt/setup.in:143 +#: ../quilt/setup.in:153 msgid "File $packagedir exists." msgstr "Datei $packagedir existiert." -#: ../quilt/setup.in:149 +#: ../quilt/setup.in:168 +msgid "Creating link to patches directory $arg" +msgstr "" + +#: ../quilt/setup.in:172 msgid "Copying patch $source/$arg" msgstr "Kopiere Patch $source/$arg" -#: ../quilt/setup.in:154 +#: ../quilt/setup.in:185 +#, fuzzy +msgid "File $packagedir/series exists; will not override." +msgstr "Datei $packagedir existiert." + +#: ../quilt/setup.in:192 ../quilt/setup.in:206 msgid "Copying series file" msgstr "Kopiere Seriendatei" -#: ../quilt/setup.in:178 +#: ../quilt/setup.in:202 +msgid "Creatig link to series file $arg" +msgstr "" + +#: ../quilt/setup.in:237 msgid "Directory $packagedir set up." msgstr "Verzeichnis $packagedir aufgebaut." @@ -804,35 +832,31 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname" msgstr "Verwendung: $0 [-fqv] patchname" -#: ../scripts/apatch.in:40 +#: ../scripts/apatch.in:29 msgid "Interrupted by user; patch $patch was not applied." msgstr "Unterbrechung durch Benutzer; Patch $patch wurde nicht angewandt." -#: ../scripts/apatch.in:51 ../scripts/rpatch.in:113 +#: ../scripts/apatch.in:40 msgid "Patch file $patch_file appears to be empty" msgstr "Patch-Datei $patch_file scheint leer zu sein" -#: ../scripts/apatch.in:84 +#: ../scripts/apatch.in:79 msgid "Applying $patch" msgstr "Anwenden von $patch" -#: ../scripts/apatch.in:87 +#: ../scripts/apatch.in:109 msgid "Patch $patch appears to be empty, applied" msgstr "Patch $patch scheint leer zu sein, angewandt" -#: ../scripts/apatch.in:95 -msgid "Recreated file list for $patch" -msgstr "Dateiliste für $patch aktualisiert" - -#: ../scripts/apatch.in:126 +#: ../scripts/apatch.in:112 msgid "Applied $patch (forced; needs refresh)" msgstr "Patch $patch angewandt (erzwungen, muß aufgefrischt werden (Refresh))" -#: ../scripts/apatch.in:130 +#: ../scripts/apatch.in:116 msgid "Patch $patch does not apply (enforce with -f)" msgstr "Patch $patch läßt sich nicht anwenden (erzwingen mit -f)" -#: ../scripts/apatch.in:186 ../scripts/rpatch.in:238 +#: ../scripts/apatch.in:173 ../scripts/rpatch.in:192 msgid "The topmost patch $top needs to be refreshed first." msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)." @@ -840,30 +864,49 @@ msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)." msgid "Usage: $0 [-fRq] patchname" msgstr "Verwendung: $0 [-fRq] patchname" -#: ../scripts/rpatch.in:44 -msgid "Patch does not remove changes:" -msgstr "Patch entfernt folgende Änderungen nicht:" - -#: ../scripts/rpatch.in:102 -msgid "Interrupted by user; patch $patch was not removed." -msgstr "Unterbrechung durch Benutzer; Patch $patch wurde nicht entfernt." +#: ../scripts/rpatch.in:104 +#, fuzzy +msgid "Patch $patch does not remove cleanly (enforce with -f)." +msgstr "Patch $patch kann nicht entfernt werden (erzwingen mit -f)" -#: ../scripts/rpatch.in:139 +#: ../scripts/rpatch.in:121 msgid "Patch $patch appears to be empty, removed" msgstr "Patch $patch scheint leer zu sein, entfernt" -#: ../scripts/rpatch.in:144 +#: ../scripts/rpatch.in:135 msgid "Removing $patch" msgstr "Entferne $patch" -#: ../scripts/rpatch.in:165 -msgid "Failed to create temporary files" -msgstr "Konnte temporäres Verzeichnis nicht erstellen" - -#: ../scripts/rpatch.in:186 -msgid "Patch $patch does not remove (enforce with -f)" -msgstr "Patch $patch kann nicht entfernt werden (erzwingen mit -f)" - #: ../scripts/spec2series.in:100 ../scripts/spec2series.in:192 msgid " done" msgstr " fertig" + +#~ msgid "refresh_patches_per_file failed." +#~ msgstr "Fehler in refresh_patches_per_file." + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Initializes a source tree from a patch series file. The patch series\n" +#~ "file must contain the name of the relevant tar archive, in addition to\n" +#~ "the list of patches.\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Baut einen Quellen-Baum aus einer series-Datei auf. Die series-Datei\n" +#~ "muß neben der Liste der Patches auch den Namen der entsprechenden\n" +#~ "Tar-Datei enthalten.\n" +#~ "\n" + +#~ msgid "Recreated file list for $patch" +#~ msgstr "Dateiliste für $patch aktualisiert" + +#~ msgid "Patch does not remove changes:" +#~ msgstr "Patch entfernt folgende Änderungen nicht:" + +#~ msgid "Interrupted by user; patch $patch was not removed." +#~ msgstr "Unterbrechung durch Benutzer; Patch $patch wurde nicht entfernt." + +#~ msgid "Failed to create temporary files" +#~ msgstr "Konnte temporäres Verzeichnis nicht erstellen" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: quilt 0.22\n" -"PO-Revision-Date: 2003-09-09 08:53+0200\n" +"PO-Revision-Date: 2003-11-20 10:45+0100\n" "Last-Translator: Martin Quinson <Martin.Quinson@tuxfamily.org>\n" "Language-Team: French <traduc@traduc.org>\n" "MIME-Version: 1.0\n" @@ -63,11 +63,11 @@ msgstr "Le fichier $file est déjà dans le patch $patch" msgid "File $file modified by patch $next_patch" msgstr "Le fichier $file est modifié par le patch $next_patch" -#: ../quilt/add.in:104 +#: ../quilt/add.in:103 msgid "Failed to back up file $file" msgstr "Impossible de faire une copie de sécurité de $file" -#: ../quilt/add.in:124 +#: ../quilt/add.in:123 msgid "File $file added to patch $patch" msgstr "Le fichier $file a été ajouté au patch $patch" @@ -175,19 +175,19 @@ msgstr "" "\tau patch spécifié.\n" "\n" -#: ../quilt/diff.in:132 -msgid "Options \\`-c patch' and \\`-z' cannot be combined." -msgstr "Les options \\`-c patch' et \\`-z' ne peuvent pas être combinées." +#: ../quilt/diff.in:140 +msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." +msgstr "Les options \\`-c patch', \\`--snapshot' et \\`-z' ne peuvent pas être combinées." -#: ../quilt/diff.in:141 ../quilt/refresh.in:106 +#: ../quilt/diff.in:149 ../quilt/refresh.in:106 msgid "No patch seem to be applied" msgstr "Aucun patch ne semble appliqué" -#: ../quilt/diff.in:148 +#: ../quilt/diff.in:156 msgid "Patch $last_patch is not applied" msgstr "Le patch $last_patch ne semble pas appliqué" -#: ../quilt/diff.in:158 +#: ../quilt/diff.in:166 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" @@ -195,43 +195,39 @@ msgstr "" "Impossible de créer des patches avec -p$opt_strip_level. Veuillez spécifier -" "p0 ou -p1 à la place" -#: ../quilt/diff.in:166 -msgid "refresh_patches_per_file failed." -msgstr "refresh_patches_per_file a échoué." - -#: ../quilt/diff.in:179 -msgid "Patch $opt_combine not applied before $last_patch." -msgstr "Le patch $opt_combine n'est pas appliqué avant $last_patch." - -#: ../quilt/diff.in:213 -msgid "File $file is not being modified." -msgstr "Le fichier $file n'est pas modifié." +#: ../quilt/diff.in:200 +msgid "Patch $first_patch not applied before $last_patch." +msgstr "Le patch $first_patch n'est pas appliqué avant $last_patch." -#: ../quilt/diff.in:230 +#: ../quilt/diff.in:234 msgid "Cannot change into .pc/$last_patch" msgstr "Impossible d'entrer dans .pc/$last_patch" -#: ../quilt/diff.in:235 +#: ../quilt/diff.in:239 ../scripts/rpatch.in:61 msgid "Failed to copy files to temporary directory" msgstr "Impossible de copier les fichiers dans le répertoire temporaire" -#: ../quilt/diff.in:240 +#: ../quilt/diff.in:250 msgid "Cannot change to temporary directory" msgstr "Impossible d'entrer dans le répertoire temporaire" -#: ../quilt/diff.in:257 +#: ../quilt/diff.in:267 ../scripts/rpatch.in:89 msgid "Failed to patch temporary files" msgstr "Impossible de patcher les fichiers temporaires" -#: ../quilt/diff.in:264 +#: ../quilt/diff.in:274 msgid "Cannot change to source directory" msgstr "Impossible d'entrer dans le répertoire source" -#: ../quilt/diff.in:293 ../quilt/refresh.in:144 +#: ../quilt/diff.in:292 +msgid "File $file is not being modified." +msgstr "Le fichier $file n'est pas modifié." + +#: ../quilt/diff.in:311 ../quilt/refresh.in:144 msgid "Diff failed, aborting." msgstr "Le diff a échoué. Abandon." -#: ../quilt/diff.in:300 +#: ../quilt/diff.in:318 msgid "More recent patches modify files in $last_patch." msgstr "Un patch plus recent modifie des fichiers communs à $last_patch." @@ -417,7 +413,9 @@ msgstr "Usage : quilt patches {fichier}" msgid "" "\n" "\n" -"Print the list of patches that modify the specified file.\n" +"Print the list of patches that modify the specified file. (Uses a\n" +"heuristic to determine which files are modified by unapplied patches.\n" +"Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-n\tPrint the patch file names instead of the patch names.\n" "\n" @@ -426,7 +424,12 @@ msgid "" msgstr "" "\n" "\n" -"Affiche la liste des patches modifiant le fichier spécifié.\n" +"Affiche la liste des patches modifiant le fichier spécifié. \n" +"\n" +"Une heuristique est utilisée pour déterminer quels fichiers sont \n" +"modifiés par les patches n'étant pas appliqués. Veuillez noter que \n" +"cette heuristique est bien plus lente que l'étude des patches \n" +"appliqués.\n" "\n" "-n\tAffiche les noms de fichier au lieu des noms de patch.\n" "\n" @@ -664,7 +667,7 @@ msgstr "" msgid "Nothing in patch $patch" msgstr "Le patch $patch ne contient rien" -#: ../quilt/refresh.in:197 +#: ../quilt/refresh.in:199 msgid "Refreshed patch $patch" msgstr "Le patch $patch a été rafraichi." @@ -701,7 +704,7 @@ msgstr "Le fichier $file n'est pas dans le patch $patch." msgid "Failed to remove file $file from patch $patch" msgstr "Impossible d'enlever le fichier $file du patch $patch." -#: ../quilt/remove.in:116 +#: ../quilt/remove.in:110 msgid "File $file removed from patch $patch" msgstr "Le fichier $file a été enlevé du patch $patch." @@ -742,43 +745,66 @@ msgid "" "file must contain the name of the relevant tar archive, in addition to\n" "the list of patches.\n" "\n" +"-d\tThe directory that contains the archives and patches. Defaults\n" +"\tto the directory of the series/spec file.\n" +"\n" +"-l\tMake the patches directory a symbolic link. If a series file is\n" +"\tspecified, also create a symlink to the series file.\n" msgstr "" "\n" "\n" -"Initialise une arborescence source depuis un fichier de série. Ce fichier " -"doit contenir le nom de l'archive tar à utiliser, ainsi que la liste des " -"patches.\n" +"Initialise une arborescence source à partir d'un fichier de série de patches. \n" +"Ce fichier doit contenir le nom de l'archive tar correspondante en plus de \n" +"la liste des patches.\n" +"\n" +"-d\tLe répertoire contenant l'archive et les patches.\n" +"\tIl s'agit du répertoire du fichier series/spec par défaut.\n" "\n" +"-l\tFait que le répertoire des patches soit un lien symbolique. Si un\n" +"\tfichier de série est également spécifié, crèe également un lien \n" +"\tsymbolique pour ce fichier.\n" -#: ../quilt/setup.in:100 +#: ../quilt/setup.in:108 msgid "Series file $series_file not found" msgstr "Fichier de série $series_file introuvable" -#: ../quilt/setup.in:125 +#: ../quilt/setup.in:134 msgid "Reading sources from $arg" msgstr "Lecture des sources depuis $arg" -#: ../quilt/setup.in:128 +#: ../quilt/setup.in:138 msgid "Unpacking archive $source/$arg" msgstr "Désarchivage depuis $source/$arg" -#: ../quilt/setup.in:138 +#: ../quilt/setup.in:148 msgid "Directory $packagedir exists already." msgstr "Le répertoire $packagedir existe déjà." -#: ../quilt/setup.in:143 +#: ../quilt/setup.in:153 msgid "File $packagedir exists." msgstr "Le fichier $packagedir existe." -#: ../quilt/setup.in:149 +#: ../quilt/setup.in:168 +msgid "Creating link to patches directory $arg" +msgstr "Création d'un lien vers le répertoire de patches $arg" + +#: ../quilt/setup.in:172 msgid "Copying patch $source/$arg" msgstr "Copie du patch $source/$arg" -#: ../quilt/setup.in:154 +#: ../quilt/setup.in:185 +msgid "File $packagedir/series exists; will not override." +msgstr "Le fichier $packagedir/series existe ; il ne sera pas écrasé." + +#: ../quilt/setup.in:192 ../quilt/setup.in:206 msgid "Copying series file" msgstr "Copie du fichier de série" -#: ../quilt/setup.in:178 +#: ../quilt/setup.in:202 +msgid "Creatig link to series file $arg" +msgstr "Création d'un lien vers le fichier de série $arg" + +#: ../quilt/setup.in:237 msgid "Directory $packagedir set up." msgstr "Le répertoire $packagedir est configuré." @@ -826,36 +852,32 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname" msgstr "Usage : $0 [-fqv] patchname" -#: ../scripts/apatch.in:40 +#: ../scripts/apatch.in:29 msgid "Interrupted by user; patch $patch was not applied." msgstr "Interrompu par l'utilisateur ; le patch $patch n'a pas été appliqué." -#: ../scripts/apatch.in:51 ../scripts/rpatch.in:113 +#: ../scripts/apatch.in:40 msgid "Patch file $patch_file appears to be empty" msgstr "Le fichier de patch $patch_file semble vide" -#: ../scripts/apatch.in:84 +#: ../scripts/apatch.in:79 msgid "Applying $patch" msgstr "Application de $patch" -#: ../scripts/apatch.in:87 +#: ../scripts/apatch.in:109 msgid "Patch $patch appears to be empty, applied" msgstr "Le patch $patch semble vide. Il a été appliqué." -#: ../scripts/apatch.in:95 -msgid "Recreated file list for $patch" -msgstr "La liste des fichiers pour $patch a été recrée." - -#: ../scripts/apatch.in:126 +#: ../scripts/apatch.in:112 msgid "Applied $patch (forced; needs refresh)" msgstr "$patch a été appliqué (forcé ; vous devriez le rafraîchir)" -#: ../scripts/apatch.in:130 +#: ../scripts/apatch.in:116 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:186 ../scripts/rpatch.in:238 +#: ../scripts/apatch.in:173 ../scripts/rpatch.in:192 msgid "The topmost patch $top needs to be refreshed first." msgstr "Le patch au sommet $top doit être rafraichi au préalable." @@ -863,30 +885,30 @@ msgstr "Le patch au sommet $top doit être rafraichi au préalable." msgid "Usage: $0 [-fRq] patchname" msgstr "Usage: $0 [-fRq] nom_de_patch" -#: ../scripts/rpatch.in:44 -msgid "Patch does not remove changes:" -msgstr "Le patch d'enlève pas les changements :" - -#: ../scripts/rpatch.in:102 -msgid "Interrupted by user; patch $patch was not removed." -msgstr "Interrompu par l'utilisateur ; le patch $patch n'a pas été retiré;" +#: ../scripts/rpatch.in:104 +msgid "Patch $patch does not remove cleanly (enforce with -f)." +msgstr "Le patch $patch ne se retire pas proprement (forcez avec -f)" -#: ../scripts/rpatch.in:139 +#: ../scripts/rpatch.in:121 msgid "Patch $patch appears to be empty, removed" msgstr "Le patch $patch semble vide. Il a été retiré." -#: ../scripts/rpatch.in:144 +#: ../scripts/rpatch.in:135 msgid "Removing $patch" msgstr "Retrait de $patch" -#: ../scripts/rpatch.in:165 -msgid "Failed to create temporary files" -msgstr "Impossible de créer les fichiers temporaires" - -#: ../scripts/rpatch.in:186 -msgid "Patch $patch does not remove (enforce with -f)" -msgstr "Le patch $patch ne se retire pas proprement (forcez avec -f)" - #: ../scripts/spec2series.in:100 ../scripts/spec2series.in:192 msgid " done" msgstr " fini" + +#~ msgid "Recreated file list for $patch" +#~ msgstr "La liste des fichiers pour $patch a été recrée." + +#~ msgid "Patch does not remove changes:" +#~ msgstr "Le patch d'enlève pas les changements :" + +#~ msgid "Interrupted by user; patch $patch was not removed." +#~ msgstr "Interrompu par l'utilisateur ; le patch $patch n'a pas été retiré;" + +#~ msgid "Failed to create temporary files" +#~ msgstr "Impossible de créer les fichiers temporaires" diff --git a/po/quilt.pot b/po/quilt.pot index e55b43f..0cba5c2 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -40,11 +40,11 @@ msgstr "" msgid "File $file modified by patch $next_patch" msgstr "" -#: ../quilt/add.in:104 +#: ../quilt/add.in:103 msgid "Failed to back up file $file" msgstr "" -#: ../quilt/add.in:124 +#: ../quilt/add.in:123 msgid "File $file added to patch $patch" msgstr "" @@ -118,61 +118,57 @@ msgid "" "\n" msgstr "" -#: ../quilt/diff.in:132 -msgid "Options \\`-c patch' and \\`-z' cannot be combined." +#: ../quilt/diff.in:140 +msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." msgstr "" -#: ../quilt/diff.in:141 ../quilt/refresh.in:106 +#: ../quilt/diff.in:149 ../quilt/refresh.in:106 msgid "No patch seem to be applied" msgstr "" -#: ../quilt/diff.in:148 +#: ../quilt/diff.in:156 msgid "Patch $last_patch is not applied" msgstr "" -#: ../quilt/diff.in:158 +#: ../quilt/diff.in:166 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" -#: ../quilt/diff.in:166 -msgid "refresh_patches_per_file failed." -msgstr "" - -#: ../quilt/diff.in:179 -msgid "Patch $opt_combine not applied before $last_patch." +#: ../quilt/diff.in:200 +msgid "Patch $first_patch not applied before $last_patch." msgstr "" -#: ../quilt/diff.in:213 -msgid "File $file is not being modified." -msgstr "" - -#: ../quilt/diff.in:230 +#: ../quilt/diff.in:234 msgid "Cannot change into .pc/$last_patch" msgstr "" -#: ../quilt/diff.in:235 +#: ../quilt/diff.in:239 ../scripts/rpatch.in:61 msgid "Failed to copy files to temporary directory" msgstr "" -#: ../quilt/diff.in:240 +#: ../quilt/diff.in:250 msgid "Cannot change to temporary directory" msgstr "" -#: ../quilt/diff.in:257 +#: ../quilt/diff.in:267 ../scripts/rpatch.in:89 msgid "Failed to patch temporary files" msgstr "" -#: ../quilt/diff.in:264 +#: ../quilt/diff.in:274 msgid "Cannot change to source directory" msgstr "" -#: ../quilt/diff.in:293 ../quilt/refresh.in:144 +#: ../quilt/diff.in:292 +msgid "File $file is not being modified." +msgstr "" + +#: ../quilt/diff.in:311 ../quilt/refresh.in:144 msgid "Diff failed, aborting." msgstr "" -#: ../quilt/diff.in:300 +#: ../quilt/diff.in:318 msgid "More recent patches modify files in $last_patch." msgstr "" @@ -324,7 +320,9 @@ msgstr "" msgid "" "\n" "\n" -"Print the list of patches that modify the specified file.\n" +"Print the list of patches that modify the specified file. (Uses a\n" +"heuristic to determine which files are modified by unapplied patches.\n" +"Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-n\tPrint the patch file names instead of the patch names.\n" "\n" @@ -486,7 +484,7 @@ msgstr "" msgid "Nothing in patch $patch" msgstr "" -#: ../quilt/refresh.in:197 +#: ../quilt/refresh.in:199 msgid "Refreshed patch $patch" msgstr "" @@ -514,7 +512,7 @@ msgstr "" msgid "Failed to remove file $file from patch $patch" msgstr "" -#: ../quilt/remove.in:116 +#: ../quilt/remove.in:110 msgid "File $file removed from patch $patch" msgstr "" @@ -546,37 +544,54 @@ msgid "" "file must contain the name of the relevant tar archive, in addition to\n" "the list of patches.\n" "\n" +"-d\tThe directory that contains the archives and patches. Defaults\n" +"\tto the directory of the series/spec file.\n" +"\n" +"-l\tMake the patches directory a symbolic link. If a series file is\n" +"\tspecified, also create a symlink to the series file.\n" msgstr "" -#: ../quilt/setup.in:100 +#: ../quilt/setup.in:108 msgid "Series file $series_file not found" msgstr "" -#: ../quilt/setup.in:125 +#: ../quilt/setup.in:134 msgid "Reading sources from $arg" msgstr "" -#: ../quilt/setup.in:128 +#: ../quilt/setup.in:138 msgid "Unpacking archive $source/$arg" msgstr "" -#: ../quilt/setup.in:138 +#: ../quilt/setup.in:148 msgid "Directory $packagedir exists already." msgstr "" -#: ../quilt/setup.in:143 +#: ../quilt/setup.in:153 msgid "File $packagedir exists." msgstr "" -#: ../quilt/setup.in:149 +#: ../quilt/setup.in:168 +msgid "Creating link to patches directory $arg" +msgstr "" + +#: ../quilt/setup.in:172 msgid "Copying patch $source/$arg" msgstr "" -#: ../quilt/setup.in:154 +#: ../quilt/setup.in:185 +msgid "File $packagedir/series exists; will not override." +msgstr "" + +#: ../quilt/setup.in:192 ../quilt/setup.in:206 msgid "Copying series file" msgstr "" -#: ../quilt/setup.in:178 +#: ../quilt/setup.in:202 +msgid "Creatig link to series file $arg" +msgstr "" + +#: ../quilt/setup.in:237 msgid "Directory $packagedir set up." msgstr "" @@ -612,35 +627,31 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname" msgstr "" -#: ../scripts/apatch.in:40 +#: ../scripts/apatch.in:29 msgid "Interrupted by user; patch $patch was not applied." msgstr "" -#: ../scripts/apatch.in:51 ../scripts/rpatch.in:113 +#: ../scripts/apatch.in:40 msgid "Patch file $patch_file appears to be empty" msgstr "" -#: ../scripts/apatch.in:84 +#: ../scripts/apatch.in:79 msgid "Applying $patch" msgstr "" -#: ../scripts/apatch.in:87 +#: ../scripts/apatch.in:109 msgid "Patch $patch appears to be empty, applied" msgstr "" -#: ../scripts/apatch.in:95 -msgid "Recreated file list for $patch" -msgstr "" - -#: ../scripts/apatch.in:126 +#: ../scripts/apatch.in:112 msgid "Applied $patch (forced; needs refresh)" msgstr "" -#: ../scripts/apatch.in:130 +#: ../scripts/apatch.in:116 msgid "Patch $patch does not apply (enforce with -f)" msgstr "" -#: ../scripts/apatch.in:186 ../scripts/rpatch.in:238 +#: ../scripts/apatch.in:173 ../scripts/rpatch.in:192 msgid "The topmost patch $top needs to be refreshed first." msgstr "" @@ -648,30 +659,18 @@ msgstr "" msgid "Usage: $0 [-fRq] patchname" msgstr "" -#: ../scripts/rpatch.in:44 -msgid "Patch does not remove changes:" -msgstr "" - -#: ../scripts/rpatch.in:102 -msgid "Interrupted by user; patch $patch was not removed." +#: ../scripts/rpatch.in:104 +msgid "Patch $patch does not remove cleanly (enforce with -f)." msgstr "" -#: ../scripts/rpatch.in:139 +#: ../scripts/rpatch.in:121 msgid "Patch $patch appears to be empty, removed" msgstr "" -#: ../scripts/rpatch.in:144 +#: ../scripts/rpatch.in:135 msgid "Removing $patch" msgstr "" -#: ../scripts/rpatch.in:165 -msgid "Failed to create temporary files" -msgstr "" - -#: ../scripts/rpatch.in:186 -msgid "Patch $patch does not remove (enforce with -f)" -msgstr "" - #: ../scripts/spec2series.in:100 ../scripts/spec2series.in:192 msgid " done" msgstr "" |