From 153d0866d5599ff5e2eac32e0cfea2c1aa5d9a8e Mon Sep 17 00:00:00 2001 From: chrox Date: Fri, 29 Nov 2013 17:18:50 +0800 Subject: [PATCH 1/6] remove auto "contentwidth" in landscape This should fix #365. --- frontend/ui/reader/readerview.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/ui/reader/readerview.lua b/frontend/ui/reader/readerview.lua index 3803143d7..162a65163 100644 --- a/frontend/ui/reader/readerview.lua +++ b/frontend/ui/reader/readerview.lua @@ -436,10 +436,6 @@ function ReaderView:onSetScreenMode(new_mode, rotation) self.ui:handleEvent(Event:new("SetDimensions", Screen:getSize())) end self.cur_rotation_mode = Screen.cur_rotation_mode - - if new_mode == "landscape" and self.document.info.has_pages then - self.ui:handleEvent(Event:new("SetZoomMode", "contentwidth")) - end return true end From c94e88c46d806d16f876c52e3ed5420067dd74fc Mon Sep 17 00:00:00 2001 From: chrox Date: Fri, 29 Nov 2013 22:40:20 +0800 Subject: [PATCH 2/6] update pot file --- l10n/templates/koreader.pot | 1597 ++++++++++++++++++----------------- 1 file changed, 840 insertions(+), 757 deletions(-) diff --git a/l10n/templates/koreader.pot b/l10n/templates/koreader.pot index 630ee2760..25e55eca6 100644 --- a/l10n/templates/koreader.pot +++ b/l10n/templates/koreader.pot @@ -6,816 +6,899 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n" -"POT-Creation-Date: 2013-06-26 05:35+0000\n" +"POT-Creation-Date: 2013-11-29 14:39+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:198 +#: reader.lua:92 msgid "" "-d start in debug mode" msgstr "" -#: reader.lua:199 +#: reader.lua:94 msgid "" "-h show this usage help" msgstr "" -#: frontend/ui/data/strings.lua:40 +#: reader.lua:93 msgid "" -"0 deg" -msgstr "" - -#: frontend/ui/data/strings.lua:42 -msgid "" -"10 deg" -msgstr "" - -#: frontend/ui/data/strings.lua:41 -msgid "" -"5 deg" -msgstr "" - -#: frontend/ui/reader/readerhighlight.lua:186 -msgid "" -"Add Note" -msgstr "" - -#: frontend/ui/reader/readertypeset.lua:49 -msgid "" -"Auto" -msgstr "" - -#: frontend/ui/data/strings.lua:17 -msgid "" -"Auto Straighten" -msgstr "" - -#: frontend/ui/inputevent.lua:347 -msgid "" -"Auto-detected Kindle 2" -msgstr "" - -#: frontend/ui/inputevent.lua:343 -msgid "" -"Auto-detected Kindle 3" -msgstr "" - -#: frontend/ui/inputevent.lua:339 -msgid "" -"Auto-detected Kindle 4" -msgstr "" - -#: frontend/ui/inputevent.lua:345 -msgid "" -"Auto-detected Kindle DXG" -msgstr "" - -#: frontend/ui/inputevent.lua:295 -msgid "" -"Auto-detected Kindle PaperWhite" -msgstr "" - -#: frontend/ui/inputevent.lua:315 -msgid "" -"Auto-detected Kindle Touch" -msgstr "" - -#: frontend/ui/reader/readerbookmark.lua:4 -msgid "" -"Bookmarks" -msgstr "" - -#: frontend/ui/widget/confirmbox.lua:12 -msgid "" -"Cancel" -msgstr "" - -#: frontend/ui/reader/readerhyphenation.lua:21 -msgid "" -"Change Hyphenation to " -msgstr "" - -#: frontend/ui/reader/readerfont.lua:5 -msgid "" -"Change font" -msgstr "" - -#: frontend/ui/data/strings.lua:8 -msgid "" -"Columns" -msgstr "" - -#: frontend/ui/data/strings.lua:11 -msgid "" -"Contrast" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:124 -msgid "" -"Decrease font size to " -msgstr "" - -#: frontend/ui/reader/readerfrontlight.lua:42 -msgid "" -"Decrease front light intensity to " -msgstr "" - -#: frontend/ui/reader/readerfont.lua:192 -msgid "" -"Decrease gamma to " -msgstr "" - -#: frontend/ui/reader/readerfont.lua:163 -msgid "" -"Decrease line space to " -msgstr "" - -#: frontend/ui/data/strings.lua:15 -msgid "" -"Defect Size" -msgstr "" - -#: frontend/ui/reader/readerhighlight.lua:97 -msgid "" -"Delete" -msgstr "" - -#: frontend/ui/reader/readermenu.lua:94 -msgid "" -"Document menu" -msgstr "" - -#: frontend/ui/reader/readerhighlight.lua:101 -msgid "" -"Edit" -msgstr "" - -#: frontend/ui/data/strings.lua:22 -msgid "" -"Embedded style" -msgstr "" - -#: reader.lua:88 -msgid "" -"Exit" -msgstr "" - -#: reader.lua:150 -msgid "" -"FileManager" -msgstr "" - -#: frontend/ui/data/strings.lua:10 -msgid "" -"Fine Tuning" -msgstr "" - -#: frontend/ui/data/strings.lua:19 -msgid "" -"Font weight" -msgstr "" - -#: frontend/ui/data/strings.lua:4 -msgid "" -"Full Screen" -msgstr "" - -#: frontend/ui/data/strings.lua:20 -msgid "" -"Gamma" -msgstr "" - -#: frontend/ui/reader/readermenu.lua:61 -msgid "" -"Help" -msgstr "" - -#: frontend/ui/reader/readerhighlight.lua:182 -msgid "" -"Highlight" -msgstr "" - -#: reader.lua:106 -msgid "" -"Home menu" -msgstr "" - -#: frontend/ui/reader/readerhyphenation.lua:3 -msgid "" -"Hyphenation" -msgstr "" - -#: reader.lua:204 -msgid "" -"If you don't pass any path, the last viewed document will be opened" -msgstr "" - -#: reader.lua:201 -msgid "" -"If you give the name of a directory instead of a file path, a file" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:126 -msgid "" -"Increase font size to " -msgstr "" - -#: frontend/ui/reader/readerfrontlight.lua:38 -msgid "" -"Increase front light intensity to " -msgstr "" - -#: frontend/ui/reader/readerfont.lua:189 -msgid "" -"Increase gamma to " -msgstr "" - -#: frontend/ui/reader/readerfont.lua:167 -msgid "" -"Increase line space to " -msgstr "" - -#: frontend/ui/data/strings.lua:18 -msgid "" -"Indentation" -msgstr "" - -#: reader.lua:83 -msgid "" -"Last documents" -msgstr "" - -#: frontend/ui/data/strings.lua:7 -msgid "" -"Line Spacing" -msgstr "" - -#: frontend/ui/reader/readerhighlight.lua:198 -msgid "" -"More" -msgstr "" - -#: reader.lua:127 -msgid "" -"No reader engine for this file" -msgstr "" - -#: frontend/ui/inputevent.lua:349 -msgid "" -"Not supported device model!" -msgstr "" - -#: frontend/ui/widget/confirmbox.lua:11 -msgid "" -"OK" -msgstr "" - -#: frontend/ui/widget/touchmenu.lua:338 -msgid "" -"Page " -msgstr "" - -#: frontend/ui/data/strings.lua:3 -msgid "" -"Page Crop" -msgstr "" - -#: frontend/ui/data/strings.lua:6 -msgid "" -"Page Margin" -msgstr "" - -#: frontend/ui/reader/readermenu.lua:64 -msgid "" -"Please report bugs to https://github.com/koreader/ koreader/issues, Click at the bottom of the page for more options" -msgstr "" - -#: reader.lua:196 -msgid "" -"Read all the books on your E-Ink reader" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:215 -msgid "" -"Redrawing with font " -msgstr "" - -#: frontend/ui/data/koptoptions.lua:146 -#: frontend/ui/data/strings.lua:12 -msgid "" -"Reflow" -msgstr "" - -#: frontend/ui/data/strings.lua:16 -msgid "" -"Render Quality" -msgstr "" - -#: frontend/ui/data/strings.lua:2 -msgid "" -"Screen Mode" -msgstr "" - -#: frontend/ui/data/strings.lua:5 -msgid "" -"Scroll Mode" -msgstr "" - -#: reader.lua:207 -msgid "" -"See http://github.com/koreader/kindlepdfviewer for more info." -msgstr "" - -#: frontend/ui/widget/config.lua:15 -#: frontend/ui/widget/touchmenu.lua:26 -msgid "" -"Select Menu Item" -msgstr "" - -#: frontend/ui/widget/config.lua:54 -#: frontend/ui/widget/config.lua:108 -msgid "" -"Select Option Item" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:148 -msgid "" -"Set font size to " -msgstr "" - -#: frontend/ui/reader/readertypeset.lua:2 -msgid "" -"Set render style" -msgstr "" - -#: frontend/ui/reader/readerhighlight.lua:193 -msgid "" -"Share" -msgstr "" - -#: reader.lua:18 -msgid "" -"Show Home Menu" -msgstr "" - -#: frontend/ui/reader/readerzooming.lua:241 -msgid "" -"Switch zoom mode" -msgstr "" - -#: frontend/ui/reader/readertoc.lua:85 -msgid "" -"Table of Contents" -msgstr "" - -#: frontend/ui/reader/readertoc.lua:3 -msgid "" -"Table of contents" -msgstr "" - -#: frontend/ui/widget/button.lua:58 -msgid "" -"Tap Button" -msgstr "" - -#: frontend/ui/data/strings.lua:9 -msgid "" -"Text Align" -msgstr "" - -#: reader.lua:206 -msgid "" -"This software is licensed under the GPLv3." -msgstr "" - -#: frontend/ui/widget/toggleswitch.lua:58 -msgid "" -"Toggle switch" -msgstr "" - -#: frontend/ui/data/strings.lua:13 -msgid "" -"Vertical Text" -msgstr "" - -#: frontend/ui/data/strings.lua:21 -msgid "" -"View mode" -msgstr "" - -#: frontend/ui/data/strings.lua:14 -msgid "" -"Word Gap" -msgstr "" - -#: frontend/ui/reader/readerzooming.lua:260 -msgid "" -"Zoom to fit content" -msgstr "" - -#: frontend/ui/reader/readerzooming.lua:248 -msgid "" -"Zoom to fit content height" -msgstr "" - -#: frontend/ui/reader/readerzooming.lua:244 -msgid "" -"Zoom to fit content width" -msgstr "" - -#: frontend/ui/reader/readerzooming.lua:264 -msgid "" -"Zoom to fit page" -msgstr "" - -#: frontend/ui/reader/readerzooming.lua:256 -msgid "" -"Zoom to fit page height" -msgstr "" - -#: frontend/ui/reader/readerzooming.lua:252 -msgid "" -"Zoom to fit page width" -msgstr "" - -#: frontend/ui/data/strings.lua:26 -msgid "" -"auto" -msgstr "" - -#: frontend/ui/widget/confirmbox.lua:23 -msgid "" -"cancel" -msgstr "" - -#: reader.lua:202 -msgid "" -"chooser will show up and let you select a file" -msgstr "" - -#: frontend/ui/widget/config.lua:20 -#: frontend/ui/widget/config.lua:59 -msgid "" -"chose selected item" -msgstr "" - -#: frontend/ui/widget/confirmbox.lua:24 -msgid "" -"chose selected option" -msgstr "" - -#: frontend/ui/reader/readertypeset.lua:43 -msgid "" -"clear all external styles" -msgstr "" - -#: frontend/ui/widget/config.lua:425 -msgid "" -"close config menu" -msgstr "" - -#: frontend/ui/widget/buttontable.lua:18 -#: frontend/ui/widget/dict.lua:20 -#: frontend/ui/widget/infomessage.lua:18 -msgid "" -"close dialog" -msgstr "" - -#: frontend/ui/readerui.lua:33 -#: frontend/ui/readerui.lua:62 -msgid "" -"close document" -msgstr "" - -#: frontend/ui/widget/menu.lua:349 -msgid "" -"close menu" -msgstr "" - -#: frontend/ui/data/strings.lua:36 -msgid "" -"darker" -msgstr "" - -#: frontend/ui/data/strings.lua:37 -msgid "" -"darkest" -msgstr "" - -#: frontend/ui/data/strings.lua:31 -msgid "" -"decrease" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:22 -msgid "" -"decrease font size" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:30 -msgid "" -"decrease line space" -msgstr "" - -#: frontend/ui/data/strings.lua:35 -msgid "" -"default" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:41 -msgid "" -"go to 11%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:43 -msgid "" -"go to 22%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:45 -msgid "" -"go to 33%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:47 -msgid "" -"go to 44%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:49 -msgid "" -"go to 55%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:51 -msgid "" -"go to 66%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:53 -msgid "" -"go to 77%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:55 -msgid "" -"go to 88%" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:57 -msgid "" -"go to end" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:20 -msgid "" -"go to next view" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:25 -msgid "" -"go to previous view" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:39 -msgid "" -"go to start" -msgstr "" - -#: frontend/ui/widget/menu.lua:351 -msgid "" -"goto next page of the menu" -msgstr "" - -#: frontend/ui/widget/menu.lua:354 -msgid "" -"goto previous page of the menu" -msgstr "" - -#: frontend/ui/data/strings.lua:39 -msgid "" -"high" -msgstr "" - -#: frontend/ui/reader/readerhighlight.lua:10 -msgid "" -"highlight text" -msgstr "" - -#: frontend/ui/data/strings.lua:32 -msgid "" -"increase" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:18 -msgid "" -"increase font size" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:26 -msgid "" -"increase line space" -msgstr "" - -#: frontend/ui/data/strings.lua:44 -msgid "" -"landscape" -msgstr "" - -#: frontend/ui/data/strings.lua:30 -msgid "" -"large" -msgstr "" - -#: frontend/ui/data/strings.lua:34 -msgid "" -"lighter" -msgstr "" - -#: frontend/ui/data/strings.lua:33 -msgid "" -"lightest" -msgstr "" - -#: frontend/ui/data/strings.lua:38 -msgid "" -"low" -msgstr "" - -#: frontend/ui/data/strings.lua:27 -msgid "" -"manual" -msgstr "" - -#: frontend/ui/data/strings.lua:29 -msgid "" -"medium" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:35 -msgid "" -"move view down" -msgstr "" - -#: frontend/ui/reader/readerrolling.lua:30 -msgid "" -"move view up" -msgstr "" - -#: frontend/ui/reader/readerpanning.lua:20 -msgid "" -"move visible area down" -msgstr "" - -#: frontend/ui/reader/readerpanning.lua:23 -msgid "" -"move visible area left" -msgstr "" - -#: frontend/ui/reader/readerpanning.lua:26 -msgid "" -"move visible area right" -msgstr "" - -#: frontend/ui/reader/readerpanning.lua:17 -msgid "" -"move visible area up" -msgstr "" - -#: frontend/ui/widget/menu.lua:433 -msgid "" -"no choices available" -msgstr "" - -#: frontend/ui/widget/confirmbox.lua:9 -msgid "" -"no text" -msgstr "" - -#: frontend/ui/data/strings.lua:25 -msgid "" -"off" -msgstr "" - -#: frontend/ui/data/strings.lua:24 -msgid "" -"on" -msgstr "" - -#: frontend/ui/data/strings.lua:47 -msgid "" -"page" -msgstr "" - -#: frontend/ui/widget/menu.lua:431 -msgid "" -"page " -msgstr "" - -#: frontend/ui/data/strings.lua:43 -msgid "" -"portrait" -msgstr "" - -#: frontend/ui/reader/readerrotation.lua:12 -msgid "" -"rotate left by 90 degrees" -msgstr "" - -#: frontend/ui/reader/readerrotation.lua:16 -msgid "" -"rotate right by 90 degrees" -msgstr "" - -#: frontend/ui/data/strings.lua:46 -msgid "" -"scroll" -msgstr "" - -#: frontend/ui/widget/config.lua:429 -#: frontend/ui/widget/menu.lua:363 -msgid "" -"select current menu item" -msgstr "" - -#: frontend/ui/reader/readertoc.lua:11 -msgid "" -"show Table of Content menu" -msgstr "" - -#: frontend/ui/reader/readerbookmark.lua:13 -msgid "" -"show bookmarks" -msgstr "" - -#: frontend/ui/reader/readerconfig.lua:53 -msgid "" -"show config dialog" -msgstr "" - -#: frontend/ui/reader/readerfont.lua:15 -msgid "" -"show font menu" -msgstr "" - -#: frontend/ui/reader/readermenu.lua:34 -msgid "" -"show menu" -msgstr "" - -#: frontend/ui/data/strings.lua:28 -msgid "" -"small" +"-p [rows] enable Lua code profiling" msgstr "" #: frontend/ui/data/strings.lua:45 msgid "" +"0 deg" +msgstr "" + +#: frontend/ui/data/strings.lua:47 +msgid "" +"10 deg" +msgstr "" + +#: frontend/ui/data/strings.lua:46 +msgid "" +"5 deg" +msgstr "" + +#: frontend/ui/widget/dictquicklookup.lua:115 +msgid "" +"<<" +msgstr "" + +#: frontend/ui/widget/dictquicklookup.lua:122 +msgid "" +">>" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:266 +#: frontend/ui/widget/dictquicklookup.lua:138 +msgid "" +"Add Note" +msgstr "" + +#: frontend/ui/reader/readerfrontlight.lua:83 +msgid "" +"Apply" +msgstr "" + +#: frontend/ui/reader/readertypeset.lua:55 +msgid "" +"Auto" +msgstr "" + +#: frontend/ui/data/strings.lua:21 +msgid "" +"Auto Straighten" +msgstr "" + +#: frontend/ui/input.lua:381 +msgid "" +"Auto-detected Kindle 2" +msgstr "" + +#: frontend/ui/input.lua:374 +msgid "" +"Auto-detected Kindle 3" +msgstr "" + +#: frontend/ui/input.lua:370 +msgid "" +"Auto-detected Kindle 4" +msgstr "" + +#: frontend/ui/input.lua:378 +msgid "" +"Auto-detected Kindle DXG" +msgstr "" + +#: frontend/ui/input.lua:286 +#: frontend/ui/input.lua:290 +msgid "" +"Auto-detected Kindle PaperWhite" +msgstr "" + +#: frontend/ui/input.lua:314 +msgid "" +"Auto-detected Kindle Touch" +msgstr "" + +#: frontend/ui/input.lua:320 +msgid "" +"Auto-detected Kobo" +msgstr "" + +#: frontend/ui/reader/readerbookmark.lua:13 +msgid "" +"Bookmarks" +msgstr "" + +#: frontend/ui/reader/readergoto.lua:36 +#: frontend/ui/widget/confirmbox.lua:26 +msgid "" +"Cancel" +msgstr "" + +#: frontend/ui/reader/readerhyphenation.lua:25 +msgid "" +"Change Hyphenation to " +msgstr "" + +#: frontend/ui/reader/readerfont.lua:17 +msgid "" +"Change font" +msgstr "" + +#: frontend/ui/data/strings.lua:11 +msgid "" +"Columns" +msgstr "" + +#: frontend/ui/data/strings.lua:14 +msgid "" +"Contrast" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:136 +msgid "" +"Decrease font size to " +msgstr "" + +#: frontend/ui/reader/readerfrontlight.lua:44 +msgid "" +"Decrease front light intensity to " +msgstr "" + +#: frontend/ui/reader/readerfont.lua:204 +msgid "" +"Decrease gamma to " +msgstr "" + +#: frontend/ui/reader/readerfont.lua:175 +msgid "" +"Decrease line space to " +msgstr "" + +#: frontend/ui/data/strings.lua:19 +msgid "" +"Defect Size" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:159 +msgid "" +"Delete" +msgstr "" + +#: frontend/ui/data/strings.lua:16 +msgid "" +"Document Language" +msgstr "" + +#: frontend/ui/reader/readermenu.lua:103 +msgid "" +"Document menu" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:166 +msgid "" +"Edit" +msgstr "" + +#: frontend/ui/data/strings.lua:26 +msgid "" +"Embedded style" +msgstr "" + +#: frontend/apps/filemanager/filemanagermenu.lua:103 +msgid "" +"File manager menu" +msgstr "" + +#: frontend/apps/filemanager/filemanager.lua:17 +msgid "" +"FileManager" +msgstr "" + +#: frontend/ui/data/strings.lua:13 +msgid "" +"Fine Tuning" +msgstr "" + +#: frontend/ui/data/strings.lua:23 +msgid "" +"Font weight" +msgstr "" + +#: frontend/ui/reader/readerfrontlight.lua:70 +msgid "" +"Frontlight Level" +msgstr "" + +#: frontend/ui/reader/readerfrontlight.lua:60 +msgid "" +"Frontlight settings" +msgstr "" + +#: frontend/ui/data/strings.lua:7 +msgid "" +"Full Screen" +msgstr "" + +#: frontend/ui/data/strings.lua:24 +msgid "" +"Gamma" +msgstr "" + +#: frontend/ui/reader/readergoto.lua:10 +msgid "" +"Go To" +msgstr "" + +#: frontend/ui/reader/readergoto.lua:11 +msgid "" +"Go to Page or Location" +msgstr "" + +#: frontend/apps/filemanager/filemanagermenu.lua:72 +#: frontend/ui/reader/readermenu.lua:70 +msgid "" +"Help" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:258 +#: frontend/ui/widget/dictquicklookup.lua:131 +msgid "" +"Highlight" +msgstr "" + +#: frontend/apps/filemanager/filemanagerhistory.lua:10 +#: frontend/apps/filemanager/filemanagerhistory.lua:29 +msgid "" +"History" +msgstr "" + +#: frontend/ui/reader/readerhyphenation.lua:7 +msgid "" +"Hyphenation" +msgstr "" + +#: reader.lua:99 +msgid "" +"If you don't pass any path, the last viewed document will be opened" +msgstr "" + +#: reader.lua:96 +msgid "" +"If you give the name of a directory instead of a file path, a file" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:138 +msgid "" +"Increase font size to " +msgstr "" + +#: frontend/ui/reader/readerfrontlight.lua:41 +msgid "" +"Increase front light intensity to " +msgstr "" + +#: frontend/ui/reader/readerfont.lua:201 +msgid "" +"Increase gamma to " +msgstr "" + +#: frontend/ui/reader/readerfont.lua:179 +msgid "" +"Increase line space to " +msgstr "" + +#: frontend/ui/data/strings.lua:22 +msgid "" +"Indentation" +msgstr "" + +#: frontend/ui/data/strings.lua:10 +msgid "" +"Line Spacing" +msgstr "" + +#: frontend/ui/reader/readergoto.lua:50 +msgid "" +"Location" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:296 +msgid "" +"More" +msgstr "" + +#: reader.lua:55 +msgid "" +"No reader engine for this file" +msgstr "" + +#: frontend/ui/input.lua:384 +msgid "" +"Not supported device model!" +msgstr "" + +#: frontend/ui/reader/readerfrontlight.lua:90 +#: frontend/ui/widget/confirmbox.lua:25 +msgid "" +"OK" +msgstr "" + +#: frontend/ui/reader/readergoto.lua:43 +msgid "" +"Page" +msgstr "" + +#: frontend/ui/widget/touchmenu.lua:346 +msgid "" +"Page " +msgstr "" + +#: frontend/ui/data/strings.lua:6 +msgid "" +"Page Crop" +msgstr "" + +#: frontend/ui/data/strings.lua:9 +msgid "" +"Page Margin" +msgstr "" + +#: frontend/apps/filemanager/filemanagermenu.lua:75 +#: frontend/ui/reader/readermenu.lua:73 +msgid "" +"Please report bugs to https://github.com/koreader/ koreader/issues, Click at the bottom of the page for more options" +msgstr "" + +#: reader.lua:90 +msgid "" +"Read all the books on your E-Ink reader" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:227 +msgid "" +"Redrawing with font " +msgstr "" + +#: frontend/ui/data/koptoptions.lua:150 +#: frontend/ui/data/strings.lua:15 +msgid "" +"Reflow" +msgstr "" + +#: frontend/ui/data/strings.lua:20 +msgid "" +"Render Quality" +msgstr "" + +#: frontend/ui/data/strings.lua:5 +msgid "" +"Screen Mode" +msgstr "" + +#: frontend/ui/data/strings.lua:8 +msgid "" +"Scroll Mode" +msgstr "" + +#: reader.lua:102 +msgid "" +"See http://github.com/koreader/kindlepdfviewer for more info." +msgstr "" + +#: frontend/ui/widget/configdialog.lua:38 +#: frontend/ui/widget/touchmenu.lua:40 +msgid "" +"Select Menu Item" +msgstr "" + +#: frontend/ui/widget/configdialog.lua:84 +#: frontend/ui/widget/configdialog.lua:138 +msgid "" +"Select Option Item" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:160 +msgid "" +"Set font size to " +msgstr "" + +#: frontend/ui/reader/readertypeset.lua:8 +msgid "" +"Set render style" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:285 +msgid "" +"Share" +msgstr "" + +#: frontend/ui/uimanager.lua:296 +msgid "" +"Standby" +msgstr "" + +#: frontend/ui/reader/readerzooming.lua:245 +msgid "" +"Switch zoom mode" +msgstr "" + +#: frontend/ui/reader/readertoc.lua:94 +msgid "" +"Table of Contents" +msgstr "" + +#: frontend/ui/reader/readertoc.lua:12 +msgid "" +"Table of contents" +msgstr "" + +#: frontend/ui/widget/button.lua:77 +msgid "" +"Tap Button" +msgstr "" + +#: frontend/ui/data/strings.lua:12 +msgid "" +"Text Align" +msgstr "" + +#: reader.lua:101 +msgid "" +"This software is licensed under the GPLv3." +msgstr "" + +#: frontend/ui/reader/readerfrontlight.lua:75 +msgid "" +"Toggle" +msgstr "" + +#: frontend/apps/filemanager/filemanagermenu.lua:61 +msgid "" +"Toggle hidden files" +msgstr "" + +#: frontend/ui/widget/toggleswitch.lua:74 +msgid "" +"Toggle switch" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:277 +msgid "" +"Translate" +msgstr "" + +#: frontend/ui/data/strings.lua:17 +msgid "" +"Vertical Text" +msgstr "" + +#: frontend/ui/data/strings.lua:25 +msgid "" +"View mode" +msgstr "" + +#: frontend/ui/data/strings.lua:18 +msgid "" +"Word Gap" +msgstr "" + +#: frontend/ui/reader/readerzooming.lua:264 +msgid "" +"Zoom to fit content" +msgstr "" + +#: frontend/ui/reader/readerzooming.lua:252 +msgid "" +"Zoom to fit content height" +msgstr "" + +#: frontend/ui/reader/readerzooming.lua:248 +msgid "" +"Zoom to fit content width" +msgstr "" + +#: frontend/ui/reader/readerzooming.lua:268 +msgid "" +"Zoom to fit page" +msgstr "" + +#: frontend/ui/reader/readerzooming.lua:260 +msgid "" +"Zoom to fit page height" +msgstr "" + +#: frontend/ui/reader/readerzooming.lua:256 +msgid "" +"Zoom to fit page width" +msgstr "" + +#: frontend/ui/data/strings.lua:30 +msgid "" +"auto" +msgstr "" + +#: frontend/ui/widget/confirmbox.lua:37 +msgid "" +"cancel" +msgstr "" + +#: reader.lua:97 +msgid "" +"chooser will show up and let you select a file" +msgstr "" + +#: frontend/ui/widget/configdialog.lua:43 +#: frontend/ui/widget/configdialog.lua:89 +msgid "" +"chose selected item" +msgstr "" + +#: frontend/ui/widget/confirmbox.lua:38 +msgid "" +"chose selected option" +msgstr "" + +#: frontend/ui/reader/readertypeset.lua:49 +msgid "" +"clear all external styles" +msgstr "" + +#: frontend/ui/widget/configdialog.lua:462 +msgid "" +"close config menu" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:24 +#: frontend/ui/widget/infomessage.lua:32 +msgid "" +"close dialog" +msgstr "" + +#: frontend/ui/readerui.lua:43 +#: frontend/ui/readerui.lua:72 +msgid "" +"close document" +msgstr "" + +#: frontend/ui/widget/menu.lua:402 +msgid "" +"close menu" +msgstr "" + +#: frontend/ui/data/strings.lua:41 +msgid "" +"darker" +msgstr "" + +#: frontend/ui/data/strings.lua:42 +msgid "" +"darkest" +msgstr "" + +#: frontend/ui/data/strings.lua:36 +msgid "" +"decrease" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:34 +msgid "" +"decrease font size" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:42 +msgid "" +"decrease line space" +msgstr "" + +#: frontend/ui/data/strings.lua:40 +msgid "" +"default" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:50 +msgid "" +"go to 11%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:52 +msgid "" +"go to 22%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:54 +msgid "" +"go to 33%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:56 +msgid "" +"go to 44%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:58 +msgid "" +"go to 55%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:60 +msgid "" +"go to 66%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:62 +msgid "" +"go to 77%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:64 +msgid "" +"go to 88%" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:66 +msgid "" +"go to end" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:29 +msgid "" +"go to next view" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:34 +msgid "" +"go to previous view" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:48 +msgid "" +"go to start" +msgstr "" + +#: frontend/ui/widget/menu.lua:404 +msgid "" +"goto next page of the menu" +msgstr "" + +#: frontend/ui/widget/menu.lua:407 +msgid "" +"goto previous page of the menu" +msgstr "" + +#: frontend/ui/data/strings.lua:44 +msgid "" +"high" +msgstr "" + +#: frontend/ui/reader/readerhighlight.lua:68 +msgid "" +"highlight text" +msgstr "" + +#: frontend/ui/data/strings.lua:37 +msgid "" +"increase" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:30 +msgid "" +"increase font size" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:38 +msgid "" +"increase line space" +msgstr "" + +#: frontend/ui/data/strings.lua:49 +msgid "" +"landscape" +msgstr "" + +#: frontend/ui/data/strings.lua:35 +msgid "" +"large" +msgstr "" + +#: frontend/ui/data/strings.lua:39 +msgid "" +"lighter" +msgstr "" + +#: frontend/ui/data/strings.lua:38 +msgid "" +"lightest" +msgstr "" + +#: frontend/ui/data/strings.lua:43 +msgid "" +"low" +msgstr "" + +#: frontend/ui/data/strings.lua:31 +msgid "" +"manual" +msgstr "" + +#: frontend/ui/data/strings.lua:34 +msgid "" +"medium" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:44 +msgid "" +"move view down" +msgstr "" + +#: frontend/ui/reader/readerrolling.lua:39 +msgid "" +"move view up" +msgstr "" + +#: frontend/ui/reader/readerpanning.lua:25 +msgid "" +"move visible area down" +msgstr "" + +#: frontend/ui/reader/readerpanning.lua:28 +msgid "" +"move visible area left" +msgstr "" + +#: frontend/ui/reader/readerpanning.lua:31 +msgid "" +"move visible area right" +msgstr "" + +#: frontend/ui/reader/readerpanning.lua:22 +msgid "" +"move visible area up" +msgstr "" + +#: frontend/ui/widget/menu.lua:488 +msgid "" +"no choices available" +msgstr "" + +#: frontend/ui/widget/confirmbox.lua:23 +msgid "" +"no text" +msgstr "" + +#: frontend/ui/data/strings.lua:29 +msgid "" +"off" +msgstr "" + +#: frontend/ui/data/strings.lua:28 +msgid "" +"on" +msgstr "" + +#: frontend/ui/data/strings.lua:52 +msgid "" +"page" +msgstr "" + +#: frontend/ui/widget/menu.lua:482 +msgid "" +"page " +msgstr "" + +#: frontend/ui/data/strings.lua:48 +msgid "" +"portrait" +msgstr "" + +#: frontend/ui/reader/readerrotation.lua:20 +msgid "" +"rotate left by 90 degrees" +msgstr "" + +#: frontend/ui/reader/readerrotation.lua:24 +msgid "" +"rotate right by 90 degrees" +msgstr "" + +#: frontend/ui/data/strings.lua:51 +msgid "" +"scroll" +msgstr "" + +#: frontend/ui/widget/configdialog.lua:466 +#: frontend/ui/widget/menu.lua:416 +msgid "" +"select current menu item" +msgstr "" + +#: frontend/ui/data/strings.lua:32 +msgid "" +"semi-auto" +msgstr "" + +#: frontend/ui/reader/readertoc.lua:20 +msgid "" +"show Table of Content menu" +msgstr "" + +#: frontend/ui/reader/readerbookmark.lua:22 +msgid "" +"show bookmarks" +msgstr "" + +#: frontend/ui/reader/readerconfig.lua:18 +msgid "" +"show config dialog" +msgstr "" + +#: frontend/ui/reader/readerfont.lua:27 +msgid "" +"show font menu" +msgstr "" + +#: frontend/apps/filemanager/filemanagermenu.lua:34 +#: frontend/ui/reader/readermenu.lua:44 +msgid "" +"show menu" +msgstr "" + +#: frontend/ui/data/strings.lua:33 +msgid "" +"small" +msgstr "" + +#: frontend/ui/data/strings.lua:50 +msgid "" "toggle bold" msgstr "" -#: reader.lua:195 +#: reader.lua:89 msgid "" "usage: ./reader.lua [OPTION] ... path" msgstr "" -#: frontend/ui/reader/readerzooming.lua:15 +#: frontend/ui/reader/readerzooming.lua:25 msgid "" "zoom in" msgstr "" -#: frontend/ui/reader/readerzooming.lua:20 +#: frontend/ui/reader/readerzooming.lua:30 msgid "" "zoom out" msgstr "" -#: frontend/ui/reader/readerzooming.lua:30 +#: frontend/ui/reader/readerzooming.lua:40 msgid "" "zoom to fit content" msgstr "" -#: frontend/ui/reader/readerzooming.lua:50 +#: frontend/ui/reader/readerzooming.lua:60 msgid "" "zoom to fit content height" msgstr "" -#: frontend/ui/reader/readerzooming.lua:40 +#: frontend/ui/reader/readerzooming.lua:50 msgid "" "zoom to fit content width" msgstr "" -#: frontend/ui/reader/readerzooming.lua:25 +#: frontend/ui/reader/readerzooming.lua:35 msgid "" "zoom to fit page" msgstr "" -#: frontend/ui/reader/readerzooming.lua:45 +#: frontend/ui/reader/readerzooming.lua:55 msgid "" "zoom to fit page height" msgstr "" -#: frontend/ui/reader/readerzooming.lua:35 +#: frontend/ui/reader/readerzooming.lua:45 msgid "" "zoom to fit page width" msgstr "" From 67f627f2fbcc0eb84e972371835b3a6119d6ca70 Mon Sep 17 00:00:00 2001 From: chrox Date: Fri, 29 Nov 2013 22:41:56 +0800 Subject: [PATCH 3/6] update po file from transifex automatically on each build --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fc3dc34e3..93ec7666d 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ XGETTEXT_BIN=$(KOREADER_MISC_TOOL)/gettext/lua_xgettext.py MO_DIR=$(INSTALL_DIR)/koreader/i18n -all: $(KOR_BASE)/$(OUTPUT_DIR)/luajit mo +all: $(KOR_BASE)/$(OUTPUT_DIR)/luajit po mo $(MAKE) -C $(KOR_BASE) echo $(VERSION) > git-rev mkdir -p $(INSTALL_DIR)/koreader @@ -94,6 +94,9 @@ pot: $(XGETTEXT_BIN) reader.lua `find frontend -iname "*.lua"` \ > $(TEMPLATE_DIR)/$(DOMAIN).pot +po: + $(MAKE) -i -C l10n bootstrap update + mo: for po in `find l10n -iname '*.po'`; do \ resource=`basename $$po .po` ; \ From 83e7507154113b3cdf5e8e478dfc8a6f0731dba0 Mon Sep 17 00:00:00 2001 From: chrox Date: Fri, 29 Nov 2013 22:46:39 +0800 Subject: [PATCH 4/6] force download po files --- l10n/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n/Makefile b/l10n/Makefile index b85aaf32e..a03d010ea 100644 --- a/l10n/Makefile +++ b/l10n/Makefile @@ -1,7 +1,7 @@ all: update update: - tx pull -a + tx pull -a -f bootstrap: tx set --auto-local -r koreader.koreader "/koreader.po" \ From 71cb2d3f93bbe00244cca9b2b49609ac5abc48e5 Mon Sep 17 00:00:00 2001 From: chrox Date: Sat, 30 Nov 2013 18:18:16 +0800 Subject: [PATCH 5/6] fix looking up wrong word in reflowed page that has a text layer underneath. For multi-column page reflowing usually fits individual column to page width and no finner word boxes are available to map reflowed word box onto native word box. Now the relative position of a reflowed word center is calculated as portion of the width and height of a larger block it belongs. This relative position is also considered in reflow-to-native position transform so that dictionary lookup now works on multi-column pages in reflowing mode. This should fix #376. --- frontend/document/koptinterface.lua | 54 ++++++++++++++++++++++------- koreader-base | 2 +- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index 50bcf1ede..3ecf8b740 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -665,20 +665,40 @@ function KoptInterface:getWordFromPosition(doc, pos) end end +local function getBoxRelativePosition(s_box, l_box) + local pos_rel = {} + local s_box_center = s_box:center() + pos_rel.x = (s_box_center.x - l_box.x)/l_box.w + pos_rel.y = (s_box_center.y - l_box.y)/l_box.h + return pos_rel +end + --[[ get word and word box from position in reflowed page ]]-- function KoptInterface:getWordFromReflowPosition(doc, boxes, pos) local pageno = pos.page - local reflowed_page_boxes = self:getReflowedTextBoxesFromScratch(doc, pageno) + + local scratch_reflowed_page_boxes = self:getReflowedTextBoxesFromScratch(doc, pageno) + local scratch_reflowed_word_box = self:getWordFromBoxes(scratch_reflowed_page_boxes, pos) + --DEBUG("word box from scratch", scratch_reflowed_word_box) + + local reflowed_page_boxes = self:getReflowedTextBoxes(doc, pageno) local reflowed_word_box = self:getWordFromBoxes(reflowed_page_boxes, pos) - local reflowed_pos = reflowed_word_box.box:center() - local native_pos = self:reflowToNativePosTransform(doc, pageno, reflowed_pos) + --DEBUG("word box from reflow", reflowed_word_box) + + local reflowed_pos_abs = scratch_reflowed_word_box.box:center() + local reflowed_pos_rel = getBoxRelativePosition(scratch_reflowed_word_box.box, reflowed_word_box.box) + --DEBUG("word box absolote center", reflowed_pos_abs) + --DEBUG("word box relative center", reflowed_pos_rel) + + local native_pos = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs, reflowed_pos_rel) local native_word_box = self:getWordFromBoxes(boxes, native_pos) + local word_box = { word = native_word_box.word, pbox = native_word_box.box, -- box on page - sbox = reflowed_word_box.box, -- box on screen + sbox = scratch_reflowed_word_box.box, -- box on screen pos = native_pos, } return word_box @@ -716,7 +736,7 @@ end --[[ transform position in reflowed page to native page ]]-- -function KoptInterface:reflowToNativePosTransform(doc, pageno, pos) +function KoptInterface:reflowToNativePosTransform(doc, pageno, abs_pos, rel_pos) local bbox = doc:getPageBBox(pageno) local context_hash = self:getContextHash(doc, pageno, bbox) local kctx_hash = "kctx|"..context_hash @@ -725,7 +745,7 @@ function KoptInterface:reflowToNativePosTransform(doc, pageno, pos) --kc:setDebug() --DEBUG("transform reflowed pos", pos) local npos = {} - npos.x, npos.y = kc:reflowToNativePosTransform(pos.x, pos.y) + npos.x, npos.y = kc:reflowToNativePosTransform(abs_pos.x, abs_pos.y, rel_pos.x, rel_pos.y) --DEBUG("transformed native pos", npos) return npos end @@ -749,14 +769,22 @@ get text and text boxes from screen positions for reflowed page ]]-- function KoptInterface:getTextFromReflowPositions(doc, native_boxes, pos0, pos1) local pageno = pos0.page - local reflowed_page_boxes = self:getReflowedTextBoxesFromScratch(doc, pageno) - local reflowed_box0 = self:getWordFromBoxes(reflowed_page_boxes, pos0) - local reflowed_pos0 = reflowed_box0.box:center() - local native_pos0 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos0) - local reflowed_box1 = self:getWordFromBoxes(reflowed_page_boxes, pos1) - local reflowed_pos1 = reflowed_box1.box:center() - local native_pos1 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos1) + local scratch_reflowed_page_boxes = self:getReflowedTextBoxesFromScratch(doc, pageno) + local reflowed_page_boxes = self:getReflowedTextBoxes(doc, pageno) + + local scratch_reflowed_word_box0 = self:getWordFromBoxes(scratch_reflowed_page_boxes, pos0) + local reflowed_word_box0 = self:getWordFromBoxes(reflowed_page_boxes, pos0) + local scratch_reflowed_word_box1 = self:getWordFromBoxes(scratch_reflowed_page_boxes, pos1) + local reflowed_word_box1 = self:getWordFromBoxes(reflowed_page_boxes, pos1) + + local reflowed_pos_abs0 = scratch_reflowed_word_box0.box:center() + local reflowed_pos_rel0 = getBoxRelativePosition(scratch_reflowed_word_box0.box, reflowed_word_box0.box) + local reflowed_pos_abs1 = scratch_reflowed_word_box1.box:center() + local reflowed_pos_rel1 = getBoxRelativePosition(scratch_reflowed_word_box1.box, reflowed_word_box1.box) + + local native_pos0 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs0, reflowed_pos_rel0) + local native_pos1 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs1, reflowed_pos_rel1) local reflowed_text_boxes = self:getTextFromBoxes(reflowed_page_boxes, pos0, pos1) local native_text_boxes = self:getTextFromBoxes(native_boxes, pos0, pos1) diff --git a/koreader-base b/koreader-base index 2ec1e66a2..730c13093 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit 2ec1e66a21ce6b32435845f9f4f8e5184af2e0a4 +Subproject commit 730c130930e758b3d838687ad03ba9607731d655 From 84ad0f23071c885101d1c5ea58ea9dc40b444321 Mon Sep 17 00:00:00 2001 From: chrox Date: Sat, 30 Nov 2013 21:17:13 +0800 Subject: [PATCH 6/6] fix null export highlight in reflowed mode --- frontend/document/koptinterface.lua | 4 ++-- frontend/ui/reader/readerhighlight.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index 3ecf8b740..a39cefc54 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -787,7 +787,7 @@ function KoptInterface:getTextFromReflowPositions(doc, native_boxes, pos0, pos1) local native_pos1 = self:reflowToNativePosTransform(doc, pageno, reflowed_pos_abs1, reflowed_pos_rel1) local reflowed_text_boxes = self:getTextFromBoxes(reflowed_page_boxes, pos0, pos1) - local native_text_boxes = self:getTextFromBoxes(native_boxes, pos0, pos1) + local native_text_boxes = self:getTextFromBoxes(native_boxes, native_pos0, native_pos1) local text_boxes = { text = native_text_boxes.text, pboxes = native_text_boxes.boxes, -- boxes on page @@ -804,7 +804,7 @@ get text and text boxes from screen positions for native page function KoptInterface:getTextFromNativePositions(doc, native_boxes, pos0, pos1) local native_text_boxes = self:getTextFromBoxes(native_boxes, pos0, pos1) local text_boxes = { - word = native_text_boxes.text, + text = native_text_boxes.text, pboxes = native_text_boxes.boxes, -- boxes on page sboxes = native_text_boxes.boxes, -- boxes on screen pos0 = pos0, diff --git a/frontend/ui/reader/readerhighlight.lua b/frontend/ui/reader/readerhighlight.lua index beb080c5d..fc05a00fe 100644 --- a/frontend/ui/reader/readerhighlight.lua +++ b/frontend/ui/reader/readerhighlight.lua @@ -331,7 +331,7 @@ function ReaderHighlight:saveHighlight() end function ReaderHighlight:exportToClippings(page, item) - DEBUG("export highlight to My Clippings") + DEBUG("export highlight", item) local clippings = io.open("/mnt/us/documents/My Clippings.txt", "a+") if clippings and item.text then local current_locale = os.setlocale()