Merge pull request #1174 from Frenzie/master

Various language-related fixes.

frontend/apps/filemanager/filemanager.lua

@@ -109,7 +109,7 @@ function FileManager:init()
                             local ConfirmBox = require("ui/widget/confirmbox")
                             UIManager:close(self.file_dialog)
                             UIManager:show(ConfirmBox:new{
-                                text = _("Are you sure that you want to delete this file?\n") .. file .. ("\nIf you delete a file, it is permanently lost"),
+                                text = _("Are you sure that you want to delete this file?\n") .. file .. ("\n") .. _("If you delete a file, it is permanently lost."),
                                 ok_callback = function()
                                     deleteFile(file)
                                     self:refreshPath()
@@ -247,6 +247,7 @@ function FileManager:deleteFile(file)
     if rm == 0 then
         UIManager:show(InfoMessage:new{
             text = _("Successfully deleted\n") .. file,
+            timeout = 2,
         })
     else
         UIManager:show(InfoMessage:new{

frontend/apps/filemanager/filemanagersearch.lua

@@ -72,7 +72,7 @@ function Search:getCalibre()
         DEBUG("search Calibre database")
         self.metafile_1 = findcalibre("/mnt")
         if not self.metafile_1 then
-          self.error = "SEARCH_LIBRARY_PATH in DEFAULTS.LUA is not set!"
+          self.error = _("SEARCH_LIBRARY_PATH should be defined in DEFAULTS.LUA.")
         else
           settings_changed = true
         end
@@ -82,7 +82,7 @@ function Search:getCalibre()
         end
         if io.open(SEARCH_LIBRARY_PATH .. calibre,"r") == nil then
             if io.open(SEARCH_LIBRARY_PATH .. "." .. calibre,"r") == nil then
-                self.error = SEARCH_LIBRARY_PATH .. calibre .. " not found!"
+                self.error = SEARCH_LIBRARY_PATH .. calibre .. " " .. _("not found.")
                 DEBUG(self.error)
             else
                 self.metafile_1 = SEARCH_LIBRARY_PATH .. "." .. calibre
@@ -207,7 +207,7 @@ function Search:ShowSearch()
         UIManager:show(self.search_dialog)
     else
         if self.error then
-            UIManager:show(InfoMessage:new{text = self.error .. _( " A search for a " .. calibre .. " file was not successful!"),})
+            UIManager:show(InfoMessage:new{text = self.error .. ("\n") .. _( "Unable to find a calibre metadata file."),})
         end
     end
 

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 not work until the next restart. Be careful; the wrong settings might crash KOReader!\nAre you sure you want to continue?"),
             ok_callback = function()
                 self.EditConfirmed = true
                 self:init()

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 = _("Enter word to look up"),
+            title = _("Enter a word to look up"),
             type = "text",
             callback = function(input)
                 self:onLookupWord(input)