diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-10-15 17:17:10 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-10-15 17:17:10 +0000 |
| commit | 3cd1330d6e97dc7a7aaa6d49f27062af28171dbc (patch) | |
| tree | a14a7c471f8f48e916d0b37adb54d8872500339b /po/ChangeLog | |
| parent | 194d5dbd3f865ae614d6ee46d23e3027c769be5d (diff) | |
| download | gtk+-3cd1330d6e97dc7a7aaa6d49f27062af28171dbc.tar.gz | |
Remove leftover CVS conflict indicator lines (>>>>>>>).
2000-10-15 Tor Lillqvist <tml@iki.fi>
* ChangeLog: Remove leftover CVS conflict indicator lines (>>>>>>>).
* makefile.mingw: Add rules for fa, he, sp and sr.
Diffstat (limited to 'po/ChangeLog')
| -rw-r--r-- | po/ChangeLog | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index 226dc9f676..f1d4774c64 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,9 @@ +2000-10-15 Tor Lillqvist <tml@iki.fi> + + * ChangeLog: Remove leftover CVS conflict indicator lines (>>>>>>>). + + * makefile.mingw: Add rules for fa, he, sp and sr. + 2000-10-14 Robert Brady <robert@suse.co.uk> * fa.po: Added Persian translation from Roozbeh Pournader @@ -122,7 +128,6 @@ 2000-03-13 Pablo Saratxaga <pablo@mandrakesoft.com> * lt.po: Updated Lithuanian file ->>>>>>> 1.71 2000-02-26 Christopher R. Gabriel <cgabriel@firenze.linux.it> * it.po: Updated italian translation. @@ -155,7 +160,6 @@ * tr.po: Added the Turkish translation , edited ../configure.in & makefile.cygwin . ->>>>>>> 1.48 1999-10-31 Tor Lillqvist <tml@iki.fi> * makefile.cygwin: New file for building the message catalogs on @@ -164,7 +168,6 @@ to UTF-8 in two passes using the useful native2ascii tool from the JDK. ->>>>>>> 1.40 1999-10-06 Stanislav Brabec <utx@penguin.cz> * cs.po: Updated. @@ -196,7 +199,6 @@ * et.po: Added Estonian language file from Lauris Kaplinski <lauris@ariman.ee> ->>>>>>> 1.39 1999-09-03 Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl> * pl.po: Updated translation. |