summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/de.po15
-rw-r--r--po/fr.po20
-rw-r--r--po/ja.po75
-rw-r--r--po/quilt.pot11
4 files changed, 46 insertions, 75 deletions
diff --git a/po/de.po b/po/de.po
index 936c7a1..87ec3e4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -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"
diff --git a/po/fr.po b/po/fr.po
index 030aaf1..556f188 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -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"
diff --git a/po/ja.po b/po/ja.po
index 7279b8d..6365b66 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -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