From 19e50a10981cce0e8c8d55081af38a8a139b0ee8 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 9 Mar 2014 16:48:13 +0800 Subject: [PATCH 1/3] hinting one page by default since reflowed page has a minimum height of screen height. There are no more than two pages displayed on screen simultaneously even in scroll mode. --- defaults.lua | 4 ++-- koreader-base | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults.lua b/defaults.lua index 99909d8d1..b496a3888 100644 --- a/defaults.lua +++ b/defaults.lua @@ -3,8 +3,8 @@ DRCOUNTMAX = 6 -- number of pages for hinting --- default to pre-rendering 2 pages -DHINTCOUNT = 2 +-- default to pre-rendering 1 page +DHINTCOUNT = 1 -- full screen mode, 1 for true, 0 for false DFULL_SCREEN = 1 diff --git a/koreader-base b/koreader-base index 995d9d5bc..93d18fecd 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit 995d9d5bceb9c6ce7d9e4da3fc14d93dbfef06d8 +Subproject commit 93d18fecddfb37353c8c4f8d233d162bdea07b02 From 315abd92d3882f7e6199d36ea6c6f999c254ad51 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 9 Mar 2014 20:09:54 +0800 Subject: [PATCH 2/3] strip unnecessary parts in update packages --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 00f594175..b40e5715a 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ customupdate: all zip -9 -r \ ../koreader-kindle-$(MACHINE)-$(VERSION).zip \ extensions koreader launchpad \ - -x "koreader/resources/fonts/*" + -x "koreader/resources/fonts/*" "koreader/resources/icons/src/*" "koreader/spec/*" # @TODO write an installation script for KUAL (houqp) koboupdate: all @@ -94,7 +94,7 @@ koboupdate: all zip -9 -r \ ../koreader-kobo-$(MACHINE)-$(VERSION).zip \ KoboRoot.tgz koreader koreader.png README_kobo.txt \ - -x "koreader/resources/fonts/*" + -x "koreader/resources/fonts/*" "koreader/resources/icons/src/*" "koreader/spec/*" pot: $(XGETTEXT_BIN) reader.lua `find frontend -iname "*.lua"` \ From 2c3ebfc43882b072b6b720b2333e49b348fcf926 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 9 Mar 2014 20:13:16 +0800 Subject: [PATCH 3/3] update pot file --- l10n/templates/koreader.pot | 190 ++++++++++++++++++------------------ 1 file changed, 97 insertions(+), 93 deletions(-) diff --git a/l10n/templates/koreader.pot b/l10n/templates/koreader.pot index 2878aabbf..57bca81d9 100644 --- a/l10n/templates/koreader.pot +++ b/l10n/templates/koreader.pot @@ -6,54 +6,54 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n" -"POT-Creation-Date: 2014-01-18 17:24+0000\n" +"POT-Creation-Date: 2014-03-09 12:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: reader.lua:107 +#: reader.lua:118 msgid "" "-d start in debug mode" msgstr "" -#: reader.lua:109 +#: reader.lua:120 msgid "" "-h show this usage help" msgstr "" -#: reader.lua:108 +#: reader.lua:119 msgid "" "-p [rows] enable Lua code profiling" msgstr "" -#: frontend/ui/data/strings.lua:46 +#: frontend/ui/data/strings.lua:47 msgid "" "0 deg" msgstr "" -#: frontend/ui/data/strings.lua:48 +#: frontend/ui/data/strings.lua:49 msgid "" "10 deg" msgstr "" -#: frontend/ui/data/strings.lua:47 +#: frontend/ui/data/strings.lua:48 msgid "" "5 deg" msgstr "" -#: frontend/ui/widget/dictquicklookup.lua:122 +#: frontend/ui/widget/dictquicklookup.lua:124 msgid "" "<<" msgstr "" -#: frontend/ui/widget/dictquicklookup.lua:129 +#: frontend/ui/widget/dictquicklookup.lua:131 msgid "" ">>" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:336 -#: frontend/ui/widget/dictquicklookup.lua:145 +#: frontend/ui/reader/readerhighlight.lua:294 +#: frontend/ui/widget/dictquicklookup.lua:147 msgid "" "Add Note" msgstr "" @@ -63,7 +63,7 @@ msgid "" "Apply" msgstr "" -#: frontend/ui/reader/readertypeset.lua:58 +#: frontend/ui/reader/readertypeset.lua:54 msgid "" "Auto" msgstr "" @@ -120,7 +120,7 @@ msgid "" "Cancel" msgstr "" -#: frontend/ui/reader/readerhyphenation.lua:25 +#: frontend/ui/reader/readerhyphenation.lua:32 msgid "" "Change Hyphenation to " msgstr "" @@ -140,12 +140,12 @@ msgid "" "Contrast" msgstr "" -#: frontend/apps/filemanager/filemanager.lua:133 +#: frontend/apps/filemanager/filemanager.lua:84 msgid "" "Copy" msgstr "" -#: frontend/apps/filemanager/filemanager.lua:151 +#: frontend/apps/filemanager/filemanager.lua:102 msgid "" "Cut" msgstr "" @@ -170,8 +170,9 @@ msgid "" "Defect Size" msgstr "" -#: frontend/apps/filemanager/filemanager.lua:158 -#: frontend/ui/reader/readerhighlight.lua:231 +#: frontend/apps/filemanager/filemanager.lua:109 +#: frontend/apps/filemanager/filemanagerhistory.lua:30 +#: frontend/ui/reader/readerhighlight.lua:186 msgid "" "Delete" msgstr "" @@ -191,17 +192,17 @@ msgid "" "Document menu" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:238 +#: frontend/ui/reader/readerhighlight.lua:193 msgid "" "Edit" msgstr "" #: frontend/ui/data/strings.lua:26 msgid "" -"Embedded style" +"Embedded Style" msgstr "" -#: reader.lua:55 +#: reader.lua:66 msgid "" "File does not exist" msgstr "" @@ -211,7 +212,7 @@ msgid "" "File manager menu" msgstr "" -#: frontend/apps/filemanager/filemanager.lua:69 +#: frontend/apps/filemanager/filemanager.lua:20 msgid "" "FileManager" msgstr "" @@ -228,7 +229,7 @@ msgstr "" #: frontend/ui/data/strings.lua:23 msgid "" -"Font weight" +"Font Weight" msgstr "" #: frontend/ui/reader/readerfrontlight.lua:70 @@ -267,14 +268,13 @@ msgid "" "Help" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:328 -#: frontend/ui/widget/dictquicklookup.lua:138 +#: frontend/ui/reader/readerhighlight.lua:286 +#: frontend/ui/widget/dictquicklookup.lua:140 msgid "" "Highlight" msgstr "" -#: frontend/apps/filemanager/filemanagerhistory.lua:11 -#: frontend/apps/filemanager/filemanagerhistory.lua:30 +#: frontend/apps/filemanager/filemanagerhistory.lua:14 msgid "" "History" msgstr "" @@ -284,12 +284,12 @@ msgid "" "Hyphenation" msgstr "" -#: reader.lua:114 +#: reader.lua:125 msgid "" "If you don't pass any path, the last viewed document will be opened" msgstr "" -#: reader.lua:111 +#: reader.lua:122 msgid "" "If you give the name of a directory instead of a file path, a file" msgstr "" @@ -314,12 +314,12 @@ msgid "" "Indentation" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:145 +#: frontend/ui/reader/readerhighlight.lua:96 msgid "" "Invert" msgstr "" -#: frontend/ui/data/strings.lua:54 +#: frontend/ui/data/strings.lua:55 msgid "" "LTR" msgstr "" @@ -329,7 +329,7 @@ msgid "" "Language" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:133 +#: frontend/ui/reader/readerhighlight.lua:84 msgid "" "Lighten" msgstr "" @@ -344,12 +344,12 @@ msgid "" "Location" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:366 +#: frontend/ui/reader/readerhighlight.lua:324 msgid "" "More" msgstr "" -#: reader.lua:70 +#: reader.lua:81 msgid "" "No reader engine for this file" msgstr "" @@ -385,7 +385,7 @@ msgid "" "Page Margin" msgstr "" -#: frontend/apps/filemanager/filemanager.lua:140 +#: frontend/apps/filemanager/filemanager.lua:91 msgid "" "Paste" msgstr "" @@ -401,12 +401,17 @@ msgid "" "Please restart reader for new language setting to take effect." msgstr "" -#: frontend/ui/data/strings.lua:55 +#: frontend/ui/data/strings.lua:28 +msgid "" +"Progress Bar" +msgstr "" + +#: frontend/ui/data/strings.lua:56 msgid "" "RTL" msgstr "" -#: reader.lua:105 +#: reader.lua:116 msgid "" "Read all the books on your E-Ink reader" msgstr "" @@ -447,7 +452,7 @@ msgid "" "Scroll Mode" msgstr "" -#: reader.lua:117 +#: reader.lua:128 msgid "" "See http://github.com/koreader/kindlepdfviewer for more info." msgstr "" @@ -469,17 +474,17 @@ msgid "" "Set font size to " msgstr "" -#: frontend/ui/reader/readerhighlight.lua:124 +#: frontend/ui/reader/readerhighlight.lua:75 msgid "" "Set highlight drawer " msgstr "" -#: frontend/ui/reader/readertypeset.lua:8 +#: frontend/ui/reader/readertypeset.lua:9 msgid "" "Set render style" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:355 +#: frontend/ui/reader/readerhighlight.lua:313 msgid "" "Share" msgstr "" @@ -494,27 +499,27 @@ msgid "" "Switch zoom mode" msgstr "" -#: frontend/ui/data/strings.lua:57 +#: frontend/ui/data/strings.lua:58 msgid "" "TBLTR" msgstr "" -#: frontend/ui/data/strings.lua:56 +#: frontend/ui/data/strings.lua:57 msgid "" "TBRTL" msgstr "" -#: frontend/ui/reader/readertoc.lua:95 +#: frontend/ui/reader/readertoc.lua:112 msgid "" "Table of Contents" msgstr "" -#: frontend/ui/reader/readertoc.lua:12 +#: frontend/ui/reader/readertoc.lua:14 msgid "" "Table of contents" msgstr "" -#: frontend/ui/widget/button.lua:77 +#: frontend/ui/widget/button.lua:78 msgid "" "Tap Button" msgstr "" @@ -524,7 +529,7 @@ msgid "" "Text Align" msgstr "" -#: reader.lua:116 +#: reader.lua:127 msgid "" "This software is licensed under the GPLv3." msgstr "" @@ -539,37 +544,27 @@ msgid "" "Toggle hidden files" msgstr "" -#: frontend/ui/widget/toggleswitch.lua:74 +#: frontend/ui/widget/toggleswitch.lua:75 msgid "" "Toggle switch" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:347 +#: frontend/ui/reader/readerhighlight.lua:305 msgid "" "Translate" msgstr "" -#: frontend/ui/reader/readertypeset.lua:127 -msgid "" -"Turn off floating punctuation" -msgstr "" - -#: frontend/ui/reader/readerpaging.lua:153 +#: frontend/ui/reader/readerpaging.lua:143 msgid "" "Turn off page overlap" msgstr "" -#: frontend/ui/reader/readertypeset.lua:128 -msgid "" -"Turn on floating punctuation" -msgstr "" - -#: frontend/ui/reader/readerpaging.lua:154 +#: frontend/ui/reader/readerpaging.lua:144 msgid "" "Turn on page overlap" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:139 +#: frontend/ui/reader/readerhighlight.lua:90 msgid "" "Underscore" msgstr "" @@ -587,7 +582,7 @@ msgstr "" #: frontend/ui/data/strings.lua:25 msgid "" -"View mode" +"View Mode" msgstr "" #: frontend/ui/data/strings.lua:18 @@ -600,7 +595,7 @@ msgid "" "Writing Direction" msgstr "" -#: frontend/ui/reader/readerscreenshot.lua:31 +#: frontend/ui/reader/readerscreenshot.lua:34 msgid "" "Writing screen to " msgstr "" @@ -635,7 +630,7 @@ msgid "" "Zoom to fit page width" msgstr "" -#: frontend/ui/data/strings.lua:31 +#: frontend/ui/data/strings.lua:32 msgid "" "auto" msgstr "" @@ -645,7 +640,7 @@ msgid "" "cancel" msgstr "" -#: reader.lua:112 +#: reader.lua:123 msgid "" "chooser will show up and let you select a file" msgstr "" @@ -661,7 +656,7 @@ msgid "" "chose selected option" msgstr "" -#: frontend/ui/reader/readertypeset.lua:52 +#: frontend/ui/reader/readertypeset.lua:48 msgid "" "clear all external styles" msgstr "" @@ -671,8 +666,7 @@ msgid "" "close config menu" msgstr "" -#: frontend/apps/filemanager/filemanager.lua:31 -#: frontend/ui/reader/readerhighlight.lua:24 +#: frontend/ui/widget/buttondialog.lua:22 #: frontend/ui/widget/infomessage.lua:32 msgid "" "close dialog" @@ -689,17 +683,17 @@ msgid "" "close menu" msgstr "" -#: frontend/ui/data/strings.lua:42 +#: frontend/ui/data/strings.lua:43 msgid "" "darker" msgstr "" -#: frontend/ui/data/strings.lua:43 +#: frontend/ui/data/strings.lua:44 msgid "" "darkest" msgstr "" -#: frontend/ui/data/strings.lua:37 +#: frontend/ui/data/strings.lua:38 msgid "" "decrease" msgstr "" @@ -714,11 +708,16 @@ msgid "" "decrease line space" msgstr "" -#: frontend/ui/data/strings.lua:41 +#: frontend/ui/data/strings.lua:42 msgid "" "default" msgstr "" +#: frontend/ui/data/strings.lua:59 +msgid "" +"full" +msgstr "" + #: frontend/ui/reader/readerrolling.lua:51 msgid "" "go to 11%" @@ -789,17 +788,17 @@ msgid "" "goto previous page of the menu" msgstr "" -#: frontend/ui/data/strings.lua:45 +#: frontend/ui/data/strings.lua:46 msgid "" "high" msgstr "" -#: frontend/ui/reader/readerhighlight.lua:68 +#: frontend/ui/reader/readerhighlight.lua:19 msgid "" "highlight text" msgstr "" -#: frontend/ui/data/strings.lua:38 +#: frontend/ui/data/strings.lua:39 msgid "" "increase" msgstr "" @@ -814,41 +813,46 @@ msgid "" "increase line space" msgstr "" -#: frontend/ui/data/strings.lua:50 +#: frontend/ui/data/strings.lua:51 msgid "" "landscape" msgstr "" -#: frontend/ui/data/strings.lua:36 +#: frontend/ui/data/strings.lua:37 msgid "" "large" msgstr "" -#: frontend/ui/data/strings.lua:40 +#: frontend/ui/data/strings.lua:41 msgid "" "lighter" msgstr "" -#: frontend/ui/data/strings.lua:39 +#: frontend/ui/data/strings.lua:40 msgid "" "lightest" msgstr "" -#: frontend/ui/data/strings.lua:44 +#: frontend/ui/data/strings.lua:45 msgid "" "low" msgstr "" -#: frontend/ui/data/strings.lua:32 +#: frontend/ui/data/strings.lua:33 msgid "" "manual" msgstr "" -#: frontend/ui/data/strings.lua:35 +#: frontend/ui/data/strings.lua:36 msgid "" "medium" msgstr "" +#: frontend/ui/data/strings.lua:60 +msgid "" +"mini" +msgstr "" + #: frontend/ui/reader/readerrolling.lua:45 msgid "" "move view down" @@ -889,22 +893,22 @@ msgid "" "no text" msgstr "" -#: frontend/ui/data/strings.lua:30 +#: frontend/ui/data/strings.lua:31 msgid "" "off" msgstr "" -#: frontend/ui/data/strings.lua:29 +#: frontend/ui/data/strings.lua:30 msgid "" "on" msgstr "" -#: reader.lua:60 +#: reader.lua:71 msgid "" "opening file" msgstr "" -#: frontend/ui/data/strings.lua:53 +#: frontend/ui/data/strings.lua:54 msgid "" "page" msgstr "" @@ -914,7 +918,7 @@ msgid "" "page " msgstr "" -#: frontend/ui/data/strings.lua:49 +#: frontend/ui/data/strings.lua:50 msgid "" "portrait" msgstr "" @@ -929,7 +933,7 @@ msgid "" "rotate right by 90 degrees" msgstr "" -#: frontend/ui/data/strings.lua:52 +#: frontend/ui/data/strings.lua:53 msgid "" "scroll" msgstr "" @@ -940,12 +944,12 @@ msgid "" "select current menu item" msgstr "" -#: frontend/ui/data/strings.lua:33 +#: frontend/ui/data/strings.lua:34 msgid "" "semi-auto" msgstr "" -#: frontend/ui/reader/readertoc.lua:20 +#: frontend/ui/reader/readertoc.lua:22 msgid "" "show Table of Content menu" msgstr "" @@ -971,17 +975,17 @@ msgid "" "show menu" msgstr "" -#: frontend/ui/data/strings.lua:34 +#: frontend/ui/data/strings.lua:35 msgid "" "small" msgstr "" -#: frontend/ui/data/strings.lua:51 +#: frontend/ui/data/strings.lua:52 msgid "" "toggle bold" msgstr "" -#: reader.lua:104 +#: reader.lua:115 msgid "" "usage: ./reader.lua [OPTION] ... path" msgstr ""