string changes

manual/conversion.rst

@@ -64,8 +64,8 @@ create the EPUB file, automatically generating all metadata, Table of Contents,
 
 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
-the various stages of the conversion pipeline in different sub-directories.
+the various stages of the conversion pipeline in different sub-folders.
-The four sub-directories are:
+The four sub-folders are:
 
 .. table:: Stages of the conversion pipeline
 
@@ -79,7 +79,7 @@ The four sub-directories are:
     ==========    =============
 
 If you want to edit the input document a little before having calibre convert it, the best thing to
-do is edit the files in the :file:`input` sub-directory, then zip it up, and use the ZIP file as the
+do is edit the files in the :file:`input` sub-folder, then zip it up, and use the ZIP file as the
 input format for subsequent conversions. To do this use the :guilabel:`Edit meta information` dialog
 to add the ZIP file as a format for the book and then, in the top left corner of the conversion dialog,
 select ZIP as the input format.
@@ -206,7 +206,7 @@ options. Instead add the following CSS code to :ref:`Extra CSS <extra-css>`::
 
 Then, in your source document, mark the paragraphs that need spacing with `class="spacious"`.
 If your input document is not in HTML, use the Debug option, described in the Introduction to get HTML
-(use the :file:`input` sub-directory).
+(use the :file:`input` sub-folder).
 
 Another useful options is :guilabel:`Linearize tables`.  Some badly designed
 documents use tables to control the layout of text on the page.  When converted

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-directories?
+  * 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?
   * 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

src/calibre/customize/builtins.py

@@ -21,7 +21,7 @@ class PML2PMLZ(FileTypePlugin):
     name = 'PML to PMLZ'
     author = 'John Schember'
     description = _('Create a PMLZ archive containing the PML file '
-        'and all images in the directory pmlname_img or images. '
+        'and all images in the folder pmlname_img or images. '
         'This plugin is run every time you add '
         'a PML file to the library.')
     version = numeric_version

src/calibre/customize/ui.py

@@ -763,7 +763,7 @@ def option_parser():
     parser.add_option('-a', '--add-plugin', default=None,
                       help=_('Add a plugin by specifying the path to the ZIP file containing it.'))
     parser.add_option('-b', '--build-plugin', default=None,
-            help=_('For plugin developers: Path to the directory where you are'
+            help=_('For plugin developers: Path to the folder where you are'
                 ' developing the plugin. This command will automatically zip '
                 'up the plugin and update it in calibre.'))
     parser.add_option('-r', '--remove-plugin', default=None,

src/calibre/devices/usbms/deviceconfig.py

@@ -65,7 +65,7 @@ class DeviceConfig(object):
         c.add_opt('format_map', default=cls.FORMATS,
                 help=_('Ordered list of formats the device will accept'))
         c.add_opt('use_subdirs', default=cls.SUPPORTS_SUB_DIRS_DEFAULT,
-                help=_('Place files in sub-directories if the device supports them'))
+                help=_('Place files in sub-folders if the device supports them'))
         c.add_opt('read_metadata', default=True,
                 help=_('Read metadata from files on device'))
         c.add_opt('use_author_sort', default=False,

src/calibre/devices/usbms/driver.py

@@ -342,7 +342,7 @@ class USBMS(CLI, Device):
         '''
         Upload book cover to the device. Default implementation does nothing.
 
-        :param path: The full path to the directory where the associated book is located.
+        :param path: The full path to the folder where the associated book is located.
         :param filename: The name of the book file without the extension.
         :param metadata: metadata belonging to the book. Use metadata.thumbnail
                          for cover

src/calibre/ebooks/metadata/opf2.py

@@ -1362,7 +1362,7 @@ class OPFCreator(Metadata):
     def __init__(self, base_path, other):
         '''
         Initialize.
-        @param base_path: An absolute path to the directory in which this OPF file
+        @param base_path: An absolute path to the folder in which this OPF file
         will eventually be. This is used by the L{create_manifest} method
         to convert paths to files into relative paths.
         '''

src/calibre/ebooks/oeb/polish/check/links.py

@@ -333,7 +333,7 @@ def check_links(container):
                             # or the link is a directory
                             apath = container.name_to_abspath(tname)
                             if os.path.isdir(apath):
-                                a(BadLink(_('The linked resource %s is a directory') % fl(href), name, lnum, col))
+                                a(BadLink(_('The linked resource %s is a folder') % fl(href), name, lnum, col))
                             else:
                                 a(CaseMismatch(href, actual_case_for_name(container, tname), name, lnum, col))
                     else:

src/calibre/ebooks/oeb/polish/container.py

@@ -226,7 +226,7 @@ class Container(ContainerBase):  # {{{
     opf file. There are two important concepts:
 
         * The root folder. This is the base of the e-book. All the e-books
-          files are inside this directory or in its sub-directories.
+          files are inside this folder or in its sub-folders.
 
         * Names: These are paths to the books' files relative to the root
           directory. They always contain POSIX separators and are unquoted. They
@@ -402,7 +402,7 @@ class Container(ContainerBase):  # {{{
 
     def rename(self, current_name, new_name):
         ''' Renames a file from current_name to new_name. It automatically
-        rebases all links inside the file if the directory the file is in
+        rebases all links inside the file if the folder the file is in
         changes. Note however, that links are not updated in the other files
         that could reference this file. This is for performance, such updates
         should be done once, in bulk. '''

src/calibre/ebooks/tweak.py

@@ -143,7 +143,7 @@ def implode(output_dir, ebook_file):
         with lopen(efmt_path, 'rb') as f:
             efmt = f.read()
     except Exception:
-        raise SystemExit('The directory %s does not seem to have been created by --explode-book' % output_dir)
+        raise SystemExit('The folder %s does not seem to have been created by --explode-book' % output_dir)
     if efmt != fmt:
         raise SystemExit('You must use the same format of file as was used when exploding the book')
     os.remove(efmt_path)

src/calibre/gui2/actions/add.py

@@ -59,7 +59,7 @@ class AddAction(InterfaceAction):
         self._add_filesystem_book = self.Dispatcher(self.__add_filesystem_book)
         self.add_menu = self.qaction.menu()
         ma = partial(self.create_menu_action, self.add_menu)
-        ma('recursive-add', _('Add from directories and sub-directories')).triggered.connect(self.add_recursive_question)
+        ma('recursive-add', _('Add from folders and sub-folders')).triggered.connect(self.add_recursive_question)
         ma('archive-add-book', _('Add multiple books from archive (ZIP/RAR)')).triggered.connect(self.add_from_archive)
         self.add_menu.addSeparator()
         ma('add-empty', _('Add empty book (Book entry with no formats)'),

src/calibre/gui2/convert/debug.py

@@ -48,7 +48,7 @@ class DebugWidget(Widget, Ui_Form):
         except:
             import traceback
             det_msg = traceback.format_exc()
-            error_dialog(self, _('Invalid debug directory'),
+            error_dialog(self, _('Invalid debug folder'),
                     _('Failed to create debug directory')+': '+ unicode_type(self.opt_debug_pipeline.text()),
                         det_msg=det_msg, show=True)
             return False

src/calibre/gui2/device_drivers/configwidget.ui

@@ -89,7 +89,7 @@
       <string>If checked, books are placed into sub-folders based on their metadata on the device. If unchecked, books are all put into the top level folder.</string>
      </property>
      <property name="text">
-      <string>Use sub-directories</string>
+      <string>Use sub-folders</string>
      </property>
     </widget>
    </item>

src/calibre/gui2/device_drivers/tabbed_device_config.py

@@ -89,8 +89,8 @@ class TabbedDeviceConfig(QTabWidget):
             self.formats.hide()
 
         self.opt_use_subdirs = create_checkbox(
-                                           _("Use sub-directories"),
+                                           _("Use sub-folders"),
-                                           _('Place files in sub-directories if the device supports them'),
+                                           _('Place files in sub-folders if the device supports them'),
                                            device_settings.use_subdirs
                                            )
         self.opt_read_metadata = create_checkbox(