| commit | bea918de0ffae5f5e740566abf8050b87e16e089 | |
| author | Michal Čihař <michal@cihar.com> | |
| Sat, 14 Aug 2010 19:44:14 +0000 (14 21:44 +0200) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Sat, 14 Aug 2010 19:44:14 +0000 (14 21:44 +0200) | ||
| tree | c2ae3bbcd15bfadd7ef20eba0a00ec531734e775 | treesnapshot (tar.gz zip) |
| parent | bda213a5ac69136a6cf7d96e5ba36d032d718e36 | commitdiff |
| parent | 5bf4d4a948ac177545e9a1d44b3c03dd2801898f | commitdiff |
Merge remote branch 'pootle/master'
Conflicts:
po/en_GB.po
po/fr.po
po/sl.po
po/tr.po
po/zh_CN.po
Conflicts:
po/en_GB.po
po/fr.po
po/sl.po
po/tr.po
po/zh_CN.po
| po/en_GB.po | diff1 | diff2 | blobhistory |
| po/fr.po | diff1 | diff2 | blobhistory |
| po/sl.po | diff1 | diff2 | blobhistory |
| po/tr.po | diff1 | diff2 | blobhistory |
| po/zh_CN.po | diff1 | diff2 | blobhistory |