From 6257bae77f0719021b3becc2a00f0454a50cea1a Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Tue, 31 Jan 2017 13:53:20 +0100 Subject: [PATCH] Language: mostly Wikipedia-related changes --- frontend/ui/widget/dictquicklookup.lua | 6 +++--- frontend/ui/wikipedia.lua | 16 ++++++++-------- plugins/evernote.koplugin/main.lua | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index c3772b36b..55a57fd21 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -268,13 +268,13 @@ function DictQuickLookup:update() if not dir then dir = G_reader_settings:readSetting("lastdir") end if not dir then UIManager:show(InfoMessage:new{ - text = _("No directory to save page to !"), + text = _("No directory to save the page to could be found."), }) return end local epub_path = dir .. "/" .. filename UIManager:show(ConfirmBox:new{ - text = T(_("Save as %1 ?"), filename), + text = T(_("Save as %1?"), filename), ok_callback = function() UIManager:scheduleIn(0.1, function() local Wikipedia = require("ui/wikipedia") @@ -298,7 +298,7 @@ function DictQuickLookup:update() }) else UIManager:show(InfoMessage:new{ - text = _("Failed saving Wikipedia page."), + text = _("Saving Wikipedia page failed."), }) end end) diff --git a/frontend/ui/wikipedia.lua b/frontend/ui/wikipedia.lua index 498b36301..3430f5dc6 100644 --- a/frontend/ui/wikipedia.lua +++ b/frontend/ui/wikipedia.lua @@ -392,12 +392,12 @@ function Wikipedia:createEpub(epub_path, page, lang, with_images, progress_callb if with_images then -- if no progress_callback (non UI), our fake one will return true if #images > 0 then - include_images = progress_callback(T(_("Page contains %1 images.\nWould you like to download and include them in epub ?"), #images), true) + include_images = progress_callback(T(_("The page contains %1 images.\nWould you like to download and include them in the generated EPUB file?"), #images), true) if include_images then - use_img_2x = progress_callback(_("Would you like to get slightly higher quality images (but bigger file size) ?"), true) + use_img_2x = progress_callback(_("Would you like to use slightly higher quality images? This will result in a bigger file size."), true) end else - progress_callback(_("Page contains no image.")) + progress_callback(_("The page does not contain any images.")) util.sleep(1) -- Let the user see that end end @@ -669,7 +669,7 @@ time, abbr, sup { -- -- Also, crengine deals strangely with percent encoded utf8 : -- if the link in the html is : - -- we get from credocument:getLinkFromPosition() : http://fr.wikipedia.org/wiki/Françoix + -- we get from credocument:getLinkFromPosition() : http://fr.wikipedia.org/wiki/Fran____oix -- These are bytes "\xc3\x83\xc2\xa7", that is U+C3 and U+A7 encoded as UTF8, -- when we should have get "\xc3\xa7" ... -- We can avoid that by putting in the url plain unencoded UTF8 @@ -681,7 +681,7 @@ time, abbr, sup { html = html:gsub([[href="/wiki/([^"]*)"]], fixEncodedWikiPageTitle) -- Remove href from links to non existant wiki page so they are not clickable : - -- PageTitle©on + -- PageTitle____on -- (removal of the href="" will make them non clickable) html = html:gsub([[]* class="new"[^>]*>]], [[]]) @@ -757,7 +757,7 @@ time, abbr, sup { if success then epub:add("OEBPS/"..img.imgpath, content) else - local go_on = progress_callback(T(_("Failed getting image %1, continue anyway ?"), inum), true) + local go_on = progress_callback(T(_("Downloading image %1 failed. Continue anyway?"), inum), true) if not go_on then cancelled = true break @@ -768,9 +768,9 @@ time, abbr, sup { -- Done with adding files if cancelled then - progress_callback(_("Cleaning up...")) + progress_callback(_("Cleaning up…")) else - progress_callback(_("Packing epub...")) + progress_callback(_("Packing EPUB…")) end epub:close() -- This was nearly a no-op, so sleep a bit to make that progress step seen diff --git a/plugins/evernote.koplugin/main.lua b/plugins/evernote.koplugin/main.lua index 49c401a9f..43953fa4a 100644 --- a/plugins/evernote.koplugin/main.lua +++ b/plugins/evernote.koplugin/main.lua @@ -163,7 +163,7 @@ function EvernoteExporter:addToMainMenu(tab_item_table) callback = function() self.config:purge() UIManager:show(InfoMessage:new{ - text = _("History records are purged.\nAll notes will be exported again next time.\nSuggest to remove existing KOReaderClipping.txt to avoid a duplication."), + text = _("History records have been purged.\nAll notes will be exported again next time.\nIt is recommended to remove the existing KOReaderClipping.txt file to avoid duplication."), }) end }