diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2004-06-06 00:20:07 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2004-06-06 00:20:07 +0000 |
commit | eb1a6de33c1b631e4636ff26dde2945a0db8db74 (patch) | |
tree | f8f6db4094c602e59fbbf9398e6edfaa499e851f /po | |
parent | 77265baff69c1576f9e90e13b9a23d72363ab897 (diff) | |
download | quilt-eb1a6de33c1b631e4636ff26dde2945a0db8db74.tar.gz |
- backup-file.c: Add code to recursively search .pc directories.
Add a "no-op" mode as default, and allow to just unlink files.
- apatch/rpatch: let backup-files search .pc directories instead
of generating temporary file lists.
- rpatch/pop: unlink files of topmost patch after popping instead
of unlinking at each step.
- If QUILTRC is set in the environment, use this as the
configuration file.
Diffstat (limited to 'po')
-rw-r--r-- | po/de.po | 24 | ||||
-rw-r--r-- | po/fr.po | 38 | ||||
-rw-r--r-- | po/quilt.pot | 24 |
3 files changed, 38 insertions, 48 deletions
@@ -11,15 +11,15 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: ../bin/quilt.in:15 +#: ../bin/quilt.in:19 msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..." msgstr "Verwendung: quilt [--trace] [--quiltrc=XX] befehl [-h] ..." -#: ../bin/quilt.in:17 +#: ../bin/quilt.in:21 msgid "Commands are:" msgstr "Vorhandene Befehle:" -#: ../bin/quilt.in:22 +#: ../bin/quilt.in:26 msgid "" "\n" "Common options to all commands:\n" @@ -560,7 +560,7 @@ msgstr "Kein Patch entfernt" msgid "Interrupted by user" msgstr "Unterbrechung durch Benutzer" -#: ../quilt/pop.in:183 ../quilt/push.in:216 +#: ../quilt/pop.in:188 ../quilt/push.in:216 msgid "Now at patch $patch" msgstr "Jetzt in Patch $patch" @@ -883,23 +883,23 @@ msgstr "Unterbrechung durch Benutzer; Patch $patch wurde nicht angewandt." msgid "Patch file $patch_file appears to be empty" msgstr "Patch-Datei $patch_file scheint leer zu sein" -#: ../scripts/apatch.in:83 +#: ../scripts/apatch.in:80 msgid "Applying $patch" msgstr "Anwenden von $patch" -#: ../scripts/apatch.in:119 +#: ../scripts/apatch.in:116 msgid "Patch $patch appears to be empty, applied" msgstr "Patch $patch scheint leer zu sein, angewandt" -#: ../scripts/apatch.in:122 +#: ../scripts/apatch.in:119 msgid "Applied $patch (forced; needs refresh)" msgstr "Patch $patch angewandt (erzwungen, muß aufgefrischt werden (Refresh))" -#: ../scripts/apatch.in:126 +#: ../scripts/apatch.in:123 msgid "Patch $patch does not apply (enforce with -f)" msgstr "Patch $patch läßt sich nicht anwenden (erzwingen mit -f)" -#: ../scripts/apatch.in:183 ../scripts/rpatch.in:189 +#: ../scripts/apatch.in:180 ../scripts/rpatch.in:178 msgid "The topmost patch $top needs to be refreshed first." msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)." @@ -911,10 +911,6 @@ msgstr "Verwendung: $0 [-fRq] patchname" msgid "Patch $patch does not remove cleanly (enforce with -f)." msgstr "Patch $patch kann nicht entfernt werden (erzwingen mit -f)." -#: ../scripts/rpatch.in:117 -msgid "Patch $patch appears to be empty, removed" -msgstr "Patch $patch scheint leer zu sein, entfernt" - -#: ../scripts/rpatch.in:131 +#: ../scripts/rpatch.in:122 msgid "Removing $patch" msgstr "Entferne $patch" @@ -12,15 +12,15 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: ../bin/quilt.in:15 +#: ../bin/quilt.in:19 msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..." msgstr "Usage : quilt [--trace] [--quiltrc=XX] commande [-h] ..." -#: ../bin/quilt.in:17 +#: ../bin/quilt.in:21 msgid "Commands are:" msgstr "Les commandes sont :" -#: ../bin/quilt.in:22 +#: ../bin/quilt.in:26 msgid "" "\n" "Common options to all commands:\n" @@ -78,7 +78,7 @@ msgstr "Le patch $patch n'est pas appliqué" #: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:168 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 -#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:213 +#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:214 #: ../quilt/refresh.in:107 ../quilt/remove.in:80 msgid "No patches applied" msgstr "Aucun patch n'est appliqué" @@ -565,11 +565,11 @@ msgstr "Le patch $stop_at_patch n'est pas appliqué." msgid "No patch removed" msgstr "Aucun patch retiré" -#: ../quilt/pop.in:172 ../quilt/push.in:204 +#: ../quilt/pop.in:172 ../quilt/push.in:205 msgid "Interrupted by user" msgstr "Interrompu par l'utilisateur" -#: ../quilt/pop.in:183 ../quilt/push.in:215 +#: ../quilt/pop.in:188 ../quilt/push.in:216 msgid "Now at patch $patch" msgstr "Le patch $patch est maintenant au sommet" @@ -657,7 +657,7 @@ msgstr "Le patch $stop_at_patch est introuvable dans le fichier de série" msgid "Patch $stop_at_patch is already applied." msgstr "Le patch $stop_at_patch est déjà appliqué." -#: ../quilt/push.in:183 +#: ../quilt/push.in:184 msgid "" "The topmost patch $top is not in the series file anymore;\n" "cannot determine the next patch from the series file.\n" @@ -668,7 +668,7 @@ msgstr "" "Veuillez utiliser pop -f pour le patch du sommet, et vérifier \n" "votre fichier de série." -#: ../quilt/push.in:189 +#: ../quilt/push.in:190 msgid "File series fully applied, ends at patch $top" msgstr "La série est complètement appliquée. Le dernier patch est $top." @@ -800,7 +800,8 @@ msgstr "" #: ../quilt/setup.in:27 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}" -msgstr "Usage : quilt setup [-d répertoire_source] [-v] {fichier_séries|fichier_spec}" +msgstr "" +"Usage : quilt setup [-d répertoire_source] [-v] {fichier_séries|fichier_spec}" #: ../quilt/setup.in:30 msgid "" @@ -812,7 +813,8 @@ msgid "" "-v\tverbose debug output." msgstr "" "\n" -"Initialise un arbre de sources à partir d'un fichier de spécification rpm, ou d'un fichier de série quilt.\n" +"Initialise un arbre de sources à partir d'un fichier de spécification rpm, " +"ou d'un fichier de série quilt.\n" "\n" "-d\tpréfix de chemin optionel (sous-répertoire).\n" "\n" @@ -898,24 +900,24 @@ msgstr "Interrompu par l'utilisateur ; le patch $patch n'a pas été appliqué." msgid "Patch file $patch_file appears to be empty" msgstr "Le fichier de patch $patch_file semble vide" -#: ../scripts/apatch.in:83 +#: ../scripts/apatch.in:80 msgid "Applying $patch" msgstr "Application de $patch" -#: ../scripts/apatch.in:119 +#: ../scripts/apatch.in:116 msgid "Patch $patch appears to be empty, applied" msgstr "Le patch $patch semble vide. Il a été appliqué." -#: ../scripts/apatch.in:122 +#: ../scripts/apatch.in:119 msgid "Applied $patch (forced; needs refresh)" msgstr "$patch a été appliqué (forcé ; vous devriez le rafraîchir)" -#: ../scripts/apatch.in:126 +#: ../scripts/apatch.in:123 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:183 ../scripts/rpatch.in:189 +#: ../scripts/apatch.in:180 ../scripts/rpatch.in:178 msgid "The topmost patch $top needs to be refreshed first." msgstr "Le patch au sommet $top doit être rafraichi au préalable." @@ -927,10 +929,6 @@ msgstr "Usage: $0 [-fRq] nom_de_patch" 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:117 -msgid "Patch $patch appears to be empty, removed" -msgstr "Le patch $patch semble vide. Il a été retiré." - -#: ../scripts/rpatch.in:131 +#: ../scripts/rpatch.in:122 msgid "Removing $patch" msgstr "Retrait de $patch" diff --git a/po/quilt.pot b/po/quilt.pot index d903fe4..7473b55 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -1,12 +1,12 @@ -#: ../bin/quilt.in:15 +#: ../bin/quilt.in:19 msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..." msgstr "" -#: ../bin/quilt.in:17 +#: ../bin/quilt.in:21 msgid "Commands are:" msgstr "" -#: ../bin/quilt.in:22 +#: ../bin/quilt.in:26 msgid "" "\n" "Common options to all commands:\n" @@ -417,7 +417,7 @@ msgstr "" msgid "Interrupted by user" msgstr "" -#: ../quilt/pop.in:183 ../quilt/push.in:216 +#: ../quilt/pop.in:188 ../quilt/push.in:216 msgid "Now at patch $patch" msgstr "" @@ -653,23 +653,23 @@ msgstr "" msgid "Patch file $patch_file appears to be empty" msgstr "" -#: ../scripts/apatch.in:83 +#: ../scripts/apatch.in:80 msgid "Applying $patch" msgstr "" -#: ../scripts/apatch.in:119 +#: ../scripts/apatch.in:116 msgid "Patch $patch appears to be empty, applied" msgstr "" -#: ../scripts/apatch.in:122 +#: ../scripts/apatch.in:119 msgid "Applied $patch (forced; needs refresh)" msgstr "" -#: ../scripts/apatch.in:126 +#: ../scripts/apatch.in:123 msgid "Patch $patch does not apply (enforce with -f)" msgstr "" -#: ../scripts/apatch.in:183 ../scripts/rpatch.in:189 +#: ../scripts/apatch.in:180 ../scripts/rpatch.in:178 msgid "The topmost patch $top needs to be refreshed first." msgstr "" @@ -681,10 +681,6 @@ msgstr "" msgid "Patch $patch does not remove cleanly (enforce with -f)." msgstr "" -#: ../scripts/rpatch.in:117 -msgid "Patch $patch appears to be empty, removed" -msgstr "" - -#: ../scripts/rpatch.in:131 +#: ../scripts/rpatch.in:122 msgid "Removing $patch" msgstr "" |