From 3eecd9793f12f5ac7b87bceba06c343dfbc7cd3a Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sun, 16 Feb 2003 20:32:43 +0000 Subject: Format in-line documentation to be around 72 characters in width. --- po/de.po | 240 +++++++++++++++++++++++++++---------------------------- po/quilt.pot | 170 +++++++++++++++++++-------------------- quilt/add.in | 7 +- quilt/delete.in | 4 +- quilt/diff.in | 18 ++--- quilt/files.in | 3 +- quilt/import.in | 7 +- quilt/new.in | 4 +- quilt/pop.in | 17 ++-- quilt/push.in | 13 ++- quilt/refresh.in | 20 ++--- quilt/remove.in | 5 +- quilt/setup.in | 6 +- 13 files changed, 249 insertions(+), 265 deletions(-) diff --git a/po/de.po b/po/de.po index cbcf7d8..f2c3a81 100644 --- a/po/de.po +++ b/po/de.po @@ -27,46 +27,45 @@ msgstr "Verwendung: quilt add [-p patch] {datei} ..." msgid "" "\n" "\n" -"Add one or more files to the topmost or named patch.\n" -"Files must be added to the patch before being modified.\n" -"Files that are modified by patches on top of the specified\n" -"patch cannot be added.\n" +"Add one or more files to the topmost or named patch. Files must be\n" +"added to the patch before being modified. Files that are modified by\n" +"patches on top of the specified patch cannot be added.\n" "\n" "-p patch\n" "\tPatch to add files to." msgstr "" "\n" "\n" -"Fügt eine oder mehrere Dateien zum obersten oder angegebenen Patch hinzu.\n" -"Dateien müssen einem Patch hinzugefügt werden, bevor sie verändert werden.\n" -"Dateien können einem Patch nur hinzugefügt werden, solange sie von keinem\n" -"Patch höher auf dem Stapel verändert werden.\n" +"Fügt eine oder mehrere Dateien zum obersten oder angegebenen Patch\n" +"hinzu. Dateien müssen einem Patch hinzugefügt werden, bevor sie\n" +"verändert werden. Dateien können einem Patch nur hinzugefügt werden,\n" +"solange sie von keinem Patch höher auf dem Stapel verändert werden.\n" "\n" "-p patch\n" "\tDer Patch, zu dem die Dateien hinzugefügt werden sollen." -#: ../quilt/add.in:76 ../quilt/delete.in:69 ../quilt/files.in:75 -#: ../quilt/push.in:167 ../quilt/remove.in:76 +#: ../quilt/add.in:75 ../quilt/delete.in:69 ../quilt/files.in:74 +#: ../quilt/push.in:166 ../quilt/remove.in:75 msgid "No patch applied" msgstr "Kein Patch angewandt" -#: ../quilt/add.in:81 ../quilt/refresh.in:113 ../quilt/remove.in:81 +#: ../quilt/add.in:80 ../quilt/refresh.in:113 ../quilt/remove.in:80 msgid "Patch $patch is not applied" msgstr "Patch $patch ist nicht angewandt" -#: ../quilt/add.in:90 +#: ../quilt/add.in:89 msgid "File $file is already in patch $patch" msgstr "Datei $file ist bereits in Patch $patch enthalten" -#: ../quilt/add.in:97 ../quilt/remove.in:98 +#: ../quilt/add.in:96 ../quilt/remove.in:97 msgid "File $file modified by patch $next_patch" msgstr "Datei $file wird von Patch $next_patch verändert" -#: ../quilt/add.in:105 +#: ../quilt/add.in:104 msgid "Failed to back up file $file" msgstr "Konnte Datei $file nicht sichern" -#: ../quilt/add.in:125 +#: ../quilt/add.in:124 msgid "File $file added to patch $patch" msgstr "Datei $file zu Patch $patch hinzugefügt" @@ -98,8 +97,8 @@ msgstr "Verwendung: quilt delete [patch]" msgid "" "\n" "\n" -"Remove the specified or topmost patch from the series file. If the \n" -"patch is applied, quilt will attempt to remove it first. (Only the \n" +"Remove the specified or topmost patch from the series file. If the\n" +"patch is applied, quilt will attempt to remove it first. (Only the\n" "topmost patch can be removed right now.)" msgstr "" "\n" @@ -129,31 +128,31 @@ msgstr "" msgid "" "\n" "\n" -"Produces a diff of the specified file(s) in the topmost or\n" -"specified patch. If no files are specified, all files that\n" -"are modified are included.\n" +"Produces a diff of the specified file(s) in the topmost or specified\n" +"patch. If no files are specified, all files that are modified are\n" +"included.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" "-P patch\n" -"\tCreate a diff for the specified patch. (Defaults to\n" -"\tthe topmost patch.)\n" +"\tCreate a diff for the specified patch. (Defaults to the topmost\n" +"\tpatch.)\n" "\n" "-c patch\n" -"\tCreate a combined diff for all patches between this\n" -"\tpatch and the patch specified with -P.\n" +"\tCreate a combined diff for all patches between this patch and\n" +"\tthe patch specified with -P.\n" "\n" "-R\tCreate a reverse diff.\n" "\n" -"-z\tWrite to standard output the changes that have been\n" -"\tmade relative to the topmost or specified patch.\n" +"-z\tWrite to standard output the changes that have been made\n" +"\trelative to the topmost or specified patch.\n" "\n" msgstr "" "\n" "\n" "Erzeugt ein Diff der angegebenen Dateien im obersten oder angegebenen\n" -"Patch. Wenn keine Dateien angegeben sind, werden alle im Patch enthaltenen\n" -"Dateien einbezogen.\n" +"Patch. Wenn keine Dateien angegeben sind, werden alle im Patch\n" +"enthaltenen Dateien einbezogen.\n" "\n" "-p n\tErzeugt einen -p n Patch (n=0 oder n=1 wird unterstützt).\n" "\n" @@ -162,8 +161,8 @@ msgstr "" "\toberster Patch.)\n" "\n" "-c patch\n" -"\tErzeuge ein kombiniertes Diff für alle Patches zwischen diesem und dem\n" -"\tmit -P angegebenen Patch.\n" +"\tErzeuge ein kombiniertes Diff für alle Patches zwischen diesem und\n" +"\tdem mit -P angegebenen Patch.\n" "\n" "-R\tErzeuge ein umgekehrtes Diff.\n" "\n" @@ -237,8 +236,7 @@ msgstr "Verwendung: quilt files [-v] [patch]" msgid "" "\n" "\n" -"Print the list of files that the topmost or specified patch\n" -"changes.\n" +"Print the list of files that the topmost or specified patch changes.\n" "\n" "-v\tVerbose, more user friendly output.\n" "\n" @@ -251,11 +249,11 @@ msgstr "" "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" "\n" -#: ../quilt/files.in:84 +#: ../quilt/files.in:83 msgid "Patch is not applied (no verbose output)" msgstr "Patch ist nicht angewandt (keine ausführliche Ausgabe)" -#: ../quilt/files.in:87 +#: ../quilt/files.in:86 msgid "Patch is not applied" msgstr "Patch ist nicht angewandt" @@ -267,10 +265,9 @@ msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei]" msgid "" "\n" "\n" -"Import an external patch. If a patch file name is specified,\n" -"the patch will be stored in this relative path in the patches/\n" -"directory. Else, if an input file name is given this name is\n" -"used as the patch name.\n" +"Import an external patch. If a patch file name is specified, the patch\n" +"will be stored in this relative path in the patches/ directory. Else,\n" +"if an input file name is given this name is used as the patch name.\n" "\n" "-p num\n" "\tNumber of directory levels to strip when aplying (default=1)\n" @@ -283,9 +280,10 @@ msgid "" msgstr "" "\n" "\n" -"Importiert einen Patch aus einer Datei. Ist ein Patch-Dateiname angegeben,\n" -"so wird er Patch in diesem Pfad relativ zum patches/-Verzeichnis\n" -"abgelegt. Sonst wird (wenn angegeben) der Patch-Dateiname verwendet.\n" +"Importiert einen Patch aus einer Datei. Ist ein Patch-Dateiname\n" +"angegeben, so wird er Patch in diesem Pfad relativ zum\n" +"patches/-Verzeichnis abgelegt. Sonst wird (wenn angegeben) der\n" +"Patch-Dateiname verwendet.\n" "\n" "-p num\n" "\tAnzahl der Verzeichnisebenen, die beim Anwenden des Patches entfernt\n" @@ -297,59 +295,59 @@ msgstr "" "-f\tBestehende Patches überschreiben/aktualisieren.\n" "\n" -#: ../quilt/import.in:98 +#: ../quilt/import.in:97 msgid "Please use -n to specify a patch file name." msgstr "Bitte -n verwenden, um einen Patch-Namen anzugeben." -#: ../quilt/import.in:106 +#: ../quilt/import.in:105 msgid "Patch file name \\\"$patch_file\\\" contains whitespace." msgstr "Patch-Dateiname \\\"$patch_file\\\" enthält Leerstellen." -#: ../quilt/import.in:112 +#: ../quilt/import.in:111 msgid "Patch $patch is applied." msgstr "Patch $patch ist angewandt." -#: ../quilt/import.in:121 +#: ../quilt/import.in:120 msgid "Cannot read from standard input." msgstr "Kann nicht von der Standardeingabe lesen." -#: ../quilt/import.in:130 ../quilt/import.in:139 +#: ../quilt/import.in:129 ../quilt/import.in:138 msgid "Cannot decompress file $input_file" msgstr "Kann Datei $input_file nicht dekomprimieren" -#: ../quilt/import.in:147 +#: ../quilt/import.in:146 msgid "Cannot read from file $input_file" msgstr "Kann nicht von Datei $input_file lesen" -#: ../quilt/import.in:156 +#: ../quilt/import.in:155 msgid "Patch $patch exists. Replace with -f." msgstr "Patch $patch existiert bereits. Ersetzen mit -f." -#: ../quilt/import.in:163 +#: ../quilt/import.in:162 msgid "Updating %patch section of patch $patch" msgstr "Aktualisiere %patch-Abschnitt von Patch $patch" -#: ../quilt/import.in:166 +#: ../quilt/import.in:165 msgid "Failed to update %patch section of patch $patch" msgstr "Konnte %patch-Abschnitt in Patch $patch nicht aktualisieren" -#: ../quilt/import.in:170 +#: ../quilt/import.in:169 msgid "Replacing patch $patch with new version" msgstr "Ersetze Patch $patch durch neuere Version" -#: ../quilt/import.in:173 +#: ../quilt/import.in:172 msgid "Failed to replace patch $patch" msgstr "Konnte Patch $patch nicht ersetzen" -#: ../quilt/import.in:178 +#: ../quilt/import.in:177 msgid "Importing patch $patch (stored as $patch_file)" msgstr "Importiere Patch $patch (abgelegt als $patch_file)" -#: ../quilt/import.in:185 +#: ../quilt/import.in:184 msgid "Failed to import patch $patch" msgstr "Konnte Patch $patch nicht importieren" -#: ../quilt/import.in:195 +#: ../quilt/import.in:194 msgid "Failed to insert $patch in file series." msgstr "Konnte Patch $patch nicht in die series-Datei einfügen." @@ -361,8 +359,8 @@ msgstr "Verwendung: new {patchname}" msgid "" "\n" "\n" -"Create a new patch with the specified file name, and insert\n" -"it after the topmost patch in the patch series file.\n" +"Create a new patch with the specified file name, and insert it after the\n" +"topmost patch in the patch series file.\n" "\n" msgstr "" "\n" @@ -437,19 +435,18 @@ msgstr "Verwendung: quilt pop [-afRqv] [num|patch]" msgid "" "\n" "\n" -"Remove patch(es) from the current stack. A number of\n" -"patches to remove, or a patch name can be specified. If a\n" -"patch name is given, remove all patches applied on top of the\n" -"named patch. If neither a number nor a patch name is specified,\n" -"remove the next patch from the series file.\n" +"Remove patch(es) from the current stack. A number of patches to remove,\n" +"or a patch name can be specified. If a patch name is given, remove all\n" +"patches applied on top of the named patch. If neither a number nor a\n" +"patch name is specified, remove the next patch from the series file.\n" "\n" "-a\tRemove all applied patches.\n" "\n" -"-f\tForce remove. The state before the patch(es) were\n" -"\tapplied will be restored from backup files.\n" +"-f\tForce remove. The state before the patch(es) were applied will\n" +"\tbe restored from backup files.\n" "\n" -"-R\tRemove the patch with \\`patch -R' and check if the\n" -"\tpatch reverts all changes properly.\n" +"-R\tRemove the patch with \\`patch -R' and check if the patch reverts\n" +"\tall changes properly.\n" "\n" "-q\tQuiet operation.\n" "\n" @@ -458,11 +455,11 @@ msgid "" msgstr "" "\n" "\n" -"Entfernt Patches vom Stapel. Es kann eine Anzahl von Patches, die entfernt\n" -"werden soll, oder der Name eines Patches angegeben werden. Wenn ein\n" -"Name angegeben wird, werden alle Patches über dem angegebenen Patch\n" -"entfernt. Wenn weder ein Patchname noch eine Nummer angegeben wird, wird\n" -"der oberste Patch entfernt.\n" +"Entfernt Patches vom Stapel. Es kann eine Anzahl von Patches, die\n" +"entfernt werden soll, oder der Name eines Patches angegeben werden.\n" +"Wenn ein Name angegeben wird, werden alle Patches über dem angegebenen\n" +"Patch entfernt. Wenn weder ein Patchname noch eine Nummer angegeben\n" +"wird, wird der oberste Patch entfernt.\n" "\n" "-a\tAlle angewandten Patches entfernen.\n" "\n" @@ -477,27 +474,27 @@ msgstr "" "-v\tViele Meldungen ausgeben.\n" "\n" -#: ../quilt/pop.in:84 ../quilt/push.in:83 +#: ../quilt/pop.in:83 ../quilt/push.in:82 msgid "Patch $stop_at_patch not found in file series" msgstr "Patch $stop_at_patch in series-Datei nicht gefunden" -#: ../quilt/pop.in:157 +#: ../quilt/pop.in:156 msgid "Patch $stop_at_patch is not applied." msgstr "Patch $stop_at_patch ist nicht angewandt." -#: ../quilt/pop.in:167 +#: ../quilt/pop.in:166 msgid "No patch removed" msgstr "Kein Patch entfernt" -#: ../quilt/pop.in:181 ../quilt/push.in:184 +#: ../quilt/pop.in:180 ../quilt/push.in:183 msgid "Interrupted by user" msgstr "Unterbrechung durch Benutzer" -#: ../quilt/pop.in:190 ../quilt/push.in:193 +#: ../quilt/pop.in:189 ../quilt/push.in:192 msgid "No patches applied" msgstr "Keine Patches angewandt" -#: ../quilt/pop.in:192 ../quilt/push.in:195 +#: ../quilt/pop.in:191 ../quilt/push.in:194 msgid "Now at patch $patch" msgstr "Jetzt in Patch $patch" @@ -531,11 +528,10 @@ msgstr "Verwendung: quilt push [-afqv] [--leave-rejects] [num|patch]" msgid "" "\n" "\n" -"Apply patch(es) from the series file. A number of patches\n" -"to apply, or a patch name can be specified. If a patch\n" -"name is given, apply all patches up to and including the\n" -"named patch. If neither a number nor a patch name is\n" -"specified, apply the next patch from the series file.\n" +"Apply patch(es) from the series file. A number of patches to apply, or\n" +"a patch name can be specified. If a patch name is given, apply all\n" +"patches up to and including the named patch. If neither a number nor a\n" +"patch name is specified, apply the next patch from the series file.\n" "\n" "-a\tApply all patches in the series file.\n" "\n" @@ -546,15 +542,15 @@ msgid "" "-v\tVerbose operation.\n" "\n" "--leave-rejects\n" -"\tLeave around the reject files patch produced, even if\n" -"\tthe patch is not actually applied.\n" +"\tLeave around the reject files patch produced, even if the patch\n" +"\tis not actually applied.\n" "\t\n" msgstr "" "\n" "\n" -"Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches, die\n" -"angewandt werden soll, oder der Name eines Patches angegeben werden. Wenn\n" -"ein Name angegeben wird, werden alle Patches bis einschließlich zum\n" +"Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n" +"die angewandt werden soll, oder der Name eines Patches angegeben werden.\n" +"Wenn ein Name angegeben wird, werden alle Patches bis einschließlich zum\n" "angegebenen Patch angewandt. Wenn weder ein Patchname noch eine Nummer\n" "angegeben wird, wird der nächste Patch angewandt.\n" "\n" @@ -571,11 +567,11 @@ msgstr "" "\tnicht sauber angewandt werden kann.\n" "\t\n" -#: ../quilt/push.in:154 +#: ../quilt/push.in:153 msgid "Patch $stop_at_patch is already applied." msgstr "Patch $stop_at_patch ist bereits angewandt." -#: ../quilt/push.in:169 +#: ../quilt/push.in:168 msgid "File series fully applied, ends at patch $top" msgstr "series-Datei vollständig angewandt, endet in Patch $top" @@ -588,16 +584,16 @@ msgid "" "\n" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" -"Documentation that comes before the actual patch in the patch file\n" -"is retained.\n" +"Documentation that comes before the actual patch in the patch file is\n" +"retained.\n" "\n" -"It is possible to refresh patches that are not on top. If any\n" -"patches on top of the patch to refresh modify the same files, the\n" -"script aborts by default. Patches can still be refreshed with -f.\n" -"In that case this script will print a warning for each shadowed\n" -"file, changes by more recent patches will be ignored, and only\n" -"changes in files that have not been modified by any more recent\n" -"patches will end up in the specified patch.\n" +"It is possible to refresh patches that are not on top. If any patches\n" +"on top of the patch to refresh modify the same files, the script aborts\n" +"by default. Patches can still be refreshed with -f. In that case this\n" +"script will print a warning for each shadowed file, changes by more\n" +"recent patches will be ignored, and only changes in files that have not\n" +"been modified by any more recent patches will end up in the specified\n" +"patch.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\t\n" @@ -608,16 +604,17 @@ msgstr "" "\n" "\n" "Frischt den obersten oder angegebenen Patch auf. Dokumentation in der\n" -"Patch-Datei, die vor dem eigentlichen Patch steht, bleibt dabei erhalten.\n" -"\n" -"Es können beliebige angewandte Patches aufgefrischt werden. Wenn Patches,\n" -"die nach dem angegebenen Patch angewandt sind, dieselben Dateien verändern,\n" -"die auch dieser Patch verändert, bricht dieses Script normalerweise ab. Mit\n" -"der Option -f kann das Auffrischen trotzdem erzwungen werden. Dann wird für\n" -"jede Datei, die später noch verändert wurde, eine Warnung ausgegeben, und\n" -"nur Änderungen in Dateien, die danach nicht von anderen Patches weiter\n" -"verändert werden, werden beim Auffrischen berücksichtigt.\n" -"\n" +"Patch-Datei, die vor dem eigentlichen Patch steht, bleibt dabei\n" +"erhalten.\n" +"\n" +"Es können beliebige angewandte Patches aufgefrischt werden. Wenn\n" +"Patches, die nach dem angegebenen Patch angewandt sind, dieselben\n" +"Dateien verändern, die auch dieser Patch verändert, bricht dieses Script\n" +"normalerweise ab. Mit der Option -f kann das Auffrischen trotzdem\n" +"erzwungen werden. Dann wird für jede Datei, die später noch verändert\n" +"wurde, eine Warnung ausgegeben, und nur Änderungen in Dateien, die\n" +"danach nicht von anderen Patches weiter verändert werden, werden beim\n" +"Auffrischen berücksichtigt.\n" "\n" "-p n\tErzeugt einen -p n Patch (n=0 oder n=1 werden unterstützt).\n" "\t\n" @@ -636,8 +633,8 @@ msgstr "" #: ../quilt/refresh.in:150 msgid "More recent patches modify files in $patch. Enforce refresh with -f." msgstr "" -"Später angewandte Patches verändern Dateien von $patch. Auffrischen " -"mit -f erzwingen." +"Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f " +"erzwingen." #: ../quilt/refresh.in:157 msgid "Nothing in patch $patch" @@ -655,9 +652,8 @@ msgstr "Verwendung: quilt remove [-p patch] {datei} ..." msgid "" "\n" "\n" -"Remove one or more files from the topmost or named patch.\n" -"Files that are modified by patches on top of the specified\n" -"patch cannot be removed.\n" +"Remove one or more files from the topmost or named patch. Files that\n" +"are modified by patches on top of the specified patch cannot be removed.\n" "\n" "-p patch\n" "\tPatch to remove files from.\n" @@ -665,23 +661,23 @@ msgid "" msgstr "" "\n" "\n" -"Entfernt Dateien aus dem obersten oder angegebenen Patch.\n" -"Dateien, die durch Patches über dem angegebenen Patch verändert werden,\n" -"können nicht entfernt werden.\n" +"Entfernt Dateien aus dem obersten oder angegebenen Patch. Dateien, die\n" +"durch Patches über dem angegebenen Patch verändert werden, können nicht\n" +"entfernt werden.\n" "\n" "-p patch\n" "\tPatch, aus dem Dateien entfernt werden sollen.\n" "\n" -#: ../quilt/remove.in:90 +#: ../quilt/remove.in:89 msgid "File $file is not in patch $patch" msgstr "Datei $file ist nicht in Patch $patch enthalten." -#: ../quilt/remove.in:106 +#: ../quilt/remove.in:105 msgid "Failed to remove file $file from patch $patch" msgstr "Konnte Datei $file nicht aus Patch $patch entfernen." -#: ../quilt/remove.in:117 +#: ../quilt/remove.in:116 msgid "File $file removed from patch $patch" msgstr "Datei $file aus Patch $patch entfernt." @@ -717,9 +713,9 @@ msgstr "Verwendung: quilt setup [-d quellvz.] {seriesdatei|specdatei}" msgid "" "\n" "\n" -"Initializes a source tree from a patch series file. The\n" -"patch series file must contain the name of the relevant\n" -"tar archive, in addition to the list of patches.\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" diff --git a/po/quilt.pot b/po/quilt.pot index fef8c38..c1df7a8 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -14,37 +14,36 @@ msgstr "" msgid "" "\n" "\n" -"Add one or more files to the topmost or named patch.\n" -"Files must be added to the patch before being modified.\n" -"Files that are modified by patches on top of the specified\n" -"patch cannot be added.\n" +"Add one or more files to the topmost or named patch. Files must be\n" +"added to the patch before being modified. Files that are modified by\n" +"patches on top of the specified patch cannot be added.\n" "\n" "-p patch\n" "\tPatch to add files to." msgstr "" -#: ../quilt/add.in:76 ../quilt/delete.in:69 ../quilt/files.in:75 -#: ../quilt/push.in:167 ../quilt/remove.in:76 +#: ../quilt/add.in:75 ../quilt/delete.in:69 ../quilt/files.in:74 +#: ../quilt/push.in:166 ../quilt/remove.in:75 msgid "No patch applied" msgstr "" -#: ../quilt/add.in:81 ../quilt/refresh.in:113 ../quilt/remove.in:81 +#: ../quilt/add.in:80 ../quilt/refresh.in:113 ../quilt/remove.in:80 msgid "Patch $patch is not applied" msgstr "" -#: ../quilt/add.in:90 +#: ../quilt/add.in:89 msgid "File $file is already in patch $patch" msgstr "" -#: ../quilt/add.in:97 ../quilt/remove.in:98 +#: ../quilt/add.in:96 ../quilt/remove.in:97 msgid "File $file modified by patch $next_patch" msgstr "" -#: ../quilt/add.in:105 +#: ../quilt/add.in:104 msgid "Failed to back up file $file" msgstr "" -#: ../quilt/add.in:125 +#: ../quilt/add.in:124 msgid "File $file added to patch $patch" msgstr "" @@ -70,8 +69,8 @@ msgstr "" msgid "" "\n" "\n" -"Remove the specified or topmost patch from the series file. If the \n" -"patch is applied, quilt will attempt to remove it first. (Only the \n" +"Remove the specified or topmost patch from the series file. If the\n" +"patch is applied, quilt will attempt to remove it first. (Only the\n" "topmost patch can be removed right now.)" msgstr "" @@ -95,24 +94,24 @@ msgstr "" msgid "" "\n" "\n" -"Produces a diff of the specified file(s) in the topmost or\n" -"specified patch. If no files are specified, all files that\n" -"are modified are included.\n" +"Produces a diff of the specified file(s) in the topmost or specified\n" +"patch. If no files are specified, all files that are modified are\n" +"included.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" "-P patch\n" -"\tCreate a diff for the specified patch. (Defaults to\n" -"\tthe topmost patch.)\n" +"\tCreate a diff for the specified patch. (Defaults to the topmost\n" +"\tpatch.)\n" "\n" "-c patch\n" -"\tCreate a combined diff for all patches between this\n" -"\tpatch and the patch specified with -P.\n" +"\tCreate a combined diff for all patches between this patch and\n" +"\tthe patch specified with -P.\n" "\n" "-R\tCreate a reverse diff.\n" "\n" -"-z\tWrite to standard output the changes that have been\n" -"\tmade relative to the topmost or specified patch.\n" +"-z\tWrite to standard output the changes that have been made\n" +"\trelative to the topmost or specified patch.\n" "\n" msgstr "" @@ -182,18 +181,17 @@ msgstr "" msgid "" "\n" "\n" -"Print the list of files that the topmost or specified patch\n" -"changes.\n" +"Print the list of files that the topmost or specified patch changes.\n" "\n" "-v\tVerbose, more user friendly output.\n" "\n" msgstr "" -#: ../quilt/files.in:84 +#: ../quilt/files.in:83 msgid "Patch is not applied (no verbose output)" msgstr "" -#: ../quilt/files.in:87 +#: ../quilt/files.in:86 msgid "Patch is not applied" msgstr "" @@ -205,10 +203,9 @@ msgstr "" msgid "" "\n" "\n" -"Import an external patch. If a patch file name is specified,\n" -"the patch will be stored in this relative path in the patches/\n" -"directory. Else, if an input file name is given this name is\n" -"used as the patch name.\n" +"Import an external patch. If a patch file name is specified, the patch\n" +"will be stored in this relative path in the patches/ directory. Else,\n" +"if an input file name is given this name is used as the patch name.\n" "\n" "-p num\n" "\tNumber of directory levels to strip when aplying (default=1)\n" @@ -220,59 +217,59 @@ msgid "" "\n" msgstr "" -#: ../quilt/import.in:98 +#: ../quilt/import.in:97 msgid "Please use -n to specify a patch file name." msgstr "" -#: ../quilt/import.in:106 +#: ../quilt/import.in:105 msgid "Patch file name \\\"$patch_file\\\" contains whitespace." msgstr "" -#: ../quilt/import.in:112 +#: ../quilt/import.in:111 msgid "Patch $patch is applied." msgstr "" -#: ../quilt/import.in:121 +#: ../quilt/import.in:120 msgid "Cannot read from standard input." msgstr "" -#: ../quilt/import.in:130 ../quilt/import.in:139 +#: ../quilt/import.in:129 ../quilt/import.in:138 msgid "Cannot decompress file $input_file" msgstr "" -#: ../quilt/import.in:147 +#: ../quilt/import.in:146 msgid "Cannot read from file $input_file" msgstr "" -#: ../quilt/import.in:156 +#: ../quilt/import.in:155 msgid "Patch $patch exists. Replace with -f." msgstr "" -#: ../quilt/import.in:163 +#: ../quilt/import.in:162 msgid "Updating %patch section of patch $patch" msgstr "" -#: ../quilt/import.in:166 +#: ../quilt/import.in:165 msgid "Failed to update %patch section of patch $patch" msgstr "" -#: ../quilt/import.in:170 +#: ../quilt/import.in:169 msgid "Replacing patch $patch with new version" msgstr "" -#: ../quilt/import.in:173 +#: ../quilt/import.in:172 msgid "Failed to replace patch $patch" msgstr "" -#: ../quilt/import.in:178 +#: ../quilt/import.in:177 msgid "Importing patch $patch (stored as $patch_file)" msgstr "" -#: ../quilt/import.in:185 +#: ../quilt/import.in:184 msgid "Failed to import patch $patch" msgstr "" -#: ../quilt/import.in:195 +#: ../quilt/import.in:194 msgid "Failed to insert $patch in file series." msgstr "" @@ -284,8 +281,8 @@ msgstr "" msgid "" "\n" "\n" -"Create a new patch with the specified file name, and insert\n" -"it after the topmost patch in the patch series file.\n" +"Create a new patch with the specified file name, and insert it after the\n" +"topmost patch in the patch series file.\n" "\n" msgstr "" @@ -340,19 +337,18 @@ msgstr "" msgid "" "\n" "\n" -"Remove patch(es) from the current stack. A number of\n" -"patches to remove, or a patch name can be specified. If a\n" -"patch name is given, remove all patches applied on top of the\n" -"named patch. If neither a number nor a patch name is specified,\n" -"remove the next patch from the series file.\n" +"Remove patch(es) from the current stack. A number of patches to remove,\n" +"or a patch name can be specified. If a patch name is given, remove all\n" +"patches applied on top of the named patch. If neither a number nor a\n" +"patch name is specified, remove the next patch from the series file.\n" "\n" "-a\tRemove all applied patches.\n" "\n" -"-f\tForce remove. The state before the patch(es) were\n" -"\tapplied will be restored from backup files.\n" +"-f\tForce remove. The state before the patch(es) were applied will\n" +"\tbe restored from backup files.\n" "\n" -"-R\tRemove the patch with \\`patch -R' and check if the\n" -"\tpatch reverts all changes properly.\n" +"-R\tRemove the patch with \\`patch -R' and check if the patch reverts\n" +"\tall changes properly.\n" "\n" "-q\tQuiet operation.\n" "\n" @@ -360,27 +356,27 @@ msgid "" "\n" msgstr "" -#: ../quilt/pop.in:84 ../quilt/push.in:83 +#: ../quilt/pop.in:83 ../quilt/push.in:82 msgid "Patch $stop_at_patch not found in file series" msgstr "" -#: ../quilt/pop.in:157 +#: ../quilt/pop.in:156 msgid "Patch $stop_at_patch is not applied." msgstr "" -#: ../quilt/pop.in:167 +#: ../quilt/pop.in:166 msgid "No patch removed" msgstr "" -#: ../quilt/pop.in:181 ../quilt/push.in:184 +#: ../quilt/pop.in:180 ../quilt/push.in:183 msgid "Interrupted by user" msgstr "" -#: ../quilt/pop.in:190 ../quilt/push.in:193 +#: ../quilt/pop.in:189 ../quilt/push.in:192 msgid "No patches applied" msgstr "" -#: ../quilt/pop.in:192 ../quilt/push.in:195 +#: ../quilt/pop.in:191 ../quilt/push.in:194 msgid "Now at patch $patch" msgstr "" @@ -407,11 +403,10 @@ msgstr "" msgid "" "\n" "\n" -"Apply patch(es) from the series file. A number of patches\n" -"to apply, or a patch name can be specified. If a patch\n" -"name is given, apply all patches up to and including the\n" -"named patch. If neither a number nor a patch name is\n" -"specified, apply the next patch from the series file.\n" +"Apply patch(es) from the series file. A number of patches to apply, or\n" +"a patch name can be specified. If a patch name is given, apply all\n" +"patches up to and including the named patch. If neither a number nor a\n" +"patch name is specified, apply the next patch from the series file.\n" "\n" "-a\tApply all patches in the series file.\n" "\n" @@ -422,16 +417,16 @@ msgid "" "-v\tVerbose operation.\n" "\n" "--leave-rejects\n" -"\tLeave around the reject files patch produced, even if\n" -"\tthe patch is not actually applied.\n" +"\tLeave around the reject files patch produced, even if the patch\n" +"\tis not actually applied.\n" "\t\n" msgstr "" -#: ../quilt/push.in:154 +#: ../quilt/push.in:153 msgid "Patch $stop_at_patch is already applied." msgstr "" -#: ../quilt/push.in:169 +#: ../quilt/push.in:168 msgid "File series fully applied, ends at patch $top" msgstr "" @@ -444,16 +439,16 @@ msgid "" "\n" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" -"Documentation that comes before the actual patch in the patch file\n" -"is retained.\n" +"Documentation that comes before the actual patch in the patch file is\n" +"retained.\n" "\n" -"It is possible to refresh patches that are not on top. If any\n" -"patches on top of the patch to refresh modify the same files, the\n" -"script aborts by default. Patches can still be refreshed with -f.\n" -"In that case this script will print a warning for each shadowed\n" -"file, changes by more recent patches will be ignored, and only\n" -"changes in files that have not been modified by any more recent\n" -"patches will end up in the specified patch.\n" +"It is possible to refresh patches that are not on top. If any patches\n" +"on top of the patch to refresh modify the same files, the script aborts\n" +"by default. Patches can still be refreshed with -f. In that case this\n" +"script will print a warning for each shadowed file, changes by more\n" +"recent patches will be ignored, and only changes in files that have not\n" +"been modified by any more recent patches will end up in the specified\n" +"patch.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\t\n" @@ -488,24 +483,23 @@ msgstr "" msgid "" "\n" "\n" -"Remove one or more files from the topmost or named patch.\n" -"Files that are modified by patches on top of the specified\n" -"patch cannot be removed.\n" +"Remove one or more files from the topmost or named patch. Files that\n" +"are modified by patches on top of the specified patch cannot be removed.\n" "\n" "-p patch\n" "\tPatch to remove files from.\n" "\n" msgstr "" -#: ../quilt/remove.in:90 +#: ../quilt/remove.in:89 msgid "File $file is not in patch $patch" msgstr "" -#: ../quilt/remove.in:106 +#: ../quilt/remove.in:105 msgid "Failed to remove file $file from patch $patch" msgstr "" -#: ../quilt/remove.in:117 +#: ../quilt/remove.in:116 msgid "File $file removed from patch $patch" msgstr "" @@ -533,9 +527,9 @@ msgstr "" msgid "" "\n" "\n" -"Initializes a source tree from a patch series file. The\n" -"patch series file must contain the name of the relevant\n" -"tar archive, in addition to the list of patches.\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 "" diff --git a/quilt/add.in b/quilt/add.in index b20af1c..a696bc4 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -24,10 +24,9 @@ usage() then echo $" -Add one or more files to the topmost or named patch. -Files must be added to the patch before being modified. -Files that are modified by patches on top of the specified -patch cannot be added. +Add one or more files to the topmost or named patch. Files must be +added to the patch before being modified. Files that are modified by +patches on top of the specified patch cannot be added. -p patch Patch to add files to." diff --git a/quilt/delete.in b/quilt/delete.in index 3cedffb..cd4bdf8 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -24,8 +24,8 @@ usage() then echo $" -Remove the specified or topmost patch from the series file. If the -patch is applied, quilt will attempt to remove it first. (Only the +Remove the specified or topmost patch from the series file. If the +patch is applied, quilt will attempt to remove it first. (Only the topmost patch can be removed right now.)" exit 0 diff --git a/quilt/diff.in b/quilt/diff.in index 3a52dea..3db213b 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -30,24 +30,24 @@ usage() then echo $" -Produces a diff of the specified file(s) in the topmost or -specified patch. If no files are specified, all files that -are modified are included. +Produces a diff of the specified file(s) in the topmost or specified +patch. If no files are specified, all files that are modified are +included. -p n Create a -p n style patch (-p0 or -p1 are supported). -P patch - Create a diff for the specified patch. (Defaults to - the topmost patch.) + Create a diff for the specified patch. (Defaults to the topmost + patch.) -c patch - Create a combined diff for all patches between this - patch and the patch specified with -P. + Create a combined diff for all patches between this patch and + the patch specified with -P. -R Create a reverse diff. --z Write to standard output the changes that have been - made relative to the topmost or specified patch. +-z Write to standard output the changes that have been made + relative to the topmost or specified patch. " exit 0 diff --git a/quilt/files.in b/quilt/files.in index 6d57efa..796b9e2 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -24,8 +24,7 @@ usage() then echo $" -Print the list of files that the topmost or specified patch -changes. +Print the list of files that the topmost or specified patch changes. -v Verbose, more user friendly output. diff --git a/quilt/import.in b/quilt/import.in index 7724f4f..ff4c306 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -24,10 +24,9 @@ usage() then echo $" -Import an external patch. If a patch file name is specified, -the patch will be stored in this relative path in the patches/ -directory. Else, if an input file name is given this name is -used as the patch name. +Import an external patch. If a patch file name is specified, the patch +will be stored in this relative path in the patches/ directory. Else, +if an input file name is given this name is used as the patch name. -p num Number of directory levels to strip when aplying (default=1) diff --git a/quilt/new.in b/quilt/new.in index 38ad964..320349d 100644 --- a/quilt/new.in +++ b/quilt/new.in @@ -24,8 +24,8 @@ usage() then echo $" -Create a new patch with the specified file name, and insert -it after the topmost patch in the patch series file. +Create a new patch with the specified file name, and insert it after the +topmost patch in the patch series file. " exit 0 diff --git a/quilt/pop.in b/quilt/pop.in index b46ba59..4b8f565 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -24,19 +24,18 @@ usage() then echo $" -Remove patch(es) from the current stack. A number of -patches to remove, or a patch name can be specified. If a -patch name is given, remove all patches applied on top of the -named patch. If neither a number nor a patch name is specified, -remove the next patch from the series file. +Remove patch(es) from the current stack. A number of patches to remove, +or a patch name can be specified. If a patch name is given, remove all +patches applied on top of the named patch. If neither a number nor a +patch name is specified, remove the next patch from the series file. -a Remove all applied patches. --f Force remove. The state before the patch(es) were - applied will be restored from backup files. +-f Force remove. The state before the patch(es) were applied will + be restored from backup files. --R Remove the patch with \`patch -R' and check if the - patch reverts all changes properly. +-R Remove the patch with \`patch -R' and check if the patch reverts + all changes properly. -q Quiet operation. diff --git a/quilt/push.in b/quilt/push.in index 5bc1230..ad3c706 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -24,11 +24,10 @@ usage() then echo $" -Apply patch(es) from the series file. A number of patches -to apply, or a patch name can be specified. If a patch -name is given, apply all patches up to and including the -named patch. If neither a number nor a patch name is -specified, apply the next patch from the series file. +Apply patch(es) from the series file. A number of patches to apply, or +a patch name can be specified. If a patch name is given, apply all +patches up to and including the named patch. If neither a number nor a +patch name is specified, apply the next patch from the series file. -a Apply all patches in the series file. @@ -39,8 +38,8 @@ specified, apply the next patch from the series file. -v Verbose operation. --leave-rejects - Leave around the reject files patch produced, even if - the patch is not actually applied. + Leave around the reject files patch produced, even if the patch + is not actually applied. " exit 0 diff --git a/quilt/refresh.in b/quilt/refresh.in index 89b15e0..dc6b440 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -31,16 +31,16 @@ usage() echo $" Refreshes the specified patch, or the topmost patch by default. -Documentation that comes before the actual patch in the patch file -is retained. - -It is possible to refresh patches that are not on top. If any -patches on top of the patch to refresh modify the same files, the -script aborts by default. Patches can still be refreshed with -f. -In that case this script will print a warning for each shadowed -file, changes by more recent patches will be ignored, and only -changes in files that have not been modified by any more recent -patches will end up in the specified patch. +Documentation that comes before the actual patch in the patch file is +retained. + +It is possible to refresh patches that are not on top. If any patches +on top of the patch to refresh modify the same files, the script aborts +by default. Patches can still be refreshed with -f. In that case this +script will print a warning for each shadowed file, changes by more +recent patches will be ignored, and only changes in files that have not +been modified by any more recent patches will end up in the specified +patch. -p n Create a -p n style patch (-p0 or -p1 supported). diff --git a/quilt/remove.in b/quilt/remove.in index 4c0dbaa..d48300b 100644 --- a/quilt/remove.in +++ b/quilt/remove.in @@ -24,9 +24,8 @@ usage() then echo $" -Remove one or more files from the topmost or named patch. -Files that are modified by patches on top of the specified -patch cannot be removed. +Remove one or more files from the topmost or named patch. Files that +are modified by patches on top of the specified patch cannot be removed. -p patch Patch to remove files from. diff --git a/quilt/setup.in b/quilt/setup.in index 773ab9d..08b4115 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -24,9 +24,9 @@ usage() then echo $" -Initializes a source tree from a patch series file. The -patch series file must contain the name of the relevant -tar archive, in addition to the list of patches. +Initializes a source tree from a patch series file. The patch series +file must contain the name of the relevant tar archive, in addition to +the list of patches. " exit 0 -- cgit