diff options
| -rw-r--r-- | po/de.po | 19 | ||||
| -rw-r--r-- | po/fr.po | 24 | ||||
| -rw-r--r-- | po/ja.po | 26 | ||||
| -rw-r--r-- | po/quilt.pot | 12 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/new.in | 8 |
6 files changed, 75 insertions, 20 deletions
@@ -810,20 +810,33 @@ msgid "" "\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" +"Quilt can be used in sub-directories of a source tree. It determines the\n" +"root of a source tree by searching for a %s directory above the\n" +"current working directory. Create a %s directory in the intended root\n" +"directory if quilt chooses a top-level directory that is too high up\n" +"in the directory tree.\n" msgstr "" "\n" "Erzeuge einen neuen Patch mit dem angegebenen Dateinamen, und fügt\n" "ihn nach dem obersten Patch in die series-Datei ein.\n" +"\n" +"Quilt kann aus Unterverzeichnissen eines Quellbaums heraus verwendet " +"werden.\n" +"Es bestimmt die Wurzel des Quellbaums, in dem es nach %s-Verzeichnissen\n" +"über dem aktuellen Verzeichnis sucht. Erzeugen Sie ein %s-Verzeichnis\n" +"im vorgesehenen Wurzelverzeichnis, falls Quilt ein Verzeichnis zu weit oben\n" +"im Verzeichnisbaum verwendet.\n" -#: quilt/new.in:64 +#: quilt/new.in:70 msgid "Patch %s exists already\\n" msgstr "Patch %s existiert bereits\\n" -#: quilt/new.in:75 +#: quilt/new.in:81 msgid "Failed to create patch %s\\n" msgstr "Konnte Patch %s nicht erzeugen\\n" -#: quilt/new.in:78 +#: quilt/new.in:84 msgid "Patch %s is now on top\\n" msgstr "Der oberste Patch ist jetzt %s\\n" @@ -817,20 +817,23 @@ msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" "topmost patch in the patch series file.\n" -msgstr "" "\n" -"Cre un nouveau patch au nom spcifi, et l'insere aprs le patch\n" -"au sommet dans le fichier de srie.\n" +"Quilt can be used in sub-directories of a source tree. It determines the\n" +"root of a source tree by searching for a %s directory above the\n" +"current working directory. Create a %s directory in the intended root\n" +"directory if quilt chooses a top-level directory that is too high up\n" +"in the directory tree.\n" +msgstr "" -#: quilt/new.in:64 +#: quilt/new.in:70 msgid "Patch %s exists already\\n" msgstr "Le patch %s existe dj\\n" -#: quilt/new.in:75 +#: quilt/new.in:81 msgid "Failed to create patch %s\\n" msgstr "Impossible de crer le patch %s\\n" -#: quilt/new.in:78 +#: quilt/new.in:84 msgid "Patch %s is now on top\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -1524,3 +1527,12 @@ msgstr "" "Veuillez retirer tous les patchs en utilisant quilt pop -a avec la \n" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" + +#~ msgid "" +#~ "\n" +#~ "Create a new patch with the specified file name, and insert it after the\n" +#~ "topmost patch in the patch series file.\n" +#~ msgstr "" +#~ "\n" +#~ "Cre un nouveau patch au nom spcifi, et l'insere aprs le patch\n" +#~ "au sommet dans le fichier de srie.\n" @@ -788,21 +788,23 @@ msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" "topmost patch in the patch series file.\n" -msgstr "" -"\n" -"指定されたファイル名で新しいパッチを作成し、seriesファイルにに追加する。\n" -"追加される場所は、現在最上位のパッチの次です。\n" "\n" +"Quilt can be used in sub-directories of a source tree. It determines the\n" +"root of a source tree by searching for a %s directory above the\n" +"current working directory. Create a %s directory in the intended root\n" +"directory if quilt chooses a top-level directory that is too high up\n" +"in the directory tree.\n" +msgstr "" -#: quilt/new.in:64 +#: quilt/new.in:70 msgid "Patch %s exists already\\n" msgstr "パッチ %s は、すでに存在します\\n" -#: quilt/new.in:75 +#: quilt/new.in:81 msgid "Failed to create patch %s\\n" msgstr "パッチ %s の作成に失敗しました\\n" -#: quilt/new.in:78 +#: quilt/new.in:84 msgid "Patch %s is now on top\\n" msgstr "パッチ %s を最上位にしました\\n" @@ -1479,3 +1481,13 @@ msgstr "" "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" + +#~ msgid "" +#~ "\n" +#~ "Create a new patch with the specified file name, and insert it after the\n" +#~ "topmost patch in the patch series file.\n" +#~ msgstr "" +#~ "\n" +#~ "指定されたファイル名で新しいパッチを作成し、seriesファイルにに追加する。\n" +#~ "追加される場所は、現在最上位のパッチの次です。\n" +#~ "\n" diff --git a/po/quilt.pot b/po/quilt.pot index 41de55c..827a130 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -545,17 +545,23 @@ msgid "" "\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" +"Quilt can be used in sub-directories of a source tree. It determines the\n" +"root of a source tree by searching for a %s directory above the\n" +"current working directory. Create a %s directory in the intended root\n" +"directory if quilt chooses a top-level directory that is too high up\n" +"in the directory tree.\n" msgstr "" -#: quilt/new.in:64 +#: quilt/new.in:70 msgid "Patch %s exists already\\n" msgstr "" -#: quilt/new.in:75 +#: quilt/new.in:81 msgid "Failed to create patch %s\\n" msgstr "" -#: quilt/new.in:78 +#: quilt/new.in:84 msgid "Patch %s is now on top\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index fc168c5..45db7af 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Feb 11 15:10:03 CET 2006 - agruen@suse.de + +- quilt/new.in: Try to explain how to choose another source tree + root directory when quilt chooses the wrong one. + +------------------------------------------------------------------- Sat Feb 11 14:28:23 CET 2006 - agruen@suse.de - quilt/scripts/patchfns.in: Fix bug in quilt_command when working diff --git a/quilt/new.in b/quilt/new.in index 5ccb5d4..b48dc24 100644 --- a/quilt/new.in +++ b/quilt/new.in @@ -25,7 +25,13 @@ usage() printf $" Create a new patch with the specified file name, and insert it after the topmost patch in the patch series file. -" + +Quilt can be used in sub-directories of a source tree. It determines the +root of a source tree by searching for a %s directory above the +current working directory. Create a %s directory in the intended root +directory if quilt chooses a top-level directory that is too high up +in the directory tree. +" "$QUILT_PATCHES" "$QUILT_PATCHES" exit 0 else exit 1 |