| commit | db29cfa25827fd6ef65198a8fc338d5c0a2238b9 | |
| author | Michal Čihař <michal@cihar.com> | |
| Tue, 11 Oct 2011 06:46:22 +0000 (11 08:46 +0200) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Tue, 11 Oct 2011 06:46:22 +0000 (11 08:46 +0200) | ||
| tree | 712edca0c0bed92263f93fca6aad21834c8c94b5 | treesnapshot (tar.gz zip) |
| parent | 9d0c410b3667b65438b0cc07c224f2cf0fde24f6 | commitdiff |
| parent | 98745585488a16e4f1fa20df4d95ce3f21760b09 | commitdiff |
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/el.po
po/es.po
po/sl.po
po/sv.po
po/tr.po
Conflicts:
po/el.po
po/es.po
po/sl.po
po/sv.po
po/tr.po
| po/el.po | diff1 | diff2 | blobhistory |
| po/es.po | diff1 | diff2 | blobhistory |
| po/sl.po | diff1 | diff2 | blobhistory |
| po/sv.po | diff1 | diff2 | blobhistory |
| po/tr.po | diff1 | diff2 | blobhistory |