diff options
-rw-r--r-- | po/de.po | 15 | ||||
-rw-r--r-- | po/fr.po | 20 | ||||
-rw-r--r-- | po/ja.po | 75 | ||||
-rw-r--r-- | po/quilt.pot | 11 | ||||
-rw-r--r-- | quilt/delete.in | 2 | ||||
-rw-r--r-- | quilt/import.in | 2 |
6 files changed, 48 insertions, 77 deletions
@@ -185,18 +185,14 @@ msgstr "Keine Patches in der series-Datei\\n" msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" -#: quilt/delete.in:107 -msgid "Removing patch %s failed\\n" +#: quilt/delete.in:107 quilt/delete.in:117 +msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" #: quilt/delete.in:115 msgid "Removed patch %s\\n" msgstr "Entferne Patch %s\\n" -#: quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" -msgstr "Konnte Patch %s nicht entfernen\\n" - #: quilt/delete.in:128 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "Konnte Datei %s nicht sichern\\n" @@ -612,11 +608,11 @@ msgid "Appended text to header of patch %s\\n" msgstr "Text an Header von Patch %s angefรผgt\\n" #: quilt/import.in:22 -msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" -msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei] ...\\n" +msgid "" +"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" +msgstr "Verwendung: quilt import [-p num] [-n 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" @@ -643,6 +639,7 @@ msgstr "" "-p num\n" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" "\tentfernt werden sollen.\n" +"\n" "-n patch\n" "\tPatch-Dateiname, den Quilt verwenden soll. Diese Option kann nur beim\n" "\tImport eines einzelnen Patches angegeben werden.\n" @@ -186,19 +186,14 @@ msgstr "Aucun patch n'est appliqu้\\n" msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqu้\\n" -#: quilt/delete.in:107 -#, fuzzy -msgid "Removing patch %s failed\\n" -msgstr "Retrait de %s\\n" +#: quilt/delete.in:107 quilt/delete.in:117 +msgid "Failed to remove patch %s\\n" +msgstr "Impossible de retirer le patch %s\\n" #: quilt/delete.in:115 msgid "Removed patch %s\\n" msgstr "Patch %s retir้\\n" -#: quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" -msgstr "Impossible de retirer le patch %s\\n" - #: quilt/delete.in:128 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "Impossible de faire une copie de s้curit้ du fichier \\\"%s\\\"\\n" @@ -618,8 +613,9 @@ msgid "Appended text to header of patch %s\\n" msgstr "Texte ajout้ เ la fin de l'en-t๊te du patch %s\\n" #: quilt/import.in:22 -msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" -msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ...\\n" +msgid "" +"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" +msgstr "Usage : quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] fichier_de_patch ...\\n" #: quilt/import.in:25 #, fuzzy @@ -1483,6 +1479,10 @@ msgstr "" "%s et r้appliquez compl่tement vos patchs.\\n" #, fuzzy +#~ msgid "Removing patch %s failed\\n" +#~ msgstr "Retrait de %s\\n" + +#, fuzzy #~ msgid "Patch s is currently applied\\n" #~ msgstr "Le patch %s est actuellement appliqu้\\n" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: quilt 0.33\n" -"PO-Revision-Date: 2006-01-04 05:35+0900\n" +"PO-Revision-Date: 2006-01-26 16:45+0900\n" "Last-Translator: Yasushi SHOJI <yashi@atmark-techno.com>\n" "Language-Team: Quilt\n" "MIME-Version: 1.0\n" @@ -175,26 +175,20 @@ msgid "No next patch\\n" msgstr "ๆฌกใฎใใใใฏใใใพใใ\\n" #: quilt/delete.in:95 quilt/scripts/patchfns.in:442 -#, fuzzy msgid "No patches in series\\n" -msgstr "้ฉ็จใใใฆใใใใใใฏใใใพใใ\\n" +msgstr "ใทใชใผใบใซ็ป้ฒใใใฆใใใใใใใใใพใใ\\n" #: quilt/delete.in:101 quilt/scripts/patchfns.in:539 msgid "Patch %s is currently applied\\n" msgstr "ใใใ %s ใฏ็พๅจ้ฉ็จใใใฆใใพใ\\n" -#: quilt/delete.in:107 -#, fuzzy -msgid "Removing patch %s failed\\n" -msgstr "ใใใ %s ใใฏใใใพใ\\n" +#: quilt/delete.in:107 quilt/delete.in:117 +msgid "Failed to remove patch %s\\n" +msgstr "ใใใ %s ใฎๅ้คใซๅคฑๆใใพใใ\\n" #: quilt/delete.in:115 msgid "Removed patch %s\\n" -msgstr "ใใใ %s ใๅ้คใใใพใใ\\n" - -#: quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" -msgstr "ใใใ %s ใๅ้คใใใใจใซๅคฑๆใใพใใ\\n" +msgstr "ใใใ %s ใๅ้คใใพใใ\\n" #: quilt/delete.in:128 msgid "Failed to backup patch file \\\"%s\\\"\\n" @@ -202,7 +196,7 @@ msgstr "ใใกใคใซ \\\"%s\\\" ใฎใใใฏใขใใใซๅคฑๆใใพใใ\\n" #: quilt/delete.in:135 msgid "Failed to remove patch file \\\"%s\\\"\\n" -msgstr "ใใใ \\\"%s\\\" ใๅ้คใใใใจใซๅคฑๆใใพใใ\\n" +msgstr "ใใใ \\\"%s\\\" ใฎๅ้คใซๅคฑๆใใพใใ\\n" #: quilt/diff.in:24 msgid "" @@ -596,11 +590,11 @@ msgid "Appended text to header of patch %s\\n" msgstr "ใใใ %s ใฎใใใใซ่ฟฝๅ ใใพใใ\\n" #: quilt/import.in:22 -msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" -msgstr "ไฝฟใๆน: quilt import [-f] [-p num] [-n ใใใ] ใใใใใกใคใซ ...\\n" +msgid "" +"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" +msgstr "ไฝฟใๆน: quilt import [-p num] [-n ใใใ] [-f] [-d {o|a|n}] ใใใใใกใคใซ ...\\n" #: quilt/import.in:25 -#, fuzzy msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -621,8 +615,8 @@ msgid "" "\tmust be specified. This option is only effective when -f is used.\n" msgstr "" "\n" -"ๅค้จใใใใใกใคใซใๅใ่พผใใใใใใฏๆไธไฝใใใใฎๅพใซๅใ่พผใพใใใใ\n" -"้ฉ็จใใใใใซใฏๅใ่พผใใ ๅพใซ pushใใชใใฐใชใใชใใ\n" +"ๅค้จใใใใใกใคใซใๅใ่พผใใใใใใฏๆไธไฝใใใใฎๆฌกใฎไฝ็ฝฎใซๅใ่พผใพ\n" +"ใใใๅใ่พผใใ ใใใใ้ฉ็จใใใซใฏ pushใๅฟ
่ฆใ\n" "\n" "-p num\n" "\tใใใใ้ฉ็จใใใจใใซ็ใใใใฃใฌใฏใใชใฌใใซใฎๆฐ (ใใใฉใซใใฏ 1)\n" @@ -632,40 +626,45 @@ msgstr "" "\tไธใคใ ใๅใ่พผใใจใใซๆๅนใ\n" "\n" "-f\tๅญๅจใใใใใใฎไธๆธใใใพใใฏใขใใใใผใใ\n" +"\n" +"-d {o|a|n}\n" +"\tใใใใไธๆธใใใใจใใฎใใใใใใใฎๆๅใ็คบใใๅคใๆนใๆฎใ\n" +"\t(o)ใๅ
จใฆ (a)ใใพใใฏๆฐใใๆนใๆฎใ (n)ใไธกๆนใฎใใใใซใใใ\n" +"\tใใใๅ ดๅใฏๅฟ
ใใใฎใชใใทใงใณใๆๅฎใใๅฟ
่ฆใใใใใใฎใชใใทใง\n" +"\tใณใฏ -fใๆๅฎใใใๆใฎใฟๆๅนใ\n" #: quilt/import.in:68 msgid "Patch headers differ:\\n" -msgstr "" +msgstr "ใใใใใใใฎๅทฎ็ฐ:\\n" #: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" +"ใฉใฎใใใใใใใๆฎใใใใชใใทใงใณ -d {o|a|n}ใไฝฟใฃใฆๆๅฎใใฆใใ ใใ" #: quilt/import.in:124 msgid "Option \\`-n' can only be used when importing a single patch\\n" -msgstr "ใชใใทใงใณ \\`-n'ใฏใใใใใไธใคใ ใๅใ่พผใใจใใฎใฟๆๅนใงใใ\\n" +msgstr "ใชใใทใงใณ \\`-n'ใฏใใใใใไธใคใ ใๅใ่พผใใจใใฎใฟๆๅนใงใ\\n" #: quilt/import.in:144 msgid "Patch %s is applied\\n" msgstr "ใใใ %s ใฏใใใงใซ้ฉ็จใใใฆใใพใ\\n" #: quilt/import.in:153 -#, fuzzy msgid "Patch %s already exists in series.\\n" -msgstr "ใใใ %s ใฏ seriesใฎไธญใซใใใพใใ\\n" +msgstr "ใใใ %s ใฏใใใงใซ seriesใฎไธญใซใใใพใ\\n" #: quilt/import.in:159 msgid "Patch %s exists. Replace with -f.\\n" -msgstr "ใใใ %s ใฏใใใงใซๅญๅจใใพใใ-fใง็ฝฎใๆใใใใจใใงใใพใใ\\n" +msgstr "ใใใ %s ใฏใใใงใซๅญๅจใใพใใ-fใง็ฝฎใๆใใใใจใใงใใพใ\\n" #: quilt/import.in:170 msgid "Replacing patch %s with new version\\n" msgstr "ใใใ %s ใๆฐใใใใผใธใงใณใซ็ฝฎใๆใใพใ\\n" #: quilt/import.in:174 -#, fuzzy msgid "Importing patch %s\\n" -msgstr "ใใใ %s ใใฏใใใพใ\\n" +msgstr "ใใใ %s ใๅใ่พผใฟใพใ\\n" #: quilt/import.in:176 msgid "Importing patch %s (stored as %s)\\n" @@ -982,9 +981,8 @@ msgstr "" "ใใใ % ใ้ฉ็จใใพใใ (ๅผทๅถ้ฉ็จใใใใใซใใชใใฌใใทใฅใๅฟ
่ฆใงใ)\\n" #: quilt/push.in:226 -#, fuzzy msgid "Patch %s can be reverse-applied\\n" -msgstr "ใใใ %s ใฏใใใงใซ้ฉ็จใใใฆใใพใ\\n" +msgstr "ใใใ %s ใฏใๅ่ปขใใฆ้ฉ็จใใใใจใใงใใพใ\\n" #: quilt/push.in:229 msgid "Patch %s does not apply (enforce with -f)\\n" @@ -1225,9 +1223,8 @@ msgstr "" "seriesใใกใคใซใฎใใใใฏใในใฆ้ฉ็จใใใฆใใพใใๆ็ตใใใใฏ %s ใงใใ\\n" #: quilt/scripts/patchfns.in:577 -#, fuzzy msgid "Patch %s does not exist\\n" -msgstr "ใใใ %s ใฏ seriesใฎไธญใซใใใพใใ\\n" +msgstr "ใใใ %s ใๅญๅจใใพใใ\\n" #: quilt/scripts/patchfns.in:830 msgid "" @@ -1443,23 +1440,3 @@ msgstr "" "็พๅจไฝๆฅญไธญใฎใใชใผใไฝๆใใ quiltใจๅใใใผใธใงใณใฎ quiltใง \\`quilt\n" "pop -a'ใๅฎ่กใใใในใฆใฎใใใใใฏใใใฆใใ ใใใใพใใฏใ%s ใใฃใฌใฏ\n" "ใใชใๅ้คใใๆๅใใใใใใใใฆ็ดใใฆใใ ใใใ\\n" - -#, fuzzy -#~ msgid "Patch s is currently applied\\n" -#~ msgstr "ใใใ %s ใฏ็พๅจ้ฉ็จใใใฆใใพใ\\n" - -#, fuzzy -#~ msgid "Patch %s is not on top\\n" -#~ msgstr "ใใใ %s ใๆไธไฝใซใใพใใ\\n" - -#~ msgid "Patch %s is already applied\\n" -#~ msgstr "ใใใ %s ใฏใใใงใซ้ฉ็จๆธใงใ\\n" - -#~ msgid "Patch is not applied\\n" -#~ msgstr "ใใใใฏ้ฉ็จใใใฆใใพใใ\\n" - -#~ msgid "Patch %s is not in series file\\n" -#~ msgstr "ใใใ %s ใฏ seriesใฎไธญใซใใใพใใ\\n" - -#~ msgid "Patch %s not found in file series\\n" -#~ msgstr "ใใใ %s ใ seriesใใกใคใซๅ
ใง่ฆใคใใใพใใใ\\n" diff --git a/po/quilt.pot b/po/quilt.pot index fa1d2cf..f8b83f9 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -125,18 +125,14 @@ msgstr "" msgid "Patch %s is currently applied\\n" msgstr "" -#: quilt/delete.in:107 -msgid "Removing patch %s failed\\n" +#: quilt/delete.in:107 quilt/delete.in:117 +msgid "Failed to remove patch %s\\n" msgstr "" #: quilt/delete.in:115 msgid "Removed patch %s\\n" msgstr "" -#: quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" -msgstr "" - #: quilt/delete.in:128 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "" @@ -406,7 +402,8 @@ msgid "Appended text to header of patch %s\\n" msgstr "" #: quilt/import.in:22 -msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" +msgid "" +"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" msgstr "" #: quilt/import.in:25 diff --git a/quilt/delete.in b/quilt/delete.in index a2b818f..8710923 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -104,7 +104,7 @@ if is_applied "$patch"; then fi if ! quilt_command pop -fq then - printf $"Removing patch %s failed\n" \ + printf $"Failed to remove patch %s\n" \ "$(print_patch "$patch")" >&2 exit 1 fi diff --git a/quilt/import.in b/quilt/import.in index aeb5d60..545298a 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -19,7 +19,7 @@ fi usage() { - printf $"Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\n" + printf $"Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\n" if [ x$1 = x-h ] then printf $" |