diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/Makefile | 2 | ||||
| -rw-r--r-- | po/de.po | 132 | ||||
| -rw-r--r-- | po/fr.po | 136 | ||||
| -rw-r--r-- | po/ja.po | 134 | ||||
| -rw-r--r-- | po/quilt.pot | 111 |
5 files changed, 249 insertions, 266 deletions
diff --git a/po/Makefile b/po/Makefile index f18dcda..667765a 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,7 +1,7 @@ QUILT_IN := add applied delete diff files import new next patches \ pop previous push refresh remove series setup top unapplied \ fold fork snapshot edit upgrade -SCRIPTS_IN := apatch rpatch patchfns inspect patchfns +SCRIPTS_IN := patchfns inspect patchfns # scripts/parse-patch is perl based # LINGUAS = ... @@ -66,20 +66,20 @@ msgstr "" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 #: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:129 ../quilt/previous.in:62 ../quilt/push.in:145 +#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:150 +#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143 +#: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -248,7 +248,7 @@ msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" msgid "Cannot change into directory %s\\n" msgstr "Kann nicht in Verzeichnis %s wechseln\\n" -#: ../quilt/diff.in:318 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" @@ -256,7 +256,7 @@ msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" msgid "Cannot change to temporary directory\\n" msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" -#: ../quilt/diff.in:348 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" @@ -557,15 +557,25 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: ../quilt/pop.in:160 +#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" +msgstr "" +"Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen " +"erzwingen mit -f)\\n" + +#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +msgid "Removing patch %s\\n" +msgstr "Entferne patch %s\\n" + +#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +msgid "Patch %s needs to be refreshed first.\\n" +msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" + +#: ../quilt/pop.in:270 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: ../quilt/pop.in:176 ../quilt/push.in:212 -msgid "Interrupted by user\\n" -msgstr "Unterbrechung durch Benutzer\\n" - -#: ../quilt/pop.in:192 ../quilt/push.in:223 +#: ../quilt/pop.in:293 ../quilt/push.in:321 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -637,25 +647,43 @@ msgstr "" "\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n" "\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n" -#: ../quilt/push.in:87 +#: ../quilt/push.in:59 ../scripts/apatch.in:29 +msgid "Interrupted by user; patch %s was not applied.\\n" +msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" + +#: ../quilt/push.in:71 ../scripts/apatch.in:41 +msgid "Patch %s appears to be empty\\n" +msgstr "Patch %s scheint leer zu sein\\n" + +#: ../quilt/push.in:109 ../scripts/apatch.in:79 +msgid "Applying patch %s\\n" +msgstr "Wende Patch %s an\\n" + +#: ../quilt/push.in:159 ../scripts/apatch.in:130 +msgid "Patch %s appears to be empty, applied\\n" +msgstr "Patch %s scheint leer zu sein, angewandt\\n" + +#: ../quilt/push.in:163 ../scripts/apatch.in:134 +msgid "Applied patch %s (forced; needs refresh)\\n" +msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n" + +#: ../quilt/push.in:168 ../scripts/apatch.in:139 +msgid "Patch %s does not apply (enforce with -f)\\n" +msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n" + +#: ../quilt/push.in:207 msgid "Patch %s not found in file series\\n" msgstr "Patch %s nicht in series-Datei gefunden\\n" -#: ../quilt/push.in:168 +#: ../quilt/push.in:282 msgid "Patch %s is already applied\\n" msgstr "Patch %s ist bereits angewandt\\n" -#: ../quilt/push.in:187 -msgid "" -"The topmost patch %s is not in the series file anymore;\n" -"cannot determine the next patch from the series file.\n" -"Please pop -f the top patch and check your series file.\\n" -msgstr "" -"Der oberste Patch $top ist nicht mehr in der series-Datei;\n" -"kann den nächsten Patch nicht ermitteln. Bitte entfernen Sie\n" -"mit pop -f den obersten Patch, und überprüfen Sie die series-Datei.\\n" +#: ../quilt/push.in:291 ../scripts/apatch.in:197 +msgid "The topmost patch %s needs to be refreshed first.\\n" +msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: ../quilt/push.in:193 +#: ../quilt/push.in:305 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" @@ -958,35 +986,7 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname\\n" msgstr "Verwendung: $0 [-fqv] patchname\\n" -#: ../scripts/apatch.in:29 -msgid "Interrupted by user; patch %s was not applied.\\n" -msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" - -#: ../scripts/apatch.in:41 -msgid "Patch %s appears to be empty\\n" -msgstr "Patch %s scheint leer zu sein\\n" - -#: ../scripts/apatch.in:81 -msgid "Applying patch %s\\n" -msgstr "Wende Patch %s an\\n" - -#: ../scripts/apatch.in:117 -msgid "Patch %s appears to be empty, applied\\n" -msgstr "Patch %s scheint leer zu sein, angewandt\\n" - -#: ../scripts/apatch.in:121 -msgid "Applied patch %s (forced; needs refresh)\\n" -msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n" - -#: ../scripts/apatch.in:126 -msgid "Patch %s does not apply (enforce with -f)\\n" -msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n" - -#: ../scripts/apatch.in:184 -msgid "The topmost patch %s needs to be refreshed first.\\n" -msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" - -#: ../scripts/patchfns.in:702 +#: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -999,7 +999,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: ../scripts/patchfns.in:769 +#: ../scripts/patchfns.in:770 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1011,16 +1011,14 @@ msgstr "" msgid "Usage: %s [-fRq] patchname\\n" msgstr "Verwendung: %s [-fRq] patchname\\n" -#: ../scripts/rpatch.in:100 -msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" -msgstr "" -"Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen " -"erzwingen mit -f)\\n" - -#: ../scripts/rpatch.in:123 -msgid "Removing patch %s\\n" -msgstr "Entferne patch %s\\n" - -#: ../scripts/rpatch.in:179 -msgid "Patch %s needs to be refreshed first.\\n" -msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" +#~ msgid "Interrupted by user\\n" +#~ msgstr "Unterbrechung durch Benutzer\\n" + +#~ msgid "" +#~ "The topmost patch %s is not in the series file anymore;\n" +#~ "cannot determine the next patch from the series file.\n" +#~ "Please pop -f the top patch and check your series file.\\n" +#~ msgstr "" +#~ "Der oberste Patch $top ist nicht mehr in der series-Datei;\n" +#~ "kann den nächsten Patch nicht ermitteln. Bitte entfernen Sie\n" +#~ "mit pop -f den obersten Patch, und überprüfen Sie die series-Datei.\\n" @@ -68,20 +68,20 @@ msgstr "" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 #: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:129 ../quilt/previous.in:62 ../quilt/push.in:145 +#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:150 +#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143 +#: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" @@ -257,7 +257,7 @@ msgstr "Le patch %s n'est pas appliqu avant %s\\n." msgid "Cannot change into directory %s\\n" msgstr "Impossible d'entrer dans le rpertoire %s\\n" -#: ../quilt/diff.in:318 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" @@ -265,7 +265,7 @@ msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" msgid "Cannot change to temporary directory\\n" msgstr "Impossible d'entrer dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:348 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" @@ -571,15 +571,25 @@ msgstr "" "\n" "-v\tOpre verbeusement.\n" -#: ../quilt/pop.in:160 +#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" +msgstr "" +"Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" +"\\n" + +#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +msgid "Removing patch %s\\n" +msgstr "Retrait de %s\\n" + +#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +msgid "Patch %s needs to be refreshed first.\\n" +msgstr "Le patch %s doit tre rafraichi au pralable.\\n" + +#: ../quilt/pop.in:270 msgid "No patch removed\\n" msgstr "Aucun patch retir\\n" -#: ../quilt/pop.in:176 ../quilt/push.in:212 -msgid "Interrupted by user\\n" -msgstr "Interrompu par l'utilisateur\\n" - -#: ../quilt/pop.in:192 ../quilt/push.in:223 +#: ../quilt/pop.in:293 ../quilt/push.in:321 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -657,26 +667,44 @@ msgstr "" "\tSi cette option n'est pas donne, l'option -f sera passe au \n" "\tprogramme patch.\n" -#: ../quilt/push.in:87 +#: ../quilt/push.in:59 ../scripts/apatch.in:29 +msgid "Interrupted by user; patch %s was not applied.\\n" +msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas t appliqu.\\n" + +#: ../quilt/push.in:71 ../scripts/apatch.in:41 +msgid "Patch %s appears to be empty\\n" +msgstr "Le patch %s semble vide.\\n" + +#: ../quilt/push.in:109 ../scripts/apatch.in:79 +msgid "Applying patch %s\\n" +msgstr "Application de %s\\n" + +#: ../quilt/push.in:159 ../scripts/apatch.in:130 +msgid "Patch %s appears to be empty, applied\\n" +msgstr "Le patch %s semble vide. Il a t appliqu.\\n" + +#: ../quilt/push.in:163 ../scripts/apatch.in:134 +msgid "Applied patch %s (forced; needs refresh)\\n" +msgstr "%s a t appliqu (forc ; vous devriez le rafrachir)\\n" + +#: ../quilt/push.in:168 ../scripts/apatch.in:139 +msgid "Patch %s does not apply (enforce with -f)\\n" +msgstr "" +"Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n" + +#: ../quilt/push.in:207 msgid "Patch %s not found in file series\\n" msgstr "Le patch %s est introuvable dans le fichier de srie\\n" -#: ../quilt/push.in:168 +#: ../quilt/push.in:282 msgid "Patch %s is already applied\\n" msgstr "Le patch %s est dj appliqu.\\n" -#: ../quilt/push.in:187 -msgid "" -"The topmost patch %s is not in the series file anymore;\n" -"cannot determine the next patch from the series file.\n" -"Please pop -f the top patch and check your series file.\\n" -msgstr "" -"Le patch du sommet %s n'apparait plus dans la srie;\n" -"Impossible de dterminer le prochain patch de la srie.\n" -"Veuillez utiliser pop -f pour le patch du sommet, et vrifier \n" -"votre fichier de srie.\\n" +#: ../quilt/push.in:291 ../scripts/apatch.in:197 +msgid "The topmost patch %s needs to be refreshed first.\\n" +msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n" -#: ../quilt/push.in:193 +#: ../quilt/push.in:305 msgid "File series fully applied, ends at patch %s\\n" msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" @@ -979,36 +1007,7 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname\\n" msgstr "Usage : $0 [-fqv] patchname\\n" -#: ../scripts/apatch.in:29 -msgid "Interrupted by user; patch %s was not applied.\\n" -msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas t appliqu.\\n" - -#: ../scripts/apatch.in:41 -msgid "Patch %s appears to be empty\\n" -msgstr "Le patch %s semble vide.\\n" - -#: ../scripts/apatch.in:81 -msgid "Applying patch %s\\n" -msgstr "Application de %s\\n" - -#: ../scripts/apatch.in:117 -msgid "Patch %s appears to be empty, applied\\n" -msgstr "Le patch %s semble vide. Il a t appliqu.\\n" - -#: ../scripts/apatch.in:121 -msgid "Applied patch %s (forced; needs refresh)\\n" -msgstr "%s a t appliqu (forc ; vous devriez le rafrachir)\\n" - -#: ../scripts/apatch.in:126 -msgid "Patch %s does not apply (enforce with -f)\\n" -msgstr "" -"Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n" - -#: ../scripts/apatch.in:184 -msgid "The topmost patch %s needs to be refreshed first.\\n" -msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n" - -#: ../scripts/patchfns.in:702 +#: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1020,7 +1019,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: ../scripts/patchfns.in:769 +#: ../scripts/patchfns.in:770 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1032,16 +1031,15 @@ msgstr "" msgid "Usage: %s [-fRq] patchname\\n" msgstr "Usage: %s [-fRq] nom_de_patch\\n" -#: ../scripts/rpatch.in:100 -msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" -msgstr "" -"Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" -"\\n" - -#: ../scripts/rpatch.in:123 -msgid "Removing patch %s\\n" -msgstr "Retrait de %s\\n" - -#: ../scripts/rpatch.in:179 -msgid "Patch %s needs to be refreshed first.\\n" -msgstr "Le patch %s doit tre rafraichi au pralable.\\n" +#~ msgid "Interrupted by user\\n" +#~ msgstr "Interrompu par l'utilisateur\\n" + +#~ msgid "" +#~ "The topmost patch %s is not in the series file anymore;\n" +#~ "cannot determine the next patch from the series file.\n" +#~ "Please pop -f the top patch and check your series file.\\n" +#~ msgstr "" +#~ "Le patch du sommet %s n'apparait plus dans la srie;\n" +#~ "Impossible de dterminer le prochain patch de la srie.\n" +#~ "Veuillez utiliser pop -f pour le patch du sommet, et vrifier \n" +#~ "votre fichier de srie.\\n" @@ -66,20 +66,20 @@ msgstr "" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 #: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:129 ../quilt/previous.in:62 ../quilt/push.in:145 +#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:150 +#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143 +#: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -243,7 +243,7 @@ msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" msgid "Cannot change into directory %s\\n" msgstr "ディレクトリ %s に移動できません\\n" -#: ../quilt/diff.in:318 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" @@ -251,7 +251,7 @@ msgstr "テンポラリディレクトリへのファイルコピーに失敗し msgid "Cannot change to temporary directory\\n" msgstr "テンポラリディレクトリに移動できません\\n" -#: ../quilt/diff.in:348 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" @@ -548,15 +548,25 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: ../quilt/pop.in:160 +#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" +msgstr "" +"パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" +"けてはずしてください)\\n" + +#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +msgid "Removing patch %s\\n" +msgstr "パッチ %s を削除します\\n" + +#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +msgid "Patch %s needs to be refreshed first.\\n" +msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" + +#: ../quilt/pop.in:270 msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: ../quilt/pop.in:176 ../quilt/push.in:212 -msgid "Interrupted by user\\n" -msgstr "ユーザによって中断されました\\n" - -#: ../quilt/pop.in:192 ../quilt/push.in:223 +#: ../quilt/pop.in:293 ../quilt/push.in:321 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です" @@ -625,25 +635,44 @@ msgstr "" "\tまま残す。\n" "\n" -#: ../quilt/push.in:87 +#: ../quilt/push.in:59 ../scripts/apatch.in:29 +msgid "Interrupted by user; patch %s was not applied.\\n" +msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n" + +#: ../quilt/push.in:71 ../scripts/apatch.in:41 +msgid "Patch %s appears to be empty\\n" +msgstr "パッチ %sは、空のようです\\n" + +#: ../quilt/push.in:109 ../scripts/apatch.in:79 +msgid "Applying patch %s\\n" +msgstr "パッチ %s を適用しています\\n" + +#: ../quilt/push.in:159 ../scripts/apatch.in:130 +msgid "Patch %s appears to be empty, applied\\n" +msgstr "パッチ %s は、空のようですが、適用しました\\n" + +#: ../quilt/push.in:163 ../scripts/apatch.in:134 +msgid "Applied patch %s (forced; needs refresh)\\n" +msgstr "" +"パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" + +#: ../quilt/push.in:168 ../scripts/apatch.in:139 +msgid "Patch %s does not apply (enforce with -f)\\n" +msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" + +#: ../quilt/push.in:207 msgid "Patch %s not found in file series\\n" msgstr "パッチ %s が seriesファイル内で見つかりません。\\n" -#: ../quilt/push.in:168 +#: ../quilt/push.in:282 msgid "Patch %s is already applied\\n" msgstr "パッチ %s は、すでに適用済です\\n" -#: ../quilt/push.in:187 -msgid "" -"The topmost patch %s is not in the series file anymore;\n" -"cannot determine the next patch from the series file.\n" -"Please pop -f the top patch and check your series file.\\n" -msgstr "" -"最上位パッチが seriesファイルの中にないため、次のパッチを seriesファイ\n" -"ルから選択することができません。pop -fを行ない、seriesファイルをチェッ\n" -"クしてください。\\n" +#: ../quilt/push.in:291 ../scripts/apatch.in:197 +msgid "The topmost patch %s needs to be refreshed first.\\n" +msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" -#: ../quilt/push.in:193 +#: ../quilt/push.in:305 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。\n" @@ -942,36 +971,7 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname\\n" msgstr "使い方: $0 [-fqv] パッチ名\\n" -#: ../scripts/apatch.in:29 -msgid "Interrupted by user; patch %s was not applied.\\n" -msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n" - -#: ../scripts/apatch.in:41 -msgid "Patch %s appears to be empty\\n" -msgstr "パッチ %sは、空のようです\\n" - -#: ../scripts/apatch.in:81 -msgid "Applying patch %s\\n" -msgstr "パッチ %s を適用しています\\n" - -#: ../scripts/apatch.in:117 -msgid "Patch %s appears to be empty, applied\\n" -msgstr "パッチ %s は、空のようですが、適用しました\\n" - -#: ../scripts/apatch.in:121 -msgid "Applied patch %s (forced; needs refresh)\\n" -msgstr "" -"パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" - -#: ../scripts/apatch.in:126 -msgid "Patch %s does not apply (enforce with -f)\\n" -msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" - -#: ../scripts/apatch.in:184 -msgid "The topmost patch %s needs to be refreshed first.\\n" -msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" - -#: ../scripts/patchfns.in:702 +#: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -983,7 +983,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: ../scripts/patchfns.in:769 +#: ../scripts/patchfns.in:770 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -995,16 +995,14 @@ msgstr "" msgid "Usage: %s [-fRq] patchname\\n" msgstr "使い方: %s [-fRq] パッチ名\\n" -#: ../scripts/rpatch.in:100 -msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" -msgstr "" -"パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" -"けてはずしてください)\\n" - -#: ../scripts/rpatch.in:123 -msgid "Removing patch %s\\n" -msgstr "パッチ %s を削除します\\n" - -#: ../scripts/rpatch.in:179 -msgid "Patch %s needs to be refreshed first.\\n" -msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" +#~ msgid "Interrupted by user\\n" +#~ msgstr "ユーザによって中断されました\\n" + +#~ msgid "" +#~ "The topmost patch %s is not in the series file anymore;\n" +#~ "cannot determine the next patch from the series file.\n" +#~ "Please pop -f the top patch and check your series file.\\n" +#~ msgstr "" +#~ "最上位パッチが seriesファイルの中にないため、次のパッチを seriesファイ\n" +#~ "ルから選択することができません。pop -fを行ない、seriesファイルをチェッ\n" +#~ "クしてください。\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 874f7e4..3d5c429 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -36,20 +36,20 @@ msgstr "" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 #: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:129 ../quilt/previous.in:62 ../quilt/push.in:145 +#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:265 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:150 +#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "" #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221 -#: ../quilt/refresh.in:143 ../quilt/remove.in:81 +#: ../quilt/pop.in:286 ../quilt/push.in:303 ../quilt/refresh.in:143 +#: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "" @@ -168,7 +168,7 @@ msgstr "" msgid "Cannot change into directory %s\\n" msgstr "" -#: ../quilt/diff.in:318 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:318 ../quilt/pop.in:115 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory\\n" msgstr "" @@ -176,7 +176,7 @@ msgstr "" msgid "Cannot change to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:348 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:348 ../quilt/pop.in:138 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files\\n" msgstr "" @@ -401,15 +401,23 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: ../quilt/pop.in:160 -msgid "No patch removed\\n" +#: ../quilt/pop.in:153 ../scripts/rpatch.in:100 +msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" +msgstr "" + +#: ../quilt/pop.in:176 ../scripts/rpatch.in:123 +msgid "Removing patch %s\\n" msgstr "" -#: ../quilt/pop.in:176 ../quilt/push.in:212 -msgid "Interrupted by user\\n" +#: ../quilt/pop.in:260 ../scripts/rpatch.in:179 +msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: ../quilt/pop.in:192 ../quilt/push.in:223 +#: ../quilt/pop.in:270 +msgid "No patch removed\\n" +msgstr "" + +#: ../quilt/pop.in:293 ../quilt/push.in:321 msgid "Now at patch %s\\n" msgstr "" @@ -456,22 +464,43 @@ msgid "" "\tpatch program.\n" msgstr "" -#: ../quilt/push.in:87 +#: ../quilt/push.in:59 ../scripts/apatch.in:29 +msgid "Interrupted by user; patch %s was not applied.\\n" +msgstr "" + +#: ../quilt/push.in:71 ../scripts/apatch.in:41 +msgid "Patch %s appears to be empty\\n" +msgstr "" + +#: ../quilt/push.in:109 ../scripts/apatch.in:79 +msgid "Applying patch %s\\n" +msgstr "" + +#: ../quilt/push.in:159 ../scripts/apatch.in:130 +msgid "Patch %s appears to be empty, applied\\n" +msgstr "" + +#: ../quilt/push.in:163 ../scripts/apatch.in:134 +msgid "Applied patch %s (forced; needs refresh)\\n" +msgstr "" + +#: ../quilt/push.in:168 ../scripts/apatch.in:139 +msgid "Patch %s does not apply (enforce with -f)\\n" +msgstr "" + +#: ../quilt/push.in:207 msgid "Patch %s not found in file series\\n" msgstr "" -#: ../quilt/push.in:168 +#: ../quilt/push.in:282 msgid "Patch %s is already applied\\n" msgstr "" -#: ../quilt/push.in:187 -msgid "" -"The topmost patch %s is not in the series file anymore;\n" -"cannot determine the next patch from the series file.\n" -"Please pop -f the top patch and check your series file.\\n" +#: ../quilt/push.in:291 ../scripts/apatch.in:197 +msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" -#: ../quilt/push.in:193 +#: ../quilt/push.in:305 msgid "File series fully applied, ends at patch %s\\n" msgstr "" @@ -687,35 +716,7 @@ msgstr "" msgid "Usage: $0 [-fqv] patchname\\n" msgstr "" -#: ../scripts/apatch.in:29 -msgid "Interrupted by user; patch %s was not applied.\\n" -msgstr "" - -#: ../scripts/apatch.in:41 -msgid "Patch %s appears to be empty\\n" -msgstr "" - -#: ../scripts/apatch.in:81 -msgid "Applying patch %s\\n" -msgstr "" - -#: ../scripts/apatch.in:117 -msgid "Patch %s appears to be empty, applied\\n" -msgstr "" - -#: ../scripts/apatch.in:121 -msgid "Applied patch %s (forced; needs refresh)\\n" -msgstr "" - -#: ../scripts/apatch.in:126 -msgid "Patch %s does not apply (enforce with -f)\\n" -msgstr "" - -#: ../scripts/apatch.in:184 -msgid "The topmost patch %s needs to be refreshed first.\\n" -msgstr "" - -#: ../scripts/patchfns.in:702 +#: ../scripts/patchfns.in:703 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -723,7 +724,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: ../scripts/patchfns.in:769 +#: ../scripts/patchfns.in:770 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -732,15 +733,3 @@ msgstr "" #: ../scripts/rpatch.in:22 msgid "Usage: %s [-fRq] patchname\\n" msgstr "" - -#: ../scripts/rpatch.in:100 -msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" -msgstr "" - -#: ../scripts/rpatch.in:123 -msgid "Removing patch %s\\n" -msgstr "" - -#: ../scripts/rpatch.in:179 -msgid "Patch %s needs to be refreshed first.\\n" -msgstr "" |