callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove leftover CVS conflict indicator lines (>>>>>>>).

Browse Source 
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.
This commit is contained in:
Tor Lillqvist
2000-10-15 17:17:10 +00:00
committed by Tor Lillqvist
parent 194d5dbd3f
commit 3cd1330d6e
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
po/ChangeLog
View File

@ -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.

14
po/makefile.mingw
View File

@ -68,6 +68,10 @@ et.utf8: et.po
eu.utf8: eu.po
iconv -f ISO-8859-1 -t UTF-8 eu.po >$@
# Farsi is already in UTF-8.
fa.utf8: fa.po
cp fa.po fa.utf8
fi.utf8: fi.po
iconv -f ISO-8859-1 -t UTF-8 fi.po >$@
@ -80,6 +84,10 @@ ga.utf8: ga.po
gl.utf8: gl.po
iconv -f ISO-8859-1 -t UTF-8 gl.po >$@
# Hebrew is already in UTF-8.
he.utf8: he.po
cp he.po he.utf8
hr.utf8: hr.po
iconv -f ISO-8859-2 -t UTF-8 hr.po >$@
@ -128,6 +136,12 @@ sl.utf8: sl.po
sv.utf8: sv.po
iconv -f ISO-8859-1 -t UTF-8 sv.po >$@
sp.utf8: sp.po
iconv -f ISO-8859-5 -t UTF-8 sp.po >$@
sr.utf8: sr.po
iconv -f ISO-8859-2 -t UTF-8 sr.po >$@
uk.utf8: uk.po
iconv -f KOI8-U -t UTF-8 uk.po >$@