Merge branch 'master-tx'

Browse source

Conflicts:
	po/ca.po
	po/cs.po
	po/de.po
	po/es.po
	po/pl.po

...

This commit is contained in:

Lennart Poettering 2009-07-23 15:32:33 +02:00

parent 88d5749f6a 0aca5ad3c0

commit 638f9a561e

5 changed files with 536 additions and 747 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

694

po/es.po

View file

File diff suppressed because it is too large Load diff