diff options
author | Jean Delvare <khali@linux-fr.org> | 2006-01-04 16:41:31 +0000 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2006-01-04 16:41:31 +0000 |
commit | 24dc4930b6456c12bcbdf41173cc52637b88fcd5 (patch) | |
tree | b98b2553c515332fe0b0ea6e0c8af03bef585769 | |
parent | 5d67b7c1bb0cbf5550449756877ecae1a15101f8 (diff) | |
download | quilt-24dc4930b6456c12bcbdf41173cc52637b88fcd5.tar.gz |
Translation updates:
- po/quilt.pot, po/de.po: Resync with code.
- po/ja.po: Update from Yasushi Shoji.
- po/fr.po: Update from Jean Delvare.
-rw-r--r-- | po/de.po | 4 | ||||
-rw-r--r-- | po/fr.po | 45 | ||||
-rw-r--r-- | po/ja.po | 87 | ||||
-rw-r--r-- | po/quilt.pot | 2 | ||||
-rw-r--r-- | quilt.changes | 7 |
5 files changed, 59 insertions, 86 deletions
@@ -355,8 +355,8 @@ msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" #: quilt/diff.in:414 -msgid "More recent patches modify files in patch %s\\n" -msgstr "Später angewandte Patches verändern Dateien von %s\\n" +msgid "Warning: more recent patches modify files in patch %s\\n" +msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" #: quilt/edit.in:24 msgid "Usage: quilt edit file ...\\n" @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: quilt 0.42\n" -"PO-Revision-Date: 2005-07-19 16:05+0200\n" +"Project-Id-Version: quilt 0.43\n" +"PO-Revision-Date: 2006-01-04 17:30+0100\n" "Last-Translator: Jean Delvare <khali@linux-fr.org>\n" "Language-Team: French <traduc@traduc.org>\n" "MIME-Version: 1.0\n" @@ -123,12 +123,10 @@ msgid "File %s added to patch %s\\n" msgstr "Le fichier %s a été ajouté au patch %s\\n" #: quilt/annotate.in:22 -#, fuzzy msgid "Usage: quilt annotate [-p patch] {file}\\n" -msgstr "Usage : quilt add [-p patch] {fichier} ...\\n" +msgstr "Usage : quilt annotate [-p patch] {fichier}\\n" #: quilt/annotate.in:25 -#, fuzzy msgid "" "\n" "Print an annotated listing of the specified file showing which\n" @@ -140,7 +138,12 @@ msgid "" msgstr "" "\n" "Affiche une version annotée du fichier spécifié, montrant quel\n" -"patch modifie chaque ligne.\n" +"patch modifie chaque ligne. Seuls les patches appliqués sont\n" +"pris en compte.\n" +"\n" +"-p patch\n" +"\tAnnote le fichier tel qu'il se trouve après application du patch\n" +"\tspécifié plutôt que d'aller jusqu'au patch au sommet.\n" #: quilt/applied.in:22 msgid "Usage: quilt applied [patch]\\n" @@ -165,7 +168,6 @@ msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "Usage : quilt delete [-r] [--backup] [patch|-n]\\n" #: quilt/delete.in:25 -#, fuzzy msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -188,6 +190,12 @@ msgstr "" "\n" "-n\tEfface le patch qui suit celui qui est au sommet, au lieu du\n" "\tpatch spécifié ou de celui qui est au sommet.\n" +"\n" +"-r\tSupprime également le patch enlevé du répertoire patches.\n" +"\n" +"--backup\n" +"\tRenomme le fichier en patch~ au lieu de le supprimer.\n" +"\tIgnoré si \\\"-r\\\" n'est pas également utilisé.\n" #: quilt/delete.in:100 msgid "No next patch\\n" @@ -206,14 +214,12 @@ msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" #: quilt/delete.in:138 -#, fuzzy msgid "Failed to backup patch file \\\"%s\\\"\\n" -msgstr "Impossible de faire une copie de sécurité de %s\\n" +msgstr "Impossible de faire une copie de sécurité du fichier \\\"%s\\\"\\n" #: quilt/delete.in:145 -#, fuzzy msgid "Failed to remove patch file \\\"%s\\\"\\n" -msgstr "Impossible de retirer le patch %s\\n" +msgstr "Impossible de retirer le patch \\\"%s\\\"\\n" #: quilt/diff.in:24 msgid "" @@ -351,8 +357,8 @@ msgid "Diff failed, aborting\\n" msgstr "Le diff a échoué. Abandon.\\n" #: quilt/diff.in:414 -msgid "More recent patches modify files in patch %s\\n" -msgstr "Un patch plus recent modifie des fichiers communs à %s.\\n" +msgid "Warning: more recent patches modify files in patch %s\\n" +msgstr "Attention: un patch plus recent modifie des fichiers communs à %s\\n" #: quilt/edit.in:24 msgid "Usage: quilt edit file ...\\n" @@ -634,7 +640,6 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ...\\n" #: quilt/import.in:25 -#, fuzzy msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -650,7 +655,9 @@ msgid "" "-f\tOverwite/update existing patches.\n" msgstr "" "\n" -"Importe des patchs externes.\n" +"Importe des patchs externes. Ces patches sont insérés juste après\n" +"le patch au sommet, et doivent ensuite être appliqués (utiliser\n" +"« quilt push »).\n" "\n" "-p num\n" "\tNombre de niveaux de répertoires à retirer lors de l'application du \n" @@ -692,16 +699,14 @@ msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" #: quilt/mail.in:24 -#, fuzzy msgid "" "Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--" "to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" msgstr "" -"Usage : quilt mail {--mbox fichier|--send} [--from ...] [--to ...] [--" -"cc ...] [--bcc ...] [--subject ...]\\n" +"Usage : quilt mail {--mbox fichier|--send} [--sender ...] [--from ...] [--" +"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" #: quilt/mail.in:27 -#, fuzzy msgid "" "\n" "Create mail messages from all patches in the series file, and either store\n" @@ -752,7 +757,7 @@ msgstr "" #: quilt/mail.in:145 msgid "Could not determine the envelope sender address. Please use --sender." -msgstr "" +msgstr "Impossible de déterminer l'adresse d'expéditeur. Utilisez --sender." #: quilt/new.in:22 msgid "Usage: quilt new {patchname}\\n" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: quilt 0.33\n" -"PO-Revision-Date: 2005-09-06 09:43+0900\n" +"PO-Revision-Date: 2006-01-04 05:35+0900\n" "Last-Translator: Yasushi SHOJI <yashi@atmark-techno.com>\n" "Language-Team: Quilt\n" "MIME-Version: 1.0\n" @@ -121,12 +121,10 @@ msgid "File %s added to patch %s\\n" msgstr "ファイル %s をパッム%s ã«è¿½åŠ ã—ã¾ã—ãŸ\\n" #: quilt/annotate.in:22 -#, fuzzy msgid "Usage: quilt annotate [-p patch] {file}\\n" -msgstr "使ã„æ–¹: quilt add [-p パッãƒ] {file} ...\\n" +msgstr "使ã„æ–¹: quilt annotate [-p パッãƒ] {file}\\n" #: quilt/annotate.in:25 -#, fuzzy msgid "" "\n" "Print an annotated listing of the specified file showing which\n" @@ -137,8 +135,11 @@ msgid "" "\ttopmost patch.\n" msgstr "" "\n" -"指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã€ã©ã®ãƒ‘ッãƒãŒã©ã®è¡Œã‚’変更ã—ãŸã‹ã¨ã„ã†è¨»é‡ˆä»˜ãã§å‡ºåŠ›ã—ã¾" -"ã™\n" +"パッãƒãŒå¤‰æ›´ã—ãŸè¡Œã«è¨»é‡ˆã‚’付ã‘ã¦è¡¨ç¤ºã€‚é©å¿œã•ã‚Œã‚‹ã®ã¯ã€ã‚ã¦ã‚‰ã‚Œã¦ã„るパッ\n" +"ãƒã®ã¿ã€‚\n" +"\n" +"-p パッãƒ\n" +"\t最上ä½ã®ãƒ‘ッãƒã¾ã§å‡¦ç†ã‚’è¡Œãªã‚ãšã€æŒ‡å®šã•ã‚ŒãŸãƒ‘ッãƒã§å‡¦ç†ã‚’終了\n" #: quilt/applied.in:22 msgid "Usage: quilt applied [patch]\\n" @@ -345,8 +346,8 @@ msgid "Diff failed, aborting\\n" msgstr "差分ã«å¤±æ•—ã—ã¾ã—ãŸã€‚異常終了ã—ã¾ã™\\n" #: quilt/diff.in:414 -msgid "More recent patches modify files in patch %s\\n" -msgstr "最近ã®ãƒ‘ッãƒãŒã€ãƒ‘ッム%s 内ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’変更ã—ã¦ã„ã¾ã™\\n" +msgid "Warning: more recent patches modify files in patch %s\\n" +msgstr "è¦å‘Š: 最近ã®ãƒ‘ッãƒãŒã€ãƒ‘ッム%s 内ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’変更ã—ã¦ã„ã¾ã™\\n" #: quilt/edit.in:24 msgid "Usage: quilt edit file ...\\n" @@ -673,16 +674,14 @@ msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルã¸ã®ãƒ‘ッム%s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" #: quilt/mail.in:24 -#, fuzzy msgid "" "Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--" "to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" msgstr "" -"使ã„æ–¹: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] " -"[--bcc ...] [--subject ...]\\n" +"使ã„æ–¹: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--" +"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n" #: quilt/mail.in:27 -#, fuzzy msgid "" "\n" "Create mail messages from all patches in the series file, and either store\n" @@ -709,20 +708,25 @@ msgid "" "\tAppend a recipient to the To, Cc, or Bcc header.\n" msgstr "" "\n" -"シリーズファイル内ã«ã‚ã‚‹ã™ã¹ã¦ã®ãƒ‘ッãƒã‹ã‚‰ãƒ¡ãƒ¼ãƒ«ã‚’作æˆã™ã‚‹ã€‚\n" -"mailboxファイルã¨ã—ã¦ä¿å˜ã¾ãŸã¯ã™ãã«é€ã‚Šå‡ºã™ã“ã¨ãŒã§ãる。\n" -"説明文ã®ãƒ†ãƒ³ãƒ—レート作æˆã®ãŸã‚ã«ã‚¨ãƒ‡ã‚£ã‚¿ãŒå®Ÿè¡Œã•ã‚Œã‚‹ã€‚\n" -"詳細ã«ã¤ã„ã¦ã¯ %sã‚’å‚照。\n" +"シリーズファイル内ã«ã‚ã‚‹ã™ã¹ã¦ã®ãƒ‘ッãƒã‹ã‚‰ãƒ¡ãƒ¼ãƒ«ã‚’作æˆã—ã€mailboxファ\n" +"イルã¨ã—ã¦ä¿å˜ã™ã‚‹ã‹ã€ã™ãã«é€ã‚Šå‡ºã™ã“ã¨ãŒã§ãる。説明文作æˆç”¨ã«ãƒ†ãƒ³ãƒ—\n" +"レート付ãã§ã‚¨ãƒ‡ã‚£ã‚¿ãŒå®Ÿè¡Œã•ã‚Œã‚‹ã€‚詳細ã«ã¤ã„ã¦ã¯ %sã‚’å‚照。\n" "\n" "--mbox ファイル\n" "\t全メッセージを指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã« mboxå½¢å¼ã§ä¿å˜ã€‚後ã«ä¾‹ãˆã°\n" "\tformailãªã©ã‚’使ã£ã¦é€ä¿¡ã™ã‚‹ã“ã¨ãŒã§ãる。\n" "\n" "--send\n" -"\t%s を使ã£ã¦ã€ç›´æŽ¥ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã™ã‚‹ã€‚\n" +"\t直接メッセージをé€ä¿¡ã™ã‚‹ã€‚\n" +"\n" +"--sender\n" +"\tエンベãƒãƒ¼ãƒ—用é€ä¿¡è€…アドレスã®æŒ‡å®šã€‚アドレスã¯å¿…ãš \n" +"\t\\`\\`user@domain.name''ã¨ã„ã†å½¢ã«ãªã£ã¦ã„ãªã‘ã‚Œã°ãªã‚‰ãªã„。表示用\n" +"\tã®åå‰ã¯ä½¿ç”¨ä¸å¯ã€‚\n" "\n" "--from, --subject\n" -"\t使用ã™ã‚‹ Fromã¨Subjectヘッダã®å€¤ã€‚\n" +"\t使用ã™ã‚‹ Fromã¨Subjectヘッダã®å€¤ã€‚--formオプションãŒä¸Žãˆã‚‰ã‚Œãª\n" +"\tã„å ´åˆã¯ --senderオプションãŒä½¿ç”¨ã•ã‚Œã‚‹ã€‚\n" "\n" "--to, --cc, --bcc\n" "\tToã‚„CCã€BCCã¸ã®å—信者ã®è¿½åŠ 。\n" @@ -730,6 +734,8 @@ msgstr "" #: quilt/mail.in:145 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" +"エンベãƒãƒ¼ãƒ—ã®é€ä¿¡è€…アドレスを確定ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚--senderオプション\n" +"を使用ã—ã¦ãã ã•ã„。" #: quilt/new.in:22 msgid "Usage: quilt new {patchname}\\n" @@ -1416,48 +1422,3 @@ msgstr "%2$s ã® %1$s 行目末尾ã«ã‚る空白文å—を削除ã—ã¾ã™\n" #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "%s ã‹ã‚‰ %s ã¸åå‰ã‚’変更ã—ã¾ã—ãŸ: %s\n" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Create mail messages from all patches in the series file, and either " -#~ "store\n" -#~ "them in a mailbox file, or send them immediately. The editor is opened\n" -#~ "with a template for the introductory message. Please see the file\n" -#~ "%s for details.\n" -#~ "\n" -#~ "--mbox file\n" -#~ "\tStore all messages in the specified file in mbox format. The mbox\n" -#~ "\tcan later be sent using formail, for example.\n" -#~ "\n" -#~ "--send\n" -#~ "\tSend the messages directly.\n" -#~ "\n" -#~ "--from, --subject\n" -#~ "\tThe values for the From and Subject headers to use.\n" -#~ "\n" -#~ "--to, --cc, --bcc\n" -#~ "\tAppend a recipient to the To, Cc, or Bcc header.\n" -#~ msgstr "" -#~ "\n" -#~ "シリーズファイル内ã«ã‚ã‚‹ã™ã¹ã¦ã®ãƒ‘ッãƒã‹ã‚‰ãƒ¡ãƒ¼ãƒ«ã‚’作æˆã™ã‚‹ã€‚\n" -#~ "mailboxファイルã¨ã—ã¦ä¿å˜ã¾ãŸã¯ã™ãã«é€ã‚Šå‡ºã™ã“ã¨ãŒã§ãる。\n" -#~ "説明文ã®ãƒ†ãƒ³ãƒ—レート作æˆã®ãŸã‚ã«ã‚¨ãƒ‡ã‚£ã‚¿ãŒå®Ÿè¡Œã•ã‚Œã‚‹ã€‚\n" -#~ "詳細ã«ã¤ã„ã¦ã¯ %sã‚’å‚照。\n" -#~ "\n" -#~ "--mbox ファイル\n" -#~ "\t全メッセージを指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã« mboxå½¢å¼ã§ä¿å˜ã€‚後ã«ä¾‹ãˆã°\n" -#~ "\tformailãªã©ã‚’使ã£ã¦é€ä¿¡ã™ã‚‹ã“ã¨ãŒã§ãる。\n" -#~ "\n" -#~ "--send\n" -#~ "\t%s を使ã£ã¦ã€ç›´æŽ¥ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã™ã‚‹ã€‚\n" -#~ "\n" -#~ "--from, --subject\n" -#~ "\t使用ã™ã‚‹ Fromã¨Subjectヘッダã®å€¤ã€‚\n" -#~ "\n" -#~ "--to, --cc, --bcc\n" -#~ "\tToã‚„CCã€BCCã¸ã®å—信者ã®è¿½åŠ 。\n" - -#, fuzzy -#~ msgid "Usage: quilt [-p patch] annotate {file}\\n" -#~ msgstr "使ã„æ–¹: quilt annotate {ファイル}\\n" diff --git a/po/quilt.pot b/po/quilt.pot index aad45f3..ca44b9b 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -245,7 +245,7 @@ msgid "Diff failed, aborting\\n" msgstr "" #: quilt/diff.in:414 -msgid "More recent patches modify files in patch %s\\n" +msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "" #: quilt/edit.in:24 diff --git a/quilt.changes b/quilt.changes index 381dfb2..ef0e846 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 4 17:32:47 CET 2006 - khali@linux-fr.org + +- po/quilt.pot, po/de.po: Resync with code. +- po/ja.po: Update from Yasushi Shoji. +- po/fr.po: Update from me. + +------------------------------------------------------------------- Thu Dec 8 17:45:41 CET 2005 - agruen@suse.de - scripts/inspect.in (setup command): add heuristic to check for |