Merge remote-tracking branch 'FooSoft/master'

This commit is contained in:
Gabès Jean 2015-10-02 10:45:54 +02:00
commit 0cc17438e9
2 changed files with 7 additions and 1 deletions

View File

@ -86,6 +86,7 @@ class KindleData:
'Kindle DXG': ((824, 1200), Palette15a), 'Kindle DXG': ((824, 1200), Palette15a),
'Kindle Touch': ((600, 800), Palette15a), 'Kindle Touch': ((600, 800), Palette15a),
'Kindle Paperwhite': ((758, 1024), Palette15b), # resolution given in manual, see http://kindle.s3.amazonaws.com/Kindle_Paperwhite_Users_Guide.pdf 'Kindle Paperwhite': ((758, 1024), Palette15b), # resolution given in manual, see http://kindle.s3.amazonaws.com/Kindle_Paperwhite_Users_Guide.pdf
'Kindle Paperwhite 3': ((1072, 1448), Palette15b),
'KoBo Aura H2o': ((1080, 1430), Palette15a), # resolution from http://www.fnac.com/Liseuse-Numerique-Kobo-by-Fnac-Kobo-Aura-H2O-Noir/a7745120/w-4 'KoBo Aura H2o': ((1080, 1430), Palette15a), # resolution from http://www.fnac.com/Liseuse-Numerique-Kobo-by-Fnac-Kobo-Aura-H2O-Noir/a7745120/w-4
} }

View File

@ -101,6 +101,11 @@
<string>Kindle Paperwhite</string> <string>Kindle Paperwhite</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Kindle Paperwhite 3</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>KoBo Aura H2o</string> <string>KoBo Aura H2o</string>