fixed string resources in dialog preferences
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
Update ja.xml

Consistent translation: "ライブラリ" instead of "ライブラリー"
Merge pull request #225 from tamo/patch-3

Update ja.xml
Merge branch 'master' of github.com:geometer/FBReaderJ
updated Japanese localisation
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle