Merge commit 'origin/master-tx'

Browse source

Conflicts:
	po/pl.po
	po/pt.po
	po/pt_BR.po

...

This commit is contained in:

Lennart Poettering 2009-08-05 15:08:29 +02:00

parent 8483de4f2b 19f2ffba49

commit 42f92a8087

3 changed files with 1068 additions and 1385 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

1284

po/pt_BR.po

View file

File diff suppressed because it is too large Load diff