diff options
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | po/de.po | 36 | ||||
| -rw-r--r-- | po/fr.po | 31 | ||||
| -rw-r--r-- | po/ja.po | 31 | ||||
| -rw-r--r-- | po/quilt.pot | 31 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/import.in | 9 |
7 files changed, 84 insertions, 67 deletions
diff --git a/Makefile.in b/Makefile.in index 5d3bc6e..66b9a48 100644 --- a/Makefile.in +++ b/Makefile.in @@ -131,7 +131,7 @@ export QUILT_DIR QUILT_LIB QUILTRC #----------------------------------------------------------------------- -all : scripts compat $(DOC:%=doc/%) $(MAN1) mofiles +all : configure scripts compat $(DOC:%=doc/%) $(MAN1) mofiles $(LIB:%=lib/%) :: $(LIBOBJS) @@ -259,6 +259,11 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefil lib/backup-files.o :: Makefile +configure : configure.ac + autoconf + @echo "Please run ./configure" + @false + Makefile : Makefile.in @echo "Please run ./configure" @false @@ -629,8 +629,9 @@ msgid "" "\tused when importing a single patch.\n" "\n" "-d {o|a|n}\n" -"\tKeep the old (o), all (a), or new (n) patch header. If both patches\n" -"\tinclude headers, this option must be specified.\n" +"\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" +"\tnew (n) patch header. If both patches include headers, this option\n" +"\tmust be specified. This option is only effective when -f is used.\n" "\n" "-f\tOverwite/update existing patches.\n" msgstr "" @@ -645,57 +646,58 @@ msgstr "" "\tPatch-Dateiname, den Quilt verwenden soll. Diese Option kann nur beim\n" "\tImport eines einzelnen Patches angegeben werden.\n" "\n" -"-d {o|a|n}\n" -"\tErhalte den alten (o), alle (a), oder den neuen (n) Patch-Header. Wenn\n" -"\tbeide Patches Header enthalten, muss diese Option angegeben werden.\n" -"\n" "-f\tÃœberschreibe/aktualisiere existierende Patches.\n" +"\n" +"-d {o|a|n}\n" +"\tErhalte beim Ãœberschreiben von Patches den alten (o), alle (a), oder den\n" +"\tneuen (n) Patch-Header. Wenn beide Patches Header enthalten, muss diese\n" +"\tOption angegeben werden. Diese Option ist nur in Kombination mit -f wirksam.\n" -#: quilt/import.in:67 +#: quilt/import.in:68 msgid "Patch headers differ:\\n" msgstr "Die Patch-Header unterscheiden sich:\\n" -#: quilt/import.in:70 +#: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "Bitte verwenden Sie die Option -d {o|a|n} um anzugeben, welche Patch-Header " "erhalten bleiben sollen.\\n" -#: quilt/import.in:123 +#: quilt/import.in:124 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" "Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches " "verwendet werden\\n" -#: quilt/import.in:143 +#: quilt/import.in:144 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:152 +#: quilt/import.in:153 msgid "Patch %s already exists in series.\\n" msgstr "Patch %s existiert bereits in der series-Datei\\n" -#: quilt/import.in:158 +#: quilt/import.in:159 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:169 +#: quilt/import.in:170 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: quilt/import.in:173 +#: quilt/import.in:174 msgid "Importing patch %s\\n" msgstr "Importiere patch %s\\n" -#: quilt/import.in:175 +#: quilt/import.in:176 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:185 +#: quilt/import.in:186 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:192 +#: quilt/import.in:193 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -635,11 +635,12 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-d {o|a|n}\n" -"\tKeep the old (o), all (a), or new (n) patch header. If both patches\n" -"\tinclude headers, this option must be specified.\n" -"\n" "-f\tOverwite/update existing patches.\n" +"\n" +"-d {o|a|n}\n" +"\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" +"\tnew (n) patch header. If both patches include headers, this option\n" +"\tmust be specified. This option is only effective when -f is used.\n" msgstr "" "\n" "Importe des patchs externes. Ces patches sont insérés juste après\n" @@ -656,50 +657,50 @@ msgstr "" "\n" "-f\tÉcrase/met à jour les patchs existants.\n" -#: quilt/import.in:67 +#: quilt/import.in:68 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:70 +#: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:123 +#: quilt/import.in:124 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" "L'option « -n » ne peut être utilisé que lors de l'import d'un seul patch.\\n" -#: quilt/import.in:143 +#: quilt/import.in:144 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/import.in:152 +#: quilt/import.in:153 #, fuzzy msgid "Patch %s already exists in series.\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/import.in:158 +#: quilt/import.in:159 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:169 +#: quilt/import.in:170 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:173 +#: quilt/import.in:174 #, fuzzy msgid "Importing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/import.in:175 +#: quilt/import.in:176 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistré dans %s)\\n" -#: quilt/import.in:185 +#: quilt/import.in:186 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:192 +#: quilt/import.in:193 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" @@ -613,11 +613,12 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-d {o|a|n}\n" -"\tKeep the old (o), all (a), or new (n) patch header. If both patches\n" -"\tinclude headers, this option must be specified.\n" -"\n" "-f\tOverwite/update existing patches.\n" +"\n" +"-d {o|a|n}\n" +"\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" +"\tnew (n) patch header. If both patches include headers, this option\n" +"\tmust be specified. This option is only effective when -f is used.\n" msgstr "" "\n" "外部パッãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–り込む。パッãƒã¯æœ€ä¸Šä½ãƒ‘ッãƒã®å¾Œã«å–ã‚Šè¾¼ã¾ã‚Œã‚‹ãŒã€\n" @@ -632,49 +633,49 @@ msgstr "" "\n" "-f\tå˜åœ¨ã™ã‚‹ãƒ‘ッãƒã®ä¸Šæ›¸ãã€ã¾ãŸã¯ã‚¢ãƒƒãƒ—デート。\n" -#: quilt/import.in:67 +#: quilt/import.in:68 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:70 +#: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:123 +#: quilt/import.in:124 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "オプション \\`-n'ã¯ã€ãƒ‘ッãƒã‚’一ã¤ã ã‘å–り込むã¨ãã®ã¿æœ‰åŠ¹ã§ã™ã€‚\\n" -#: quilt/import.in:143 +#: quilt/import.in:144 msgid "Patch %s is applied\\n" msgstr "パッム%s ã¯ã€ã™ã§ã«é©ç”¨ã•ã‚Œã¦ã„ã¾ã™\\n" -#: quilt/import.in:152 +#: quilt/import.in:153 #, fuzzy msgid "Patch %s already exists in series.\\n" msgstr "パッム%s 㯠seriesã®ä¸ã«ã‚ã‚Šã¾ã›ã‚“\\n" -#: quilt/import.in:158 +#: quilt/import.in:159 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッム%s ã¯ã€ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚-fã§ç½®ãæ›ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\\n" -#: quilt/import.in:169 +#: quilt/import.in:170 msgid "Replacing patch %s with new version\\n" msgstr "パッム%s ã‚’æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ç½®ãæ›ãˆã¾ã™\\n" -#: quilt/import.in:173 +#: quilt/import.in:174 #, fuzzy msgid "Importing patch %s\\n" msgstr "パッム%s ã‚’ã¯ãšã—ã¾ã™\\n" -#: quilt/import.in:175 +#: quilt/import.in:176 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッム%s ã‚’å–り込んã§ã„ã¾ã™ (%s ã¨ã—ã¦ä¿å˜ã•ã‚Œã¾ã™)\\n" -#: quilt/import.in:185 +#: quilt/import.in:186 msgid "Failed to import patch %s\\n" msgstr "パッム%s ã®å–ã‚Šè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" -#: quilt/import.in:192 +#: quilt/import.in:193 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルã¸ã®ãƒ‘ッム%s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 19ea580..fa1d2cf 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -422,54 +422,55 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-d {o|a|n}\n" -"\tKeep the old (o), all (a), or new (n) patch header. If both patches\n" -"\tinclude headers, this option must be specified.\n" -"\n" "-f\tOverwite/update existing patches.\n" +"\n" +"-d {o|a|n}\n" +"\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" +"\tnew (n) patch header. If both patches include headers, this option\n" +"\tmust be specified. This option is only effective when -f is used.\n" msgstr "" -#: quilt/import.in:67 +#: quilt/import.in:68 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:70 +#: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:123 +#: quilt/import.in:124 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" -#: quilt/import.in:143 +#: quilt/import.in:144 msgid "Patch %s is applied\\n" msgstr "" -#: quilt/import.in:152 +#: quilt/import.in:153 msgid "Patch %s already exists in series.\\n" msgstr "" -#: quilt/import.in:158 +#: quilt/import.in:159 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: quilt/import.in:169 +#: quilt/import.in:170 msgid "Replacing patch %s with new version\\n" msgstr "" -#: quilt/import.in:173 +#: quilt/import.in:174 msgid "Importing patch %s\\n" msgstr "" -#: quilt/import.in:175 +#: quilt/import.in:176 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: quilt/import.in:185 +#: quilt/import.in:186 msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:192 +#: quilt/import.in:193 msgid "Failed to insert patch %s into file series\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 57177d1..d1439a6 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 25 21:41:08 CET 2006 - agruen@suse.de + +- quilt/import.in: Improve the help text. +- Makefile.in: Make sure configure is up to date. + +------------------------------------------------------------------- Wed Jan 25 21:30:36 CET 2006 - agruen@suse.de - lib/backup-files.c: Fix memory leaks (markus@oberhumer.com). diff --git a/quilt/import.in b/quilt/import.in index f9a06b0..aeb5d60 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -33,11 +33,12 @@ current top patch, and must be pushed after import to apply them. Patch filename to use inside quilt. This option can only be used when importing a single patch. --d {o|a|n} - Keep the old (o), all (a), or new (n) patch header. If both patches - include headers, this option must be specified. - -f Overwite/update existing patches. + +-d {o|a|n} + When overwriting in existing patch, keep the old (o), all (a), or + new (n) patch header. If both patches include headers, this option + must be specified. This option is only effective when -f is used. " exit 0 else |