diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | po/de.po | 44 | ||||
| -rw-r--r-- | po/fr.po | 36 | ||||
| -rw-r--r-- | po/ja.po | 36 | ||||
| -rw-r--r-- | po/quilt.pot | 36 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/mail.in | 42 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 12 |
8 files changed, 137 insertions, 79 deletions
@@ -112,6 +112,10 @@ quilt mail: - Character set handling is missing, too. - Too many passes of edmail make it a bit slow. + - If someone adds a References header to the intro, the References + header added to patch messages for threading do not append to that + header. They probably should; not sure if duplicate References + headers are valid. quilt fold: @@ -181,7 +181,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:579 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:593 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -322,7 +322,7 @@ msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\n" -#: quilt/diff.in:266 quilt/files.in:105 +#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" @@ -608,16 +608,14 @@ msgid "Appended text to header of patch %s\\n" msgstr "Text an Header von Patch %s angefügt\\n" #: quilt/import.in:22 -#, fuzzy msgid "" "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..." "\\n" msgstr "" -"Verwendung: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] " -"[patchdatei] ...\\n" +"Verwendung: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchdatei ..." +"\\n" #: quilt/import.in:25 -#, fuzzy msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -646,7 +644,7 @@ msgstr "" "\n" "-p num\n" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" -"\tentfernt werden sollen.\n" +"\tentfernt werden sollen (Standard=1).\n" "\n" "-P patch\n" "\tPatch-Dateiname, den Quilt verwenden soll. Diese Option kann nur beim\n" @@ -782,28 +780,28 @@ msgstr "" "--to, --cc, --bcc\n" "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n" -#: quilt/mail.in:166 +#: quilt/mail.in:181 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." -#: quilt/mail.in:304 +#: quilt/mail.in:342 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:327 +#: quilt/mail.in:365 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:369 +#: quilt/mail.in:407 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:372 +#: quilt/mail.in:410 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:462 +#: quilt/mail.in:500 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -925,11 +923,11 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: quilt/pop.in:98 quilt/scripts/patchfns.in:880 +#: quilt/pop.in:98 quilt/scripts/patchfns.in:894 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: quilt/pop.in:122 quilt/scripts/patchfns.in:903 +#: quilt/pop.in:122 quilt/scripts/patchfns.in:917 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" @@ -955,7 +953,7 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n" msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:494 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:508 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -1299,27 +1297,27 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n" msgid "Delivery address `%s' is invalid\n" msgstr "Zustelladresse `%s' ist ungültig\n" -#: quilt/scripts/patchfns.in:481 +#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495 msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/scripts/patchfns.in:530 +#: quilt/scripts/patchfns.in:544 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:558 +#: quilt/scripts/patchfns.in:572 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:595 +#: quilt/scripts/patchfns.in:609 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" -#: quilt/scripts/patchfns.in:617 +#: quilt/scripts/patchfns.in:631 msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:936 +#: quilt/scripts/patchfns.in:950 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1332,7 +1330,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:1021 +#: quilt/scripts/patchfns.in:1035 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -181,7 +181,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:579 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:593 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqu\\n" @@ -324,7 +324,7 @@ msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\n" -#: quilt/diff.in:266 quilt/files.in:105 +#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." @@ -789,28 +789,28 @@ msgstr "" "\tAjoute un destinataire dans le champ d'en-tte A, Copie ou Copie\n" "\tcache, respectivement.\n" -#: quilt/mail.in:166 +#: quilt/mail.in:181 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "Impossible de dterminer l'adresse d'expditeur. Utilisez --sender." -#: quilt/mail.in:304 +#: quilt/mail.in:342 msgid "Unable to extract a subject header from %s\\n" msgstr "Impossible d'extraire une ligne de sujet de %s\\n" -#: quilt/mail.in:327 +#: quilt/mail.in:365 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Les patches %s ont des sujets dupliqus.\\n" -#: quilt/mail.in:369 +#: quilt/mail.in:407 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" "L'introduction n'a pas de ligne de sujet (sauvegard en tant que %s)\\n" -#: quilt/mail.in:372 +#: quilt/mail.in:410 msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:462 +#: quilt/mail.in:500 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegarde en tant que %s\\n" @@ -937,11 +937,11 @@ msgstr "" "\n" "-v\tOpre verbeusement.\n" -#: quilt/pop.in:98 quilt/scripts/patchfns.in:880 +#: quilt/pop.in:98 quilt/scripts/patchfns.in:894 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: quilt/pop.in:122 quilt/scripts/patchfns.in:903 +#: quilt/pop.in:122 quilt/scripts/patchfns.in:917 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" @@ -967,7 +967,7 @@ msgstr "Le patch %s doit tre rafraichi au pralable.\\n" msgid "No patch removed\\n" msgstr "Aucun patch retir\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:494 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:508 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" @@ -1312,27 +1312,27 @@ msgstr "Le nom `%s' est mal parenths\n" msgid "Delivery address `%s' is invalid\n" msgstr "L'adresse de destination `%s' est invalide\n" -#: quilt/scripts/patchfns.in:481 +#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495 msgid "No patches in series\\n" msgstr "Aucun patch dans la srie\\n" -#: quilt/scripts/patchfns.in:530 +#: quilt/scripts/patchfns.in:544 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: quilt/scripts/patchfns.in:558 +#: quilt/scripts/patchfns.in:572 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: quilt/scripts/patchfns.in:595 +#: quilt/scripts/patchfns.in:609 msgid "File series fully applied, ends at patch %s\\n" msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" -#: quilt/scripts/patchfns.in:617 +#: quilt/scripts/patchfns.in:631 msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'existe pas\\n" -#: quilt/scripts/patchfns.in:936 +#: quilt/scripts/patchfns.in:950 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1344,7 +1344,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:1021 +#: quilt/scripts/patchfns.in:1035 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -177,7 +177,7 @@ msgstr "" msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:579 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:593 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" @@ -312,7 +312,7 @@ msgstr "" msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: quilt/diff.in:266 quilt/files.in:105 +#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" @@ -758,29 +758,29 @@ msgstr "" "--to, --cc, --bcc\n" "\tToやCC、BCCへの受信者の追加。\n" -#: quilt/mail.in:166 +#: quilt/mail.in:181 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n" "を使用してください。" -#: quilt/mail.in:304 +#: quilt/mail.in:342 msgid "Unable to extract a subject header from %s\\n" msgstr "%s から件名を取り出せません。\\n" -#: quilt/mail.in:327 +#: quilt/mail.in:365 msgid "Patches %s have duplicate subject headers.\\n" msgstr "パッチ %s の件名が重複しています。\\n" -#: quilt/mail.in:369 +#: quilt/mail.in:407 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "序文に件名がありません(%s として保存されました)\\n" -#: quilt/mail.in:372 +#: quilt/mail.in:410 msgid "Introduction has no subject header\\n" msgstr "序文に件名がありません\\n" -#: quilt/mail.in:462 +#: quilt/mail.in:500 msgid "Introduction saved as %s\\n" msgstr "序文は %s という名前で保存されました\\n" @@ -902,11 +902,11 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: quilt/pop.in:98 quilt/scripts/patchfns.in:880 +#: quilt/pop.in:98 quilt/scripts/patchfns.in:894 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/pop.in:122 quilt/scripts/patchfns.in:903 +#: quilt/pop.in:122 quilt/scripts/patchfns.in:917 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" @@ -932,7 +932,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:494 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:508 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -1269,28 +1269,28 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます msgid "Delivery address `%s' is invalid\n" msgstr "配送先のアドレス `%s' が不正です\n" -#: quilt/scripts/patchfns.in:481 +#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495 msgid "No patches in series\\n" msgstr "シリーズに登録されているパッチがありません\\n" -#: quilt/scripts/patchfns.in:530 +#: quilt/scripts/patchfns.in:544 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:558 +#: quilt/scripts/patchfns.in:572 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/scripts/patchfns.in:595 +#: quilt/scripts/patchfns.in:609 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: quilt/scripts/patchfns.in:617 +#: quilt/scripts/patchfns.in:631 msgid "Patch %s does not exist\\n" msgstr "パッチ %s が存在しません\\n" -#: quilt/scripts/patchfns.in:936 +#: quilt/scripts/patchfns.in:950 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1302,7 +1302,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:1021 +#: quilt/scripts/patchfns.in:1035 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 3b0f2ff..190b891 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -119,7 +119,7 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:581 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:593 msgid "Patch %s is currently applied\\n" msgstr "" @@ -206,7 +206,7 @@ msgstr "" msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/diff.in:266 quilt/files.in:105 +#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:312 msgid "Patch %s not applied before patch %s\\n" msgstr "" @@ -510,27 +510,27 @@ msgid "" "\tAppend a recipient to the To, Cc, or Bcc header.\n" msgstr "" -#: quilt/mail.in:166 +#: quilt/mail.in:181 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:304 +#: quilt/mail.in:342 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:327 +#: quilt/mail.in:365 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:369 +#: quilt/mail.in:407 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:372 +#: quilt/mail.in:410 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:462 +#: quilt/mail.in:500 msgid "Introduction saved as %s\\n" msgstr "" @@ -615,11 +615,11 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:98 quilt/scripts/patchfns.in:882 +#: quilt/pop.in:98 quilt/scripts/patchfns.in:894 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/pop.in:122 quilt/scripts/patchfns.in:905 +#: quilt/pop.in:122 quilt/scripts/patchfns.in:917 msgid "Failed to patch temporary files\\n" msgstr "" @@ -643,7 +643,7 @@ msgstr "" msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:267 quilt/scripts/patchfns.in:496 +#: quilt/pop.in:267 quilt/scripts/patchfns.in:508 msgid "No patches applied\\n" msgstr "" @@ -881,27 +881,27 @@ msgstr "" msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/patchfns.in:483 +#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:532 +#: quilt/scripts/patchfns.in:544 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:560 +#: quilt/scripts/patchfns.in:572 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:597 +#: quilt/scripts/patchfns.in:609 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:619 +#: quilt/scripts/patchfns.in:631 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:938 +#: quilt/scripts/patchfns.in:950 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -909,7 +909,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1023 +#: quilt/scripts/patchfns.in:1035 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/quilt.changes b/quilt.changes index 5d2d52f..46a2ad0 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 20 01:13:49 CEST 2007 - agruen@suse.de + +- quilt mail: Allow to specify a patch range. +- Remove fuzzy German translations. + +------------------------------------------------------------------- Fri Apr 20 00:02:19 CEST 2007 - agruen@suse.de - Make pod2man optional (./configure --without-pod2man). diff --git a/quilt/mail.in b/quilt/mail.in index de6c883..e14943f 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -148,11 +148,26 @@ do esac done -if [ $# -gt 0 -o \( -z "$opt_send" -a -z "$opt_mbox" \) ] +if [ $# -gt 2 -o \( -z "$opt_send" -a -z "$opt_mbox" \) ] then usage fi +if [ $# -ge 1 ]; then + if [ "$1" = - ] + then + first_patch="$(find_first_patch)" || exit 1 + else + first_patch="$(find_patch "$1")" || exit 1 + fi + + if [ $# -ge 2 ]; then + last_patch="$(find_patch "$2")" || exit 1 + else + last_patch="$(find_last_patch)" || exit 1 + fi +fi + if [ -z "$opt_sender" ]; then hostname=$(hostname -f 2>/dev/null) if [ "$hostname" = "${hostname/.}" ] @@ -282,7 +297,30 @@ if [ "$(type -t quilt_mail_patch_filter 2> /dev/null)" != function ]; then } fi -patches=( $(cat_series) ) +if [ -n "$first_patch" ] +then + if [ -n "$last_patch" ] + then + set -- $(patches_before "$last_patch") "$last_patch" + while [ $# -ne 0 ] + do + [ "$1" = "$first_patch" ] && break + shift + done + if [ $# -eq 0 ] + then + printf $"Patch %s not applied before patch %s\n" \ + "$(print_patch $first_patch)" \ + "$(print_patch $last_patch)" >&2 + exit 1 + fi + patches=( "$@" ) + else + patches=( "$first_patch" $(patches_after "$first_patch") ) + fi +else + patches=( $(cat_series) ) +fi total=${#patches[@]} tmpdir=$(gen_tempfile -d) diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 070ee3a..bb43416 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -487,6 +487,18 @@ find_first_patch() echo "$patch" } +find_last_patch() +{ + local patch=$(cat_series | tail -n 1) + if [ -z "$patch" ] + then + printf $"No patches in series\n" >&2 + return 1 + fi + + echo "$patch" +} + find_top_patch() { if ! top_patch |