Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
translate new strings
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added sync network translation
Merge pull request #213 from MaDill/master

added sync network translation
beta has gone
Merge branch 'master' of github.com:geometer/FBReaderJ
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography