diff options
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | configure.ac | 13 | ||||
-rw-r--r-- | po/Makefile | 3 | ||||
-rw-r--r-- | po/quilt.pot | 52 | ||||
-rw-r--r-- | quilt/pop.in | 4 | ||||
-rwxr-xr-x | scripts/rpatch.in | 2 |
6 files changed, 24 insertions, 56 deletions
diff --git a/Makefile.in b/Makefile.in index f395e19..a3e2148 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,9 +43,6 @@ DIRT += $(BIN_IN:%=bin/%) QUILT_IN := add applied delete diff files import new next patches \ pop previous push refresh remove series setup top unapplied -ifneq "$(GUIDIFF)" "" -QUILT_IN += guidiff -endif QUILT_SRC := $(QUILT_IN:%=%.in) QUILT := $(QUILT_IN) @@ -75,6 +72,9 @@ DEBIAN := changelog control copyright docs prerm rules SRC += $(DEBIAN:%=debian/%) +PO := Makefile fr.po quilt.pot +SRC += $(PO:%=po/%) + #----------------------------------------------------------------------- all : scripts diff --git a/configure.ac b/configure.ac index 237fa71..f90d2b6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.22],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.4 $) +AC_REVISION ($Revision: 1.5 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -122,17 +122,6 @@ else AC_MSG_RESULT(yes) fi -# Allow to specify a GUI diff utility used by `quilt guidiff' -AC_ARG_WITH(guidiff, AC_HELP_STRING( - [--with-guidiff], [name of a GUI diff utility (default: none)]), - [ - GUIDIFF="$withval" - AC_MSG_NOTICE([Using guidiff executable $GUIDIFF]) - ],[ - GUIDIFF="" - ]) -AC_SUBST(GUIDIFF) - AC_CONFIG_FILES(Makefile) AC_OUTPUT 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 diff --git a/quilt/pop.in b/quilt/pop.in index 06b4455..6e3f627 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -186,9 +186,9 @@ done if [ -z "$(top_patch)" ] then - echo "No patches applied" + echo $"No patches applied" else - echo "Now at patch $patch" + echo $"Now at patch $patch" fi ### Local Variables: ### mode: shell-script diff --git a/scripts/rpatch.in b/scripts/rpatch.in index a8b9c8b..9c087f8 100755 --- a/scripts/rpatch.in +++ b/scripts/rpatch.in @@ -141,7 +141,7 @@ rpatch() return 0 fi - echo "Removing $patch" + echo $"Removing $patch" trap "" SIGINT if [ -n "$opt_force" ] || \ ( [ -z "$opt_remove" ] && ! files_may_have_changed $patch ) |