diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-11-09 20:27:20 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-11-09 20:27:20 +0000 |
| commit | 21259580f688c6a80cf31fb54a280df149dde6b1 (patch) | |
| tree | 53c193e613f429ac60ea6d987f1aea4575d3c5a7 /po | |
| parent | 3bd900bb5ebcfa888a813ed75e808e0db4683452 (diff) | |
| download | nautilus-21259580f688c6a80cf31fb54a280df149dde6b1.tar.gz | |
Fixed the patch so it will apply successfully. Also fixed a small problem
* Makefile.i18npatch: Fixed the patch so it will apply
successfully. Also fixed a small problem that leads to an infinite
loop when building.
* .cvsignore: Ignore the new "headers" file needed to make the
build rules work right.
Diffstat (limited to 'po')
| -rw-r--r-- | po/.cvsignore | 1 | ||||
| -rw-r--r-- | po/ChangeLog | 8 | ||||
| -rw-r--r-- | po/Makefile.i18npatch | 10 |
3 files changed, 14 insertions, 5 deletions
diff --git a/po/.cvsignore b/po/.cvsignore index 27c09646a..0cd43e1ac 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -5,6 +5,7 @@ Makefile.in Makefile.in.in POTFILES cat-id-tbl.c +headers messages nautilus.pot stamp-cat-id diff --git a/po/ChangeLog b/po/ChangeLog index 9c946adb8..0b8e69981 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,11 @@ +2000-11-09 Darin Adler <darin@eazel.com> + + * Makefile.i18npatch: Fixed the patch so it will apply + successfully. Also fixed a small problem that leads to an infinite + loop when building. + * .cvsignore: Ignore the new "headers" file needed to make the + build rules work right. + 2000-11-09 Eric Brayeur <eb@ibelgique.com> * fr.po: Updated French translation. diff --git a/po/Makefile.i18npatch b/po/Makefile.i18npatch index 373ce0420..9bea55042 100644 --- a/po/Makefile.i18npatch +++ b/po/Makefile.i18npatch @@ -1,5 +1,5 @@ ---- Makefile.in.in.clean Sat Oct 28 15:31:52 2000 -+++ Makefile.in.in Sat Oct 28 16:11:18 2000 +--- Makefile.in.in.clean Thu Nov 9 11:09:02 2000 ++++ Makefile.in.in Thu Nov 9 12:21:17 2000 @@ -33,7 +33,9 @@ GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ MSGFMT = @MSGFMT@ @@ -42,9 +42,8 @@ + cp $$lang.po $$lang.old.po; \ echo "$$lang:"; \ - if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ -- rm -f $$lang.old.po; \ + if $(MSGMERGE) $$lang; then \ -+ rm -f $$lang.old.po; \ + rm -f $$lang.old.po; \ else \ echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.po; \ @@ -53,8 +52,9 @@ done -POTFILES: POTFILES.in -+headers: ++headers: POTFILES.in + $(GENHEAD) ++ touch headers + +POTFILES: POTFILES.in headers ( if test 'x$(srcdir)' != 'x.'; then \ |