Merge pull request #698 from chrox/master

display 2 pages side-by-side in landscape for screen height larger than 7 inches

frontend/apps/reader/modules/readerfont.lua

@@ -220,7 +220,7 @@ end
 function ReaderFont:makeDefault(face)
     if face then
         UIManager:show(ConfirmBox:new{
-            text = _("Set default font \"")..face.."\"?",
+            text = _("Set default font to ")..face.."?",
             ok_callback = function()
                 G_reader_settings:saveSetting("cre_font", face)
             end,

frontend/apps/reader/modules/readerzooming.lua

@@ -335,7 +335,7 @@ end
 
 function ReaderZooming:makeDefault(zoom_mode)
     UIManager:show(ConfirmBox:new{
-        text = _("Set default zoom mode to \"")..zoom_mode.."\"?",
+        text = _("Set default zoom mode to ")..zoom_mode.."?",
         ok_callback = function()
             G_reader_settings:saveSetting("zoom_mode", zoom_mode)
         end,

frontend/document/credocument.lua

@@ -121,7 +121,7 @@ function CreDocument:loadDocument()
     if not self.info.has_pages then
         self.info.doc_height = self._document:getFullHeight()
     end
-    if Device:getModel() ~= "KindleDXG" then
+    if math.max(Screen:getWidth(), Screen:getHeight())/Screen:getDPI() < 7 then
         self:setVisiblePageCount(1)
     end
 end

frontend/ui/widget/configdialog.lua

@@ -577,7 +577,7 @@ end
 
 function ConfigDialog:onMakeDefault(name, name_text, values, labels, position)
     UIManager:show(ConfirmBox:new{
-        text = _("Set default ")..(name_text or "").." to "..labels[position].."?",
+        text = _("Set default ")..(name_text or "").._(" to ")..labels[position].."?",
         ok_callback = function()
             local name = self.config_options.prefix.."_"..name
             G_reader_settings:saveSetting(name, values[position])