Merge remote-tracking branch 'pootle/master'
commit2360d197229c42feb1fb26c17936598eef34868c
authorMichal Čihař <mcihar@suse.cz>
Tue, 27 Sep 2011 06:55:55 +0000 (27 08:55 +0200)
committerMichal Čihař <mcihar@suse.cz>
Tue, 27 Sep 2011 06:55:55 +0000 (27 08:55 +0200)
tree5185e083624a1a11c0337b6e6a7fa24649c07718
parent4ba58c71d51cdc2c3863a3aad867c28228977914
parent17598074139cb1c492b4318992b6ce5e2edba5aa
Merge remote-tracking branch 'pootle/master'

Conflicts:
po/ar.po
po/da.po
po/el.po
po/en_GB.po
po/fr.po
po/it.po
po/ja.po
po/ko.po
po/ml.po
po/ru.po
po/sl.po
po/ar.po
po/da.po
po/el.po
po/en_GB.po
po/fr.po
po/it.po
po/ja.po
po/ko.po
po/ml.po
po/ru.po
po/sl.po