Merge pull request #1141 from Frenzie/master

Minor English improvements.

frontend/apps/filemanager/filemanagersetdefaults.lua

@@ -47,7 +47,7 @@ end
 function SetDefaults:ConfirmEdit()
     if not SetDefaults.EditConfirmed then
         UIManager:show(ConfirmBox:new{
-            text = _("Some changes will just work on the next restart. Wrong settings might crash Koreader! Continue?"),
+            text = _("Some changes will just work on the next restart. Wrong settings might crash KOReader! Continue?"),
             ok_callback = function()
                 self.EditConfirmed = true
                 self:init()
@@ -277,7 +277,7 @@ end
 
 function SetDefaults:ConfirmSave()
     UIManager:show(ConfirmBox:new{
-        text = _("Are you sure to save the settings to \"defaults.persistent.lua\"?"),
+        text = _("Are you sure you want to save the settings to \"defaults.persistent.lua\"?"),
         ok_callback = function()
             self:SaveSettings()
         end,
@@ -353,7 +353,7 @@ function SetDefaults:SaveSettings()
         file:write(dpl[i] .. "\n")
     end
     file:close()
-    UIManager:show(InfoMessage:new{text = _("Default settings successfully saved!")})
+    UIManager:show(InfoMessage:new{text = _("Default settings were saved successfully!")})
     settings_changed = false
 end
 return SetDefaults

frontend/apps/reader/modules/readerdictionary.lua

@@ -17,7 +17,7 @@ function ReaderDictionary:addToMainMenu(tab_item_table)
     table.insert(tab_item_table.plugins, {
         text = _("Dictionary lookup"),
         tap_input = {
-            title = _("Input word to lookup"),
+            title = _("Enter word to look up"),
             type = "text",
             callback = function(input)
                 self:onLookupWord(input)

frontend/apps/reader/modules/readergoto.lua

@@ -7,7 +7,7 @@ local DEBUG = require("dbg")
 local _ = require("gettext")
 
 local ReaderGoto = InputContainer:new{
-    goto_menu_title = _("Go To"),
+    goto_menu_title = _("Go to"),
     goto_dialog_title = _("Go to Page or Location"),
 }
 

frontend/ui/language.lua

@@ -10,7 +10,7 @@ function Language:changeLanguage(lang_locale)
     _.changeLang(lang_locale)
     G_reader_settings:saveSetting("language", lang_locale)
     UIManager:show(InfoMessage:new{
-        text = _("Please restart reader for new language setting to take effect."),
+        text = _("Please restart KOReader for the new language setting to take effect."),
         timeout = 3,
     })
 end

frontend/ui/networkmgr.lua

@@ -56,7 +56,7 @@ end
 
 function NetworkMgr:promptWifiOn()
     UIManager:show(ConfirmBox:new{
-        text = _("Do you want to Turn on Wifi?"),
+        text = _("Do you want to turn on Wifi?"),
         ok_callback = function()
             self:turnOnWifi()
         end,
@@ -65,7 +65,7 @@ end
 
 function NetworkMgr:promptWifiOff()
     UIManager:show(ConfirmBox:new{
-        text = _("Do you want to Turn off Wifi?"),
+        text = _("Do you want to turn off Wifi?"),
         ok_callback = function()
             self:turnOffWifi()
         end,

frontend/ui/otamanager.lua

@@ -106,7 +106,7 @@ function OTAManager:fetchAndProcessUpdate()
     local ota_version = OTAManager:checkUpdate()
     if ota_version == 0 then
         UIManager:show(InfoMessage:new{
-            text = _("Your koreader is updated."),
+            text = _("Your KOReader is up to date."),
         })
     elseif ota_version == nil then
         UIManager:show(InfoMessage:new{
@@ -123,11 +123,11 @@ function OTAManager:fetchAndProcessUpdate()
                 UIManager:scheduleIn(1, function()
                     if OTAManager:zsync() == 0 then
                         UIManager:show(InfoMessage:new{
-                            text = _("Koreader will be updated on next restart."),
+                            text = _("KOReader will be updated on next restart."),
                         })
                     else
                         UIManager:show(ConfirmBox:new{
-                            text = _("Error updating Koreader. Would you like to delete temporary files?"),
+                            text = _("Error updating KOReader. Would you like to delete temporary files?"),
                             ok_callback = function()
                                 os.execute("rm ota/ko*")
                             end,
@@ -191,7 +191,7 @@ function OTAManager:getOTAMenuTable()
         text = _("OTA update"),
         sub_item_table = {
             {
-                text = _("Check update"),
+                text = _("Check for update"),
                 callback = function()
                     if NetworkMgr:getWifiStatus() == false then
                         NetworkMgr:promptWifiOn()

plugins/calibrecompanion.koplugin/main.lua

@@ -114,9 +114,9 @@ function CalibreCompanion:initCalibreMQ(host, port)
         self.calibre_socket:start()
         self.calibre_messagequeue = UIManager:insertZMQ(self.calibre_socket)
     end
-    DEBUG("connected to Calibre", host, port)
+    DEBUG("connected to calibre", host, port)
     UIManager:show(InfoMessage:new{
-        text = _("Connected to Calibre server at ") .. host .. ":" .. port,
+        text = _("Connected to calibre server at ") .. host .. ":" .. port,
         timeout = 1,
     })
 end
@@ -145,16 +145,16 @@ function CalibreCompanion:connect()
             self:setInboxDir(host, port)
         end
     else
-        DEBUG("cannot connect to calibre")
+        DEBUG("cannot connect to calibre server")
         UIManager:show(InfoMessage:new{
-            text = _("Cannot connect to Calibre."),
+            text = _("Cannot connect to calibre server."),
         })
         return
     end
 end
 
 function CalibreCompanion:disconnect()
-    DEBUG("disconnect from Calibre")
+    DEBUG("disconnect from calibre")
     self.calibre_socket:stop()
     UIManager:removeZMQ(self.calibre_messagequeue)
     self.calibre_socket = nil

plugins/evernote.koplugin/main.lua

@@ -149,7 +149,7 @@ function EvernoteExporter:login()
                         end)
 
                         UIManager:show(InfoMessage:new{
-                            text = _("Logging in please wait..."),
+                            text = _("Logging in. Please wait..."),
                             timeout = 1,
                         })
                     end,