| commit | ab4c24c30eb49f0a5ef1a8f96169091f834824d1 | |
| author | Michal Čihař <michal@cihar.com> | |
| Fri, 12 Aug 2011 10:15:05 +0000 (12 12:15 +0200) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Fri, 12 Aug 2011 10:15:05 +0000 (12 12:15 +0200) | ||
| tree | 7215ce6e79913d291300fb7e9ea1f5afdb0fdc4a | treesnapshot (tar.gz zip) |
| parent | 45aac8dbf4e87b12ba3c2809c49ce250161afabf | commitdiff |
| parent | 2afed039467fe16b40792bf3fd9d943090bd5dbe | commitdiff |
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/ja.po
po/sl.po
po/tr.po
Conflicts:
po/ja.po
po/sl.po
po/tr.po
| po/ja.po | diff1 | diff2 | blobhistory |
| po/sl.po | diff1 | diff2 | blobhistory |
| po/tr.po | diff1 | diff2 | blobhistory |