Merge remote branch 'origin/master-tx'

Browse source

Conflicts:
	po/cs.po
	po/kn.po
	po/or.po
	po/sr.po
	po/sr@latin.po
	po/te.po
	po/uk.po

...

This commit is contained in:

Lennart Poettering 2009-09-10 01:54:33 +02:00

parent f3879f8f37 4f24a6258a

commit a41c510e42

7 changed files with 1520 additions and 2941 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

780

po/cs.po

View file

File diff suppressed because it is too large Load diff