string changes

Changelog.txt

@@ -329,7 +329,7 @@
 
 :: bug fixes
 
-- [1904310] Windows: Fix calibre portable launcher not working correctly from root directory in calibre 5.5
+- [1904310] Windows: Fix calibre portable launcher not working correctly from root folder in calibre 5.5
 
 - [1904505] macOS: Fix rendering of space after punctuation incorrect in Big Sur
 
@@ -418,7 +418,7 @@
 
 :: new features
 
-- [1900761] Windows: Allow adding of books to calibre from directories whose path length is larger than 260 characters
+- [1900761] Windows: Allow adding of books to calibre from folders whose path length is larger than 260 characters
 
 - Tag browser: Add an option in Preferences->Look & feel->Tag browser to allow the tag browser to get keyboard focus
 
@@ -460,7 +460,7 @@
 
 - [1901957] Conversion: Fix a regression in calibre 5 that broke processing of some PDB files with images.
 
-- [1901278] Conversion: Fix regression in calibre 5 in the handling of @import() rules in stylesheets that import from directories above themselves.
+- [1901278] Conversion: Fix regression in calibre 5 in the handling of @import() rules in stylesheets that import from folders above themselves.
 
 - [1901232 1901230] Content server: Fix various controls on the book details page not working when viewing a random book.
 
@@ -1508,7 +1508,7 @@ If you turn on dark mode under the Windows Settings->Personalisation->Colors and
 
 - [1853232] Viewer: Fix opening .txt files in the standalone viewer leaving behind a temporary index.html file in the folder of the txt file.
 
-- Linux: Make some cache removal code robust against un-decodeable filenames in the cache directories
+- Linux: Make some cache removal code robust against un-decodeable filenames in the cache folders
 
 - [1851933] Viewer: Fix scrolling of panels in preferences causing artifacts.
 
@@ -1752,7 +1752,7 @@ If you turn on dark mode under the Windows Settings->Personalisation->Colors and
 
 - Comments editor: Workaround for Qt converting ids into anchors
 
-- Possible workaround for some Windows machines where the viewer is getting access denied errors while renaming a directory
+- Possible workaround for some Windows machines where the viewer is getting access denied errors while renaming a folder
 
 - Viewer: When there is empty text for an header footer section render it as blank instead of moving the remaining sections to the left
 

manual/conversion.rst

@@ -63,14 +63,14 @@ the various transforms will be applied to the XHTML and then the *Output plugin*
 create the EPUB file, automatically generating all metadata, Table of Contents, et cetera.
 
 You can see this process in action by using the debug option |dbgi|. Just specify the path to
-a directory for the debug output. During conversion, calibre will place the XHTML generated by
+a folder for the debug output. During conversion, calibre will place the XHTML generated by
 the various stages of the conversion pipeline in different sub-folders.
 The four sub-folders are:
 
 .. table:: Stages of the conversion pipeline
 
     ==========    =============
-    Directory     Description
+    Folder        Description
     ==========    =============
     input         This contains the HTML output by the Input plugin. Use this to debug the Input plugin.
     parsed        The result of pre-processing and converting to XHTML the output from the Input plugin. Use to debug structure detection.

manual/customize.rst

@@ -23,14 +23,14 @@ use *plugins* to add functionality to calibre.
 Environment variables
 -----------------------
 
-    * ``CALIBRE_CONFIG_DIRECTORY`` - sets the directory where configuration files are stored/read.
+    * ``CALIBRE_CONFIG_DIRECTORY`` - sets the folder where configuration files are stored/read.
-    * ``CALIBRE_TEMP_DIR`` - sets the temporary directory used by calibre
+    * ``CALIBRE_TEMP_DIR`` - sets the temporary folder used by calibre
-    * ``CALIBRE_CACHE_DIRECTORY`` - sets the directory calibre uses to cache persistent data between sessions
+    * ``CALIBRE_CACHE_DIRECTORY`` - sets the folder calibre uses to cache persistent data between sessions
     * ``CALIBRE_OVERRIDE_DATABASE_PATH`` - allows you to specify the full path to metadata.db. Using this variable you can have metadata.db be in a location other than the library folder. Useful if your library folder is on a networked drive that does not support file locking.
     * ``CALIBRE_DEVELOP_FROM`` - Used to run from a calibre development environment. See :ref:`develop`.
     * ``CALIBRE_OVERRIDE_LANG`` - Used to force the language used by the interface (ISO 639 language code)
     * ``CALIBRE_TEST_TRANSLATION`` - Used to test a translation .po file (should be the path to the .po file)
-    * ``CALIBRE_NO_NATIVE_FILEDIALOGS`` - Causes calibre to not use native file dialogs for selecting files/directories.
+    * ``CALIBRE_NO_NATIVE_FILEDIALOGS`` - Causes calibre to not use native file dialogs for selecting files/folders.
     * ``CALIBRE_NO_NATIVE_MENUBAR`` - Causes calibre to not create a native (global) menu on Ubuntu Unity and similar linux desktop environments. The menu is instead placed inside the window, as is traditional.
     * ``CALIBRE_USE_SYSTEM_THEME`` - By default, on Linux, calibre uses its own
       builtin Qt style. This is to avoid crashes and hangs caused by incompatibilities
@@ -83,7 +83,7 @@ choose to install calibre.
 You should not change the files in this resources folder, as your changes will
 get overwritten the next time you update calibre. Instead, go to
 :guilabel:`Preferences->Advanced->Miscellaneous` and click
-:guilabel:`Open calibre configuration folder`. In this configuration directory, create a
+:guilabel:`Open calibre configuration folder`. In this configuration folder, create a
 sub-folder called resources and place the files you want to override in it.
 Place the files in the appropriate sub folders, for example place images in
 :file:`resources/images`, etc. calibre will automatically use your custom file
@@ -93,7 +93,7 @@ For example, if you wanted to change the icon for the :guilabel:`Remove books`
 action, you would first look in the built-in resources folder and see that the
 relevant file is :file:`resources/images/remove_books.png`. Assuming you have an
 alternate icon in PNG format called :file:`my_remove_books.png` you would save it in
-the configuration directory as :file:`resources/images/remove_books.png`. All the
+the configuration folder as :file:`resources/images/remove_books.png`. All the
 icons used by the calibre user interface are in :file:`resources/images` and
 its sub-folders.
 
@@ -105,7 +105,7 @@ calibre users via calibre's builtin icon theme support, you can easily package
 up your icons into a theme. To do so, go to
 :guilabel:`Preferences->Miscellaneous->Create icon theme`, select the folder
 where you have put your icons (usually the :file:`resources/images` folder in
-the calibre config directory, as described above). Then fill up the theme
+the calibre config folder, as described above). Then fill up the theme
 metadata and click OK.  This will result in a ZIP file containing the theme
 icons. You can upload that to the calibre forum at `Mobileread
 <https://www.mobileread.com/forums/forumdisplay.php?f=166>`_ and then I will

manual/faq.rst

@@ -186,7 +186,7 @@ If your device appears as a USB disk to the operating system, adding support for
 We just need some information from you:
 
   * Complete list of e-book formats that your device supports.
-  * Is there a special directory on the device in which all e-book files should be placed? Also does the device detect files placed in sub-folders?
+  * Is there a special folder on the device in which all e-book files should be placed? Also does the device detect files placed in sub-folders?
   * We also need information about your device that calibre will collect automatically. First, if your
     device supports SD cards, insert them. Then connect your device to the computer. In calibre go to :guilabel:`Preferences->Miscellaneous`
     and click the "Debug device detection" button. This will create some debug output. Copy it to a file
@@ -586,10 +586,10 @@ With all this flexibility, it is possible to have calibre manage your author nam
         * Press OK, at which point calibre will change the authors in all your books. This can take a while.
 
 
-Why doesn't calibre let me store books in my own directory structure?
+Why doesn't calibre let me store books in my own folder structure?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The whole point of calibre's library management features is that they provide a search and sort based interface for locating books that is *much* more efficient than any possible directory scheme you could come up with for your collection. Indeed, once you become comfortable using calibre's interface to find, sort and browse your collection, you wont ever feel the need to hunt through the files on your disk to find a book again. By managing books in its own directory structure of Author -> Title -> Book files, calibre is able to achieve a high level of reliability and standardization. To illustrate why a search/tagging based interface is superior to folders, consider the following. Suppose your book collection is nicely sorted into folders with the following scheme::
+The whole point of calibre's library management features is that they provide a search and sort based interface for locating books that is *much* more efficient than any possible folder scheme you could come up with for your collection. Indeed, once you become comfortable using calibre's interface to find, sort and browse your collection, you wont ever feel the need to hunt through the files on your disk to find a book again. By managing books in its own folder structure of Author -> Title -> Book files, calibre is able to achieve a high level of reliability and standardization. To illustrate why a search/tagging based interface is superior to folders, consider the following. Suppose your book collection is nicely sorted into folders with the following scheme::
 
     Genre -> Author -> Series -> ReadStatus
 
@@ -673,7 +673,7 @@ then import it on another computer. First let's see how to export the data:
     to the previously copied folder. If the computer you are transferring to
     already has a calibre installation, then the :guilabel:`Welcome wizard` wont run. In
     that case, right-click the calibre icon in the toolbar and point it to the
-    newly copied directory. You will now have two calibre libraries on your
+    newly copied folder. You will now have two calibre libraries on your
     computer and you can switch between them by clicking the calibre icon on
     the toolbar. Transferring your library in this manner preserver all your
     metadata, tags, custom columns, etc.
@@ -771,7 +771,7 @@ only TrueType and OpenType (.ttf and .otf) fonts. Most fonts on macOS systems
 are in .dfont format, thus they cannot be embedded. calibre shows only TrueType
 and OpenType fonts found on your system. You can obtain many such fonts on the
 web. Simply download the .ttf/.otf files and add them to the Library/Fonts
-directory in your home directory.
+folder in your home folder.
 
 calibre is not starting on Windows?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -959,7 +959,7 @@ The most important thing to backup is the calibre library folder, that contains
 
 You can switch calibre to using a backed up library folder by simply clicking the calibre icon on the toolbar and choosing your backup library folder. A backed up library folder backs up your custom columns and saved searches as well as all your books and metadata.
 
-If you want to backup the calibre configuration/plugins, you have to backup the config directory. You can find this config directory via :guilabel:`Preferences->Miscellaneous`. Note that restoring configuration directories is not officially supported, but should work in most cases. Just copy the contents of the backup directory into the current configuration directory to restore.
+If you want to backup the calibre configuration/plugins, you have to backup the config folder. You can find this config folder via :guilabel:`Preferences->Miscellaneous`. Note that restoring configuration folders is not officially supported, but should work in most cases. Just copy the contents of the backup folder into the current configuration folder to restore.
 
 How do I use purchased EPUB books with calibre (or what do I do with .acsm files)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

manual/news.rst

@@ -294,7 +294,7 @@ them to the EPUB file :file:`myrecipe.epub`. The ``-vv`` option makes
 ebook-convert spit out a lot of information about what it is doing. The
 :option:`ebook-convert-recipe-input --test` option makes it download only a couple of articles from at most two
 feeds. In addition, ebook-convert will put the downloaded HTML into the
-``debug/input`` directory, where ``debug`` is the directory you specified in
+``debug/input`` folder, where ``debug`` is the folder you specified in
 the :option:`ebook-convert --debug-pipeline` option.
 
 Once the download is complete, you can look at the downloaded :term:`HTML` by opening the file :file:`debug/input/index.html` in a browser. Once you're satisfied that the download and preprocessing is happening correctly, you can generate e-books in different formats as shown below::

manual/server.rst

@@ -233,7 +233,7 @@ computer/user account, you can also manage users using just the command-line.
 
 You can manage user accounts using the ``--manage-users`` option
 to the standalone ``calibre-server`` program. Suppose you want to store
-the user database in the directory ``/srv/calibre``, then you create it
+the user database in the folder ``/srv/calibre``, then you create it
 by running::
 
     calibre-server --userdb /srv/calibre/users.sqlite --manage-users
@@ -364,7 +364,7 @@ based Linux system. Just create the file
     Type=simple
     User=mylinuxuser
     Group=mylinuxgroup
-    ExecStart=/opt/calibre/calibre-server "/path/to/calibre library directory"
+    ExecStart=/opt/calibre/calibre-server "/path/to/calibre library folder"
 
     [Install]
     WantedBy=multi-user.target
@@ -372,9 +372,9 @@ based Linux system. Just create the file
 
 Change ``mylinuxuser`` and ``mylinuxgroup`` to whatever user and group you want
 the server to run as. This should be the same user and group that own the files
-in the calibre library directory. Note that it is generally not a good idea to
+in the calibre library folder. Note that it is generally not a good idea to
 run the server as root. Also change the path to the calibre library
-directory to suit your system. You can add multiple libraries if needed. See
+folder to suit your system. You can add multiple libraries if needed. See
 the help for the ``calibre-server`` command.
 
 Now run::