| commit | a4305a2672789deebba9d21a887796be47f31542 | |
| author | Michal Čihař <michal@cihar.com> | |
| Wed, 17 Aug 2011 06:31:08 +0000 (17 08:31 +0200) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Wed, 17 Aug 2011 06:31:08 +0000 (17 08:31 +0200) | ||
| tree | 9b65a78954b6d1d15427d69064a0544fa8fe2201 | treesnapshot (tar.gz zip) |
| parent | cbca7757387adb91e77a61c3bf673b3d0692d482 | commitdiff |
| parent | ad4b3828297ed00c6612aa72113e5d373dd4d284 | commitdiff |
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/es.po
po/ja.po
po/sl.po
po/tr.po
Conflicts:
po/es.po
po/ja.po
po/sl.po
po/tr.po
| po/es.po | diff1 | diff2 | blobhistory |
| po/ja.po | diff1 | diff2 | blobhistory |
| po/sl.po | diff1 | diff2 | blobhistory |
| po/tr.po | diff1 | diff2 | blobhistory |