diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-02-14 14:52:18 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-02-14 14:52:18 +0000 |
| commit | 48882db70f5bb0dec0857d059238039654d28a2f (patch) | |
| tree | 52c913cf9ad7469853433e135d6c0a7dd2cd9b09 /po | |
| parent | 3c496a4753ad51a1592fdc5792aff652081db00d (diff) | |
| download | quilt-48882db70f5bb0dec0857d059238039654d28a2f.tar.gz | |
Remove guidiff leftovers, minor I18N fixes
Diffstat (limited to 'po')
| -rw-r--r-- | po/Makefile | 3 | ||||
| -rw-r--r-- | po/quilt.pot | 52 |
2 files changed, 17 insertions, 38 deletions
diff --git a/po/Makefile b/po/Makefile index 3e10c82..fd880c4 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,6 +1,5 @@ QUILT_IN := add applied delete diff files import new next patches \ - pop previous push refresh remove series setup top unapplied \ - guidiff + pop previous push refresh remove series setup top unapplied SCRIPTS_IN := apatch rpatch patchfns spec2series patchfns # scripts/parse-patch is perl based diff --git a/po/quilt.pot b/po/quilt.pot index 013877f..1ce4a37 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -28,7 +28,7 @@ msgid "" msgstr "" #: ../quilt/add.in:76 ../quilt/delete.in:69 ../quilt/files.in:75 -#: ../quilt/guidiff.in:65 ../quilt/push.in:167 ../quilt/remove.in:76 +#: ../quilt/push.in:167 ../quilt/remove.in:76 msgid "No patch applied" msgstr "" @@ -201,26 +201,6 @@ msgstr "" msgid "Patch is not applied" msgstr "" -#: ../quilt/guidiff.in:22 -msgid "Usage: quilt guidiff" -msgstr "" - -#: ../quilt/guidiff.in:26 -msgid "" -"\n" -"\n" -"Display in $guidiffname the changes to files in the topmost patch.\n" -"\n" -msgstr "" - -#: ../quilt/guidiff.in:79 -msgid "The file $file doesn't exist before this patch" -msgstr "" - -#: ../quilt/guidiff.in:83 -msgid "No file in patch $patch" -msgstr "" - #: ../quilt/import.in:22 msgid "Usage: quilt import [-f] [-p num] [-n patch] [patchfile]" msgstr "" @@ -400,6 +380,14 @@ msgstr "" msgid "Interrupted by user" msgstr "" +#: ../quilt/pop.in:189 +msgid "No patches applied" +msgstr "" + +#: ../quilt/pop.in:191 +msgid "Now at patch $patch" +msgstr "" + #: ../quilt/previous.in:22 msgid "Usage: quilt previous [patch]" msgstr "" @@ -653,7 +641,7 @@ msgstr "" msgid "Patch $patch does not apply (enforce with -f)" msgstr "" -#: ../scripts/apatch.in:181 ../scripts/rpatch.in:246 +#: ../scripts/apatch.in:181 ../scripts/rpatch.in:238 msgid "The topmost patch $top needs to be refreshed first." msgstr "" @@ -673,24 +661,16 @@ msgstr "" msgid "Patch $patch appears to be empty, removed" msgstr "" -#: ../scripts/rpatch.in:164 -msgid "Failed to create temporary files" -msgstr "" - -#: ../scripts/rpatch.in:185 -msgid "Patch $patch does not remove (enforce with -f)" -msgstr "" - -#: ../scripts/rpatch.in:194 -msgid "no patch applied" +#: ../scripts/rpatch.in:144 +msgid "Removing $patch" msgstr "" -#: ../scripts/rpatch.in:196 -msgid "now at $top" +#: ../scripts/rpatch.in:165 +msgid "Failed to create temporary files" msgstr "" -#: ../scripts/rpatch.in:198 -msgid "Removed $patch, $where" +#: ../scripts/rpatch.in:186 +msgid "Patch $patch does not remove (enforce with -f)" msgstr "" #: ../scripts/spec2series.in:100 ../scripts/spec2series.in:192 |