Merge remote-tracking branch 'pootle/master'
commit19178070b652faea2b8091f72f10c700c015a805
authorMichal Čihař <michal@cihar.com>
Sun, 31 Jul 2011 16:58:33 +0000 (31 18:58 +0200)
committerMichal Čihař <michal@cihar.com>
Sun, 31 Jul 2011 16:58:33 +0000 (31 18:58 +0200)
tree1d6a603f65faf4d9ede2db56e98c43b2306e7fe8
parent8824da9ed86eb1f50bb6a972e6c00779b7dda017
parenta4d61b31d6d0b8e20a7ef03a940c4e957312f109
Merge remote-tracking branch 'pootle/master'

Conflicts:
po/de.po
po/el.po
po/en_GB.po
po/fr.po
po/pt_BR.po
po/sv.po
po/tr.po
po/de.po
po/el.po
po/en_GB.po
po/fr.po
po/pt_BR.po
po/sv.po
po/tr.po