From 17129915f9d6fd13ee5f982be1d36f378106e0b0 Mon Sep 17 00:00:00 2001 From: hius07 <62179190+hius07@users.noreply.github.com> Date: Sun, 28 Mar 2021 14:35:56 +0300 Subject: [PATCH] Standardize directory/folder to folder (#7410) Follow-up to https://github.com/koreader/koreader/pull/7328 --- frontend/apps/cloudstorage/dropboxapi.lua | 2 +- frontend/ui/screensaver.lua | 2 +- frontend/ui/widget/dictquicklookup.lua | 2 +- plugins/coverimage.koplugin/main.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/apps/cloudstorage/dropboxapi.lua b/frontend/apps/cloudstorage/dropboxapi.lua index ace2b8902..6532009ff 100644 --- a/frontend/apps/cloudstorage/dropboxapi.lua +++ b/frontend/apps/cloudstorage/dropboxapi.lua @@ -128,7 +128,7 @@ function DropBoxApi:listFolder(path, token, folder_mode) -- Add special folder. if folder_mode then table.insert(dropbox_list, 1, { - text = _("Long-press to select current directory"), + text = _("Long-press to select current folder"), url = path, type = "folder_long_press", }) diff --git a/frontend/ui/screensaver.lua b/frontend/ui/screensaver.lua index 2f62cc6e3..6097c75b4 100644 --- a/frontend/ui/screensaver.lua +++ b/frontend/ui/screensaver.lua @@ -203,7 +203,7 @@ function Screensaver:chooseFolder() logger.dbg("set screensaver directory to", path) G_reader_settings:saveSetting("screensaver_dir", path) UIManager:show(InfoMessage:new{ - text = T(_("Screensaver directory set to:\n%1"), BD.dirpath(path)), + text = T(_("Screensaver folder set to:\n%1"), BD.dirpath(path)), timeout = 3, }) end, diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index 885fb23da..116c365fa 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -367,7 +367,7 @@ function DictQuickLookup:init() or require("apps/filemanager/filemanagerutil").getDefaultDir() end if not dir or not util.pathExists(dir) then UIManager:show(InfoMessage:new{ - text = _("No directory to save article to could be found."), + text = _("No folder to save article to could be found."), }) return end diff --git a/plugins/coverimage.koplugin/main.lua b/plugins/coverimage.koplugin/main.lua index 1eccc6870..1d5bb8e10 100644 --- a/plugins/coverimage.koplugin/main.lua +++ b/plugins/coverimage.koplugin/main.lua @@ -27,7 +27,7 @@ local function pathOk(filename) elseif name == "" then return false, _("Please enter a filename at the end of the path.") elseif lfs.attributes(filename, "mode") == "directory" then - return false, T(_("The path \"%1\" must point to a file, but it points to a directory."), filename) + return false, T(_("The path \"%1\" must point to a file, but it points to a folder."), filename) end return true