Git commit dac374172e85177c6390344616d23eb1c6ec3600 by Burkhard L?ck, on behalf 
of David Palser.
Committed on 09/08/2013 at 15:07.
Pushed by lueck into branch 'KDE/4.11'.

Fix typos and puctuation in docs
(cherry picked from commit af0ef6c522118c7b5a46126b0cabe305d007e5b7)
backport to 4.11.1

M  +57   -57   doc/dolphin/index.docbook
M  +6    -6    doc/konqueror/index.docbook

http://commits.kde.org/kde-baseapps/dac374172e85177c6390344616d23eb1c6ec3600

diff --git a/doc/dolphin/index.docbook b/doc/dolphin/index.docbook
index 038f0ab..318d44f 100644
--- a/doc/dolphin/index.docbook
+++ b/doc/dolphin/index.docbook
@@ -103,7 +103,7 @@ used for file management, is a universal viewer for many 
file types.
 </para>
 
 <para>
-This development approach allows for concentrating on optimizing the user
+This design approach allows the developers to concentrate on optimizing the 
user
 interface for the specific task of file management.
 </para>
 
@@ -166,7 +166,7 @@ from the main menu.
 </textobject>
 <caption>
 <para>
-Toolbar items where the icon is sufficient for knowing the command do not have 
a text
+Toolbar items where the icon is sufficient for knowing the command do not have 
text
 alongside the icons. This can be changed by a &RMB; click and selecting the 
item text 
 below <guilabel>Show Text</guilabel>. The <guibutton>Control</guibutton> 
 button at the right side of the toolbar is only displayed if the menubar is 
hidden.
@@ -193,14 +193,14 @@ provides quick access to bookmarked locations and disks 
or other media.
 </para>
 <para>If desktop search and file indexing are enabled in the <guilabel>Desktop 
Search</guilabel> 
 module in the &systemsettings; the panel provides <guilabel>Recently 
Accessed</guilabel> 
-items and allows to search for <guilabel>Documents</guilabel>, 
<guilabel>Images</guilabel>, 
+items and allows you to search for <guilabel>Documents</guilabel>, 
<guilabel>Images</guilabel>,
 <guilabel>Audio Files</guilabel> and <guilabel>Video</guilabel>.
 </para></listitem>
 
 <listitem><para>
 The status bar. It displays the name, size and type of the file which is
-currently hovered with the mouse, or the number and size of the files which are
-selected. At the right, there is a zoom slider that permits to adjust the size
+currently hovered over with the mouse, or the number and size of the files 
which are
+selected. At the right, there is a zoom slider that allows you to adjust the 
size
 of the icons in the view.
 </para></listitem>
 
@@ -257,7 +257,7 @@ If the &LMB; is pressed on an item, but not immediately 
released, the item can
 be dragged and dropped in another folder in the current view or in another
 &dolphin; view (in another &dolphin; window or in the same window if the
 view is split, see below) to move or copy it or to create a symbolic link.
-Items can even be dropped in another application to open them in this 
application.
+Items can even be dropped in another application to open them in that 
application.
 </para></listitem>
 
 </itemizedlist>
@@ -309,8 +309,8 @@ The buttons in the toolbar which control the appearance of 
the view.
 </screenshot>
 
 <para>
-All the settings discussed below and other options concerning, &eg;, the
-sorting of the files in the current folder can also be modified in the
+All the settings discussed below and other options concerning, &eg; the
+sorting of the files in the current folder, can also be modified in the
 <guimenu>View</guimenu> menu and in the
 <link linkend="view-properties-dialog">View Properties dialog</link>. By
 default, these settings are remembered for each folder separately. This
@@ -330,8 +330,8 @@ view modes.
 <listitem><para>
 In the <guibutton>Icons</guibutton> view, which is the default, files will be
 represented by an icon that visualizes the file type, and a folder icon will be
-shown for subfolders. The names of folders and files and the items enabled in
-<menuchoice><guimenu>View</guimenu><guisubmenu>Additional 
Information</guisubmenu></menuchoice> 
+shown for subfolders. The names of folders and files, and the items enabled in
+<menuchoice><guimenu>View</guimenu><guisubmenu>Additional 
Information</guisubmenu></menuchoice>,
 are displayed below the icons.
 </para></listitem>
 
@@ -358,11 +358,11 @@ the extension is replaced by <quote>...</quote>
 the <guilabel>Name</guilabel> header, which is always the first column in this 
view.
 </para>
 <para>
-The details view permits to view the current directory
+The details view allows you to view the current directory
 in a tree-like fashion if <link linkend="preferences-dialog-viewmodes-details">
 <guilabel>Expandable folders</guilabel></link> are enabled: 
 Each subfolder of the current folder can be
-<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the 
<guiicon>&lt;</guiicon> 
+<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the 
<guiicon>&gt;</guiicon>
 or <guiicon>v</guiicon> icon next to it.</para></listitem>
 </itemizedlist>
 </para>
@@ -399,7 +399,7 @@ more information for each item to be shown:
 <guimenuitem>Tags</guimenuitem> or <guimenuitem>Comment</guimenuitem>.
 </para>
 
-<para>Depending on the file type additionally sorting criteria can be selected:
+<para>Depending on the file type, additionally, sorting criteria can be 
selected:
 <simplelist>
   <member><guimenuitem>Document</guimenuitem>: Number of words and 
lines</member>
   <member><guimenuitem>Image</guimenuitem>: Size and orientation</member>
@@ -407,7 +407,7 @@ more information for each item to be shown:
 </simplelist>
 </para>
 
-<para>The <guisubmenu>Other</guisubmenu> submenu allows to select 
+<para>The <guisubmenu>Other</guisubmenu> submenu allows you to select
 <guimenuitem>Path</guimenuitem>, <guimenuitem>Link Destination</guimenuitem>, 
 <guimenuitem>Copied From</guimenuitem>,
 <guimenuitem>Permissions</guimenuitem>, <guimenuitem>Owner</guimenuitem> or 
@@ -421,7 +421,7 @@ more information for each item to be shown:
 
 <para>
 If <guibutton>Preview</guibutton> is enabled, the icons are based on the actual
-file or folder contents. E.g., for images a scaled down preview of the image is
+file or folder contents; &eg; for images a scaled down preview of the image is
 shown.
 </para>
 
@@ -481,7 +481,7 @@ If <guilabel>Show selection marker</guilabel> is enabled in 
the
 <link linkend="preferences-dialog-general-behavior"><quote>Behavior</quote>
 tab of the <guilabel>General</guilabel> section of the settings</link>, a small
 <guiicon>+</guiicon> or <guiicon>-</guiicon> button appears in the top
-left corner of the item which is currently hovered with the mouse. Clicking
+left corner of the item which is currently hovered over with the mouse. 
Clicking
 this sign selects or deselects the item, respectively.
 </para></listitem>
 
@@ -546,7 +546,7 @@ has all features from dolphin ?-->
 <title>Location Bar</title>
 
 <para>
-The location bar, which can be found on top of &dolphin;'s view, displays
+The location bar, which can be found above &dolphin;'s view, displays
 the path to the current folder. The location bar has two modes.
 </para>
 
@@ -557,7 +557,7 @@ the path to the current folder. The location bar has two 
modes.
 In the <quote>bread crumb</quote> mode, which is the default, each folder name 
in
 the path to the current folder is a button which can be clicked to quickly open
 that folder. Moreover, clicking the <quote>&gt;</quote> sign to the right of a
-folder opens a menu which permits to quickly open a subfolder of that folder.
+folder opens a menu which allows you to quickly open a subfolder of that 
folder.
 </para>
 
 <screenshot>
@@ -579,7 +579,7 @@ folder opens a menu which permits to quickly open a 
subfolder of that folder.
 <title>Editable Mode</title>
 
 <para>
-When in bread crumb mode, clicking in the grey area to the right of the path
+When in bread crumb mode, clicking in the gray area to the right of the path
 with the &LMB; switches the location bar to the <quote>editable</quote> mode,
 in which the path can be edited using the keyboard. To switch back to bread
 crumb mode, click the check mark at the right of the location bar with the 
&LMB;.
@@ -625,7 +625,7 @@ menu which offers quick access to <quote>places</quote> and 
storage media. See t
 </mediaobject>
 </screenshot>
 
-<para>The context menu of the location bar offers action to switch between the 
modes and 
+<para>The context menu of the location bar offers actions to switch between 
the modes and
 to copy and paste the path using the clipboard. Check the last option in this 
context menu to
 display either the full path starting with the root folder of the file system 
or to display 
 the path starting with the current places entry.
@@ -666,7 +666,7 @@ context menu Icon Size? No different entries ?-->
 The <guilabel>Places</guilabel> panel is located at the left of the window by
 default. The <guilabel>Places</guilabel> panel shows any locations you have
 bookmarked. It also shows any disk or media attached to the computer, recently 
accessed items
-and allows to search for certain type of files. The order of these entries can 
be changed by drag and drop.
+and allows you to search for certain type of files. The order of these entries 
can be changed by drag and drop.
 </para>
 
 <para>
@@ -683,7 +683,7 @@ can be restricted to &dolphin;.
 and change the icon size to one of the predefined values or lock/unlock the 
panels.
 </para>
 <para>The context menu has an action to open the entry in a new tab. 
-Devices can be unmounted from the context menu.
+Devices can be unmounted using the context menu.
 </para>
 </sect2>
 
@@ -692,9 +692,9 @@ Devices can be unmounted from the context menu.
 
 <para>
 The <guilabel>Information</guilabel> panel shows extended information about the
-selected items(s) or about of the current folder or the file which is 
currently hovered
-with the mouse, including size, type, and date of last modification. It also
-features a large preview of the selected item and permits to assign a rating,
+selected items(s) or about the current folder or the file which is currently 
hovered
+over with the mouse, including size, type, and date of last modification. It 
also
+features a large preview of the selected item and allows you to assign a 
rating,
 tags, and comments to it.
 </para>
 
@@ -739,7 +739,7 @@ The following are a number of tips to save time when using 
&dolphin;.
 
 <para>
 To quickly create a bookmark in the <guilabel>Places</guilabel> panel for the
-current folder, right click in the work space and click
+current folder, &RMB; click in the work space and click
 <menuchoice><guimenuitem>Add to Places</guimenuitem></menuchoice> in the 
context menu.
 </para>
 
@@ -769,8 +769,8 @@ Start to type into the find input box and the search starts 
immediately.
 <para>The search is case insensitive, and does not require surrounding 
wildcards 
 (<userinput>*foo*</userinput> and <userinput>foo</userinput> are equivalent), 
 but you can use wildcards inside the search term. <userinput>*</userinput> 
will match 
-one or more characters, <userinput>?</userinput> only one single 
character.</para>
-<para>This feature can be used with running nepomuk/strigi services, without 
these services 
+zero or more characters, <userinput>?</userinput> only one single 
character.</para>
+<para>This feature can be used with running Nepomuk/Strigi services; without 
these services
 a KIOSlave is launched to provide the search results.</para>
 <para>The option from <guilabel>Everywhere</guilabel> with activated 
Nepomuk/Strigi 
 services searches in all indexed folders, without Nepomuk/Strigi this option  
@@ -853,7 +853,7 @@ character is replaced by a different consecutive number for 
each file.
 <para>If all file extensions in your selection are different, the name of all 
files 
 can be changed without using a <userinput>#</userinput> placeholder while 
preserving 
 the file extensions. This is &eg; useful to rename a video file and all 
associated 
-subtitle files, which use to have the same filename, but different extensions.
+subtitle files, which have the same filename, but different extensions.
 </para>
 </sect2>
 
@@ -877,7 +877,7 @@ via the Tools menu: <menuchoice> <guimenu>Tools</guimenu> 
<guimenuitem>Compare F
 <title>Filtering Files</title>
 
 <para>
-&dolphin; is capable of filtering files, &ie;, showing only those items in the
+&dolphin; is capable of filtering files, &ie; showing only those items in the
 view whose name contains a given text. For example, if you wish to show
 only the <acronym>MP3</acronym> files within a folder, you could filter for 
<quote>.mp3</quote>.
 This would then filter out all files whose name does not contain 
<quote>.mp3</quote>.
@@ -886,7 +886,7 @@ This would then filter out all files whose name does not 
contain <quote>.mp3</qu
 <para>
 To filter files, first enable the filter bar, either by pressing <keycombo 
action="simul">&Ctrl;<keycap>I</keycap></keycombo>
 or via the menu: <menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Show 
Filter Bar</guimenuitem> </menuchoice>.
-You can then enter the text to be filtered in the filter bar. The filter bar 
can
+You can then enter the text to be filtered for in the filter bar. The filter 
bar can
 be disabled either by pressing &Esc;, or with a &LMB; click on the 
 <guiicon>Hide Filter Bar</guiicon> icon.
 </para>
@@ -934,7 +934,7 @@ The Preferences Dialog is opened via 
<menuchoice><guimenu>Settings</guimenu>
 be accessed by clicking the corresponding icon on the left of the dialog.
 </para>
 
-<para>All settings except from the <guilabel>Startup</guilabel> page and the 
<guilabel>Status Bar</guilabel> 
+<para>All settings except for the <guilabel>Startup</guilabel> page and the 
<guilabel>Status Bar</guilabel>
 tab on the <guilabel>General</guilabel> page are shared with &konqueror; in 
filemanager mode.
 </para>
 
@@ -1005,7 +1005,7 @@ for details.
 <para>
 This group contains settings which control the behavior of &dolphin;'s view
 modes. The three view modes (Icons, Compact, and Details) are accessible via 
the
-tab bar on top.
+tab bar at the top.
 
 <screenshot>
 <screeninfo>Screenshot of the Icons View settings in &dolphin;'s preferences 
dialog</screeninfo>
@@ -1084,9 +1084,9 @@ the text of a file item.
 <para>
 <itemizedlist>
 <listitem><para>
-<guilabel>Expandable folders</guilabel> If checked the folder with subfolders 
are displayed 
-in a tree view where the sub items can be expanded clicking the 
<guiicon>&lt;</guiicon> icon 
-and collapsed clicking the <guiicon>v</guiicon> icon.<!--FIXME needs better 
wording-->
+<guilabel>Expandable folders</guilabel> determines whether any folders that 
have subfolders
+are displayed in a tree view, where the sub items can be expanded by &RMB; 
clicking the
+<guiicon>&gt;</guiicon> icon and collapsed by clicking the 
<guiicon>v</guiicon> icon.
 </para></listitem>
 </itemizedlist>
 </para>
@@ -1130,8 +1130,8 @@ Archives will be opened inside &dolphin;, and not in an 
external application, if
 
 <listitem><para>
 If <guilabel>Open folders during drag operations</guilabel> is enabled, 
dragging
-an item with the mouse and hovering a folder with it for a short time will open
-that folder. This permits to move or copy items quickly to folders which are
+an item with the mouse and hovering over a folder with it for a short time 
will open
+that folder. This allows you to move or copy items quickly to folders which are
 several levels deeper in the folder hierarchy.
 </para></listitem>
 
@@ -1165,7 +1165,7 @@ appears when clicking a file or folder with the &RMB;.
 
 <para>
 Using the <guibutton>Download New Services</guibutton> you can fetch 
additional 
-service menu.
+services for the context menu.
 </para>
 <para>
 If you have installed &dolphin;'s plugins for <guilabel>Bazaar</guilabel>, 
@@ -1177,7 +1177,7 @@ and you have additional entries in the
 context menu like commit, update, add, remove &etc;
 </para>
 <para>
-In the service list it can be chosen as well if the 
<guimenuitem>Delete</guimenuitem>,
+In the service list you can also choose if the 
<guimenuitem>Delete</guimenuitem>,
 <guimenuitem>Copy To</guimenuitem>, and <guimenuitem>Move To</guimenuitem>
 commands are shown in the context menu.
 </para>
@@ -1231,7 +1231,7 @@ largest files can be deleted automatically.
 <para>
 This group contains settings which control the general behavior of &dolphin;.
 The group is divided further into four subgroups which can be accessed using 
the
-tab bar on top.
+tab bar at the top.
 
 <screenshot>
 <screeninfo>Screenshot of the General settings in &dolphin;'s preferences 
dialog</screeninfo>
@@ -1256,18 +1256,18 @@ tab bar on top.
 <itemizedlist>
 
 <listitem><para>
-In the <guilabel>View</guilabel> section, it can be configured if the
+In the <guilabel>View</guilabel> section, you can configure whether the
 <link linkend="view-properties"> view properties</link> are stored for each
 folder or if common view properties are to be used for all folders.
 </para></listitem>
 <listitem><para>
-When hovering a file or folder with the mouse, a small window with information
-about it is shown next to it if <guilabel>Show tooltips</guilabel> is enabled.
+When hovering over a file or folder with the mouse, a small window with 
relevant
+information is shown if <guilabel>Show tooltips</guilabel> is enabled.
 </para></listitem>
 
 <listitem><para>
 <guilabel>Show selection marker</guilabel> shows a small 
<guibutton>+</guibutton>
-or <guibutton>-</guibutton> button above an item's icon if the item is hovered
+or <guibutton>-</guibutton> button above an item's icon if the item is hovered 
over
 with the mouse. These can be used to select or deselect the item.
 </para></listitem>
 
@@ -1304,7 +1304,7 @@ If this option is disabled or several items are selected, 
a dialog will be displ
 <title>Previews Tab</title>
 
 <para>
-In this tab, it can be configured for which file types previews are shown.
+In this tab, you can configure for which file types previews are shown.
 Moreover, the maximum size of remote files for which previews are generated 
can be chosen.
 </para>
 <para>
@@ -1316,8 +1316,8 @@ be shown inside a folder's icon.
 <sect3 id="preferences-dialog-general-confirmations">
 <title>Confirmations Tab</title>
 <para>
-In the ask for confirmation section, warning dialogs which
-are shown before potentially harmful actions can be enabled.
+In the ask for confirmation section, you can enable warning dialogs that
+are shown before potentially harmful actions .
 </para>
 <warning><para>The confirmation settings for <guilabel>Moving files or folders 
to trash</guilabel> and
 <guilabel>Deleting files or folders</guilabel> affect file operations in 
&dolphin;, &konqueror;, 
@@ -1463,7 +1463,7 @@ be accessed with toolbar buttons or with items in the 
menu of the
 </menuchoice></term>
 <listitem><para><action>Creates a new object (such as a folder or a text file) 
in the current
 folder.</action></para>
-<para>An explanation of all available objects you find in &konqueror;'s 
handbook in the chapter 
+<para>You will find an explanation of all available objects in &konqueror;'s 
handbook in the chapter
 <ulink url="help:/konqueror/making.html">Create New</ulink>.</para>
 </listitem>
 </varlistentry>
@@ -1627,7 +1627,7 @@ The name of this file has to be entered in a dialog.
 <guimenuitem>Find...</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>Opens the find bar. Enter a search term into the edit 
box and select to search for filename
-or in contents of files starting from the current folder or from 
everywhere.</action></para></listitem>
+or in contents of files starting from the current folder or 
everywhere.</action></para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -1885,7 +1885,7 @@ Dialog</link>.</action></para></listitem>
 <guimenu>Go</guimenu>
 <guimenuitem>Home</guimenuitem>
 </menuchoice></term>
-<listitem><para><action>Changes to the users home folder, &eg;,
+<listitem><para><action>Changes to the users home folder, &eg;
 /home/Peter/.</action></para></listitem>
 </varlistentry>
 
@@ -1942,7 +1942,7 @@ be reopened.</action></para></listitem>
 <guimenu>Tools</guimenu>
 <guisubmenu>Select Remote Charset</guisubmenu>
 </menuchoice></term>
-<listitem><para><action>Offers to choose the charset used by a remote
+<listitem><para><action>Allows you to choose the charset used by a remote
 connection manually.</action></para></listitem>
 </varlistentry>
 </variablelist>
@@ -1973,9 +1973,9 @@ of the &kde; Fundamentals.
 <answer>
 <para>
 &dolphin; is not intended to be a competitor to &konqueror;: &konqueror; acts 
as
-universal viewer being able to show &HTML; pages, text documents, folders and a
+a universal viewer being able to show &HTML; pages, text documents, folders 
and a
 lot more, whereas &dolphin; focuses on being only a file manager. This approach
-allows to optimize the user interface for the task of file management.
+allows the optimization of the user interface for the task of file management.
 </para>
 </answer>
 </qandaentry>
@@ -1987,10 +1987,10 @@ allows to optimize the user interface for the task of 
file management.
 <answer>
 <para>
 The easiest way to get involved with &dolphin; is to subscribe to the 
developer 
-mailinglist <ulink 
url="https://mail.kde.org/mailman/listinfo/kfm-devel";>kfm-devel</ulink> 
-and drop an email to the developer mailing list. Email, what you can do, how 
much time 
+mailing list <ulink 
url="https://mail.kde.org/mailman/listinfo/kfm-devel";>kfm-devel</ulink>
+and drop an email to the developer mailing list. Email what you can do, how 
much time
 you can devote &etc;, the developers will let you know what you can do in the
-project. If you wish to contribute to the documentation please mail to the 
+project. If you wish to contribute to the documentation please email the
 <ulink url="mailto:kde-doc-english at kde.org">&kde; Documentation 
Team</ulink> list.
 </para>
 </answer>
diff --git a/doc/konqueror/index.docbook b/doc/konqueror/index.docbook
index 2b54e02..a3edbd7 100644
--- a/doc/konqueror/index.docbook
+++ b/doc/konqueror/index.docbook
@@ -536,8 +536,8 @@ component.</para></note>
 <listitem><para>
 In the <guibutton>Icons</guibutton> view, which is the default, files will be
 represented by an icon that visualizes the file type, and a folder icon will be
-shown for subfolders. The names of folders and files and the items enabled in
-<menuchoice><guimenu>View</guimenu><guisubmenu>Additional 
Information</guisubmenu></menuchoice> 
+shown for subfolders. The names of folders and files, and the items enabled in
+<menuchoice><guimenu>View</guimenu><guisubmenu>Additional 
Information</guisubmenu></menuchoice>,
 are displayed below the icons.
 </para></listitem>
 
@@ -564,10 +564,10 @@ the extension is replaced by <quote>...</quote>
 the <guilabel>Name</guilabel> header, which is always the first column in this 
view.
 </para>
 <para>
-The details view permits to view the current directory in a tree-like fashion 
if 
+The details view allows you to view the current directory in a tree-like 
fashion if
 <guilabel>Expandable folders</guilabel> are enabled: 
 Each subfolder of the current folder can be
-<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the 
<guiicon>&lt;</guiicon> 
+<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the 
<guiicon>&gt;</guiicon>
 or <guiicon>v</guiicon> icon next to it.</para></listitem>
 </itemizedlist>
 
@@ -626,7 +626,7 @@ more information for each item to be shown:
 <guimenuitem>Tags</guimenuitem> or <guimenuitem>Comment</guimenuitem>.
 </para>
 
-<para>Depending on the file type additionally sorting criteria can be selected:
+<para>Depending on the file type, additionally, sorting criteria can be 
selected:
 <simplelist>
   <member><guimenuitem>Document</guimenuitem>: Number of words and 
lines</member>
   <member><guimenuitem>Image</guimenuitem>: Size and orientation</member>
@@ -1092,7 +1092,7 @@ If <guilabel>Show selection marker</guilabel> is enabled 
in the
 <guilabel>Behavior</guilabel> tab of the <menuchoice><guimenu>File 
Management</guimenu>
 <guimenuitem>General</guimenuitem></menuchoice> section of the settings, a 
small
 <guiicon>+</guiicon> or <guiicon>-</guiicon> button appears in the top
-left corner of the item which is currently hovered with the mouse. Clicking
+left corner of the item which is currently hovered over with the mouse. 
Clicking
 this sign selects or deselects the item, respectively.
 </para></listitem>
 

Reply via email to