Merge pull request 'Update help (en)' (#101) from feature/update-help…

… into hotfix/v8.2.1

apps/documenteditor/main/resources/help/en/Contents.json

@@ -48,8 +48,10 @@
     {"src": "UsageInstructions/InsertImages.htm", "name": "Insert images"},
     {"src": "UsageInstructions/InsertAutoshapes.htm", "name": "Insert autoshapes"},
     {"src": "UsageInstructions/InsertCharts.htm", "name": "Insert charts" },
-    {"src": "UsageInstructions/InsertTextObjects.htm", "name": "Insert text objects" },
+    { "src": "UsageInstructions/InsertTextObjects.htm", "name": "Insert text objects" },
+    {"src": "UsageInstructions/InsertFieldCodes.htm", "name": "Insert field codes" },
     { "src": "UsageInstructions/InsertSmartArt.htm", "name": "Insert SmartArt objects" },
+    { "src": "UsageInstructions/InsertTextFromFile.htm", "name": "Insert text from file" },
     {"src": "UsageInstructions/DrawingOperations.htm", "name": "Draw freehand on a document" },
     { "src": "UsageInstructions/AddCaption.htm", "name": "Add caption" },
     { "src": "UsageInstructions/InsertSymbols.htm", "name": "Insert symbols and characters" },
@@ -85,7 +87,8 @@
     {"src": "UsageInstructions/Drawio.htm", "name": "Create and insert diagrams"},
 	{"src": "UsageInstructions/Zoom.htm", "name": "Host and schedule Zoom meetings"},
     { "src": "UsageInstructions/ChatGPT.htm", "name": "Use AI to write text" },
-    {"src": "UsageInstructions/TerMef.htm", "name": "Insert definitions"},
+    { "src": "UsageInstructions/TerMef.htm", "name": "Insert definitions" },
+    {"src": "UsageInstructions/Pixabay.htm", "name": "Add pictures"},
     {"src": "UsageInstructions/ViewDocInfo.htm", "name": "View document information", "headername": "Tools and settings"},
     {"src": "UsageInstructions/SavePrintDownload.htm", "name": "Save, download, print your document" },
     {"src": "HelpfulHints/AdvancedSettings.htm", "name": "Advanced settings of Document Editor"},

apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm

@@ -44,11 +44,11 @@ <h3>Collaboration</h3>
                 </ul>
             </li>
             <li class="onlineDocumentFeatures">
-                The <b>Real-time Collaboration Changes</b> subsection allows you to choose how new changes and comments will be displayed in real time.
+                The <b>Real-time collaboration changes</b> subsection allows you to choose how new changes and comments will be displayed in real time.
                 <ul>
-                    <li><b>View None</b>. All the changes made during the current session will not be highlighted.</li>
-                    <li><b>View All</b>. All the changes made during the current session will be highlighted.</li>
-                    <li><b>View Last</b>. Only the changes made since you last time clicked the <b>Save</b> <div class="icon icon-saveupdate"></div> icon will be highlighted. This option is only available when the <b>Strict</b> co-editing mode is selected.</li>
+                    <li><b>View none</b>. All the changes made during the current session will not be highlighted.</li>
+                    <li><b>View all</b>. All the changes made during the current session will be highlighted.</li>
+                    <li><b>View last</b>. Only the changes made since you last time clicked the <b>Save</b> <div class="icon icon-saveupdate"></div> icon will be highlighted. This option is only available when the <b>Strict</b> co-editing mode is selected.</li>
                     <li><b>Show changes from other users</b>. This feature allows seeing changes made by other users in the document opened for viewing only in the <b>Live Viewer</b> mode.</li>
                     <li><b>Show comments in text</b>. If you disable this feature, the commented passages will be highlighted only if you click the <b>Comments</b> <div class="icon icon-commentsicon"></div> icon on the left sidebar.</li>
                     <li><b>Show resolved comments</b>. This feature is disabled by default so that the resolved comments are hidden in the document text. You can view such comments only if you click the <b>Comments</b> <div class="icon icon-commentsicon"></div> icon on the left sidebar. Enable this option if you want to display resolved comments in the document text.</li>
@@ -58,43 +58,53 @@ <h3>Collaboration</h3>
 
         <h3>Proofing</h3>
         <ol>
-            <li>The <b>Spell Checking</b> option is used to turn on/off the spell checking.</li>
+            <li>The <b>Spell checking</b> option is used to turn on/off the spell checking.</li>
             <li><b>Ignore words in UPPERCASE</b>. Words typed in capital letters are ignored during the spell checking.</li>
             <li><b>Ignore words with numbers</b>. Words with numbers in them are ignored during the spell checking.</li>
             <li>The <b>AutoCorrect options...</b> menu allows you to access the <a href="../UsageInstructions/MathAutoCorrect.htm" onclick="onhyperlinkclick(this)">autocorrect settings</a> such as replacing text as you type, recognizing functions, automatic formatting etc.</li>
         </ol>
 
+            <h3>Appearance</h3>
+            <ol>
+                <li>
+                    The <b>Interface theme</b> option is used to change the color scheme of the editor’s interface.
+                    <ul>
+                        <li>The <b>Same as system</b> option makes the editor follow the interface theme of your system.</li>
+                        <li>The <b>Light</b> color scheme incorporates standard blue, white, and light gray colors with less contrast in UI elements suitable for working during daytime.</li>
+                        <li>The <b>Classic Light</b> color scheme incorporates standard blue, white, and light gray colors.</li>
+                        <li>The <b>Dark</b> color scheme incorporates black, dark gray, and light gray colors suitable for working during nighttime.</li>
+                        <li>The <b>Contrast Dark</b> color scheme incorporates black, dark gray, and white colors with more contrast in UI elements highlighting the working area of the file.</li>
+                        <li>The <b>Gray</b> color scheme incorporates lighter gray color and appears as a uniformly light color scheme.</li>
+                        <li>
+                            The <b>Turn on document dark mode</b> option is used to make the working area darker when the editor is set to <b>Dark</b> or <b>Contrast Dark</b> interface theme. Check the <b>Turn on document dark mode</b> box to enable it.
+                            <p class="note"><b>Note</b>: Apart from the available <b>Light</b>, <b>Classic Light</b>, <b>Dark</b>, <b>Contrast Dark</b>, and <b>Gray</b> interface themes, ONLYOFFICE editors can now be customized with your own color theme. Please follow <a target="_blank" href="https://helpcenter.onlyoffice.com/installation/docs-developer-change-theme.aspx" onclick="onhyperlinkclick(this)">these instructions</a> to learn how you can do that.</p>
+                        </li>
+                    </ul>
+                </li>
+                <li><b>Tab style</b> - choose whether you want the currently selected tab to be <em>filled</em> in with a lighter color with the <em>Fill</em> option or to be underlined with the <em>Line</em> option.</li>
+                <li><b>Use toolbar color as tabs background</b> - the color of the toolbar will be used as tabs background. The toolbar color depends on the currently selected interface theme.</li>
+            </ol>
+
         <h3>Workspace</h3>
         <ol>
             <li>The <b>Turn on screen reader support</b> option is used to enable support of screen reader software.</li>
-            <li>The <b>Alignment Guides</b> option is used to turn on/off alignment guides that appear when you move objects. It allows for a more precise object positioning on the page.</li>
+            <li>The <b>Alignment guides</b> option is used to turn on/off alignment guides that appear when you move objects. It allows for a more precise object positioning on the page.</li>
             <li>The <b>Use Alt key to navigate the user interface using the keyboard</b> option is used to enable using the <em>Alt</em> / <em>Option</em> key in keyboard shortcuts.</li>
             <li><span class="desktopDocumentFeatures"><b>Show the Quick Print button in the editor header</b> is used in the <em>desktop version</em> to enable quick printing via the corresponding button at the top toolbar. The file will be printed on the last selected or default printer.</span></li>
             <li>
                 <span class="onlineDocumentFeatures">The <b>RTL Interface (Beta)</b> option is used to change the direction in which elements of the interface are displayed.</span>
                 <span class="desktopDocumentFeatures">In the <em>desktop</em> editors, the <b>RTL Interface (Beta)</b> option can be accessed on the main settings page. To learn more, please refer to the <a href="https://helpcenter.onlyoffice.com/installation/desktop-getting-started.aspx#ChangingSettings_block">desktop getting started</a> guide.</span>
+                <p class="note">This option is available only for interface languages that require RTL.</p>
             </li>
+            <li>The <b>Customize quick access</b> button is used to choose which buttons shall be available in the top toolbar, i.e., <em>Save</em>, <em>Print</em>, <em>Undo</em>, and <em>Redo</em>.</li>
+
+            <li>The <b>Unit of measurement</b> option is used to specify what units are used on the rulers and in properties of objects when setting such parameters as width, height, spacing, margins etc. The available units are <em>Centimeter</em>, <em>Point</em>, and <em>Inch</em>.</li>
             <li>
-                The <b>Interface theme</b> option is used to change the color scheme of the editor’s interface.
-                <ul>
-                    <li>The <b>Same as system</b> option makes the editor follow the interface theme of your system.</li>
-                    <li>The <b>Light</b> color scheme incorporates standard blue, white, and light gray colors with less contrast in UI elements suitable for working during daytime.</li>
-                    <li>The <b>Classic Light</b> color scheme incorporates standard blue, white, and light gray colors.</li>
-                    <li>The <b>Dark</b> color scheme incorporates black, dark gray, and light gray colors suitable for working during nighttime.</li>
-                    <li>The <b>Contrast Dark</b> color scheme incorporates black, dark gray, and white colors with more contrast in UI elements highlighting the working area of the file.</li>
-                    <li>
-                        The <b>Turn on document dark mode</b> option is used to make the working area darker when the editor is set to <b>Dark</b> or <b>Contrast Dark</b> interface theme. Check the <b>Turn on document dark mode</b> box to enable it.
-                        <p class="note"><b>Note</b>: Apart from the available <b>Light</b>, <b>Classic Light</b>, <b>Dark</b>, and <b>Contrast Dark</b> interface themes, ONLYOFFICE editors can now be customized with your own color theme. Please follow <a target="_blank" href="https://helpcenter.onlyoffice.com/installation/docs-developer-change-theme.aspx" onclick="onhyperlinkclick(this)">these instructions</a> to learn how you can do that.</p>
-                    </li>
-                </ul>
-            </li>
-            <li>The <b>Unit of Measurement</b> option is used to specify what units are used on the rulers and in properties of objects when setting such parameters as width, height, spacing, margins etc. The available units are <em>Centimeter</em>, <em>Point</em>, and <em>Inch</em>.</li>
-            <li>
-                The <b>Default Zoom Value</b> option is used to set the default zoom value, selecting it in the list of available options from 50% to 500%. You can also choose the <em>Fit to Page</em>, <em>Fit to Width</em>, or <b>Last Used</b> option.
-                <p class="note">The <b>Last Used</b> option refers to the last set scaling during the current session.</p>
+                The <b>Default zoom value</b> option is used to set the default zoom value, selecting it in the list of available options from 50% to 500%. You can also choose the <em>Fit to Page</em>, <em>Fit to Width</em>, or <b>Last Used</b> option.
+                <p class="note">The <b>Last Used</b> option refers to the last set scaling value during the current session.</p>
             </li>
             <li>
-                The <b>Font Hinting</b> option is used to select how fonts are displayed in the Document Editor.
+                The <b>Font hinting</b> option is used to select how fonts are displayed in the Document Editor.
                 <ul>
                     <li>Choose <b>As Windows</b> if you like the way fonts are usually displayed on Windows, i.e. using Windows font hinting.</li>
                     <li>Choose <b>As OS X</b> if you like the way fonts are usually displayed on a Mac, i.e. without any font hinting at all.</li>
@@ -115,15 +125,15 @@ <h3>Workspace</h3>
                 </ul>
             </li>
             <li>
-                The <b>Macros Settings</b> option is used to set macros display with a notification.
+                The <b>Macros settings</b> option is used to set macros display with a notification.
                 <ul>
                     <li>Choose <b>Disable All</b> to disable all macros within the document.</li>
-                    <li>Choose <b>Show Notification</b> to receive notifications about macros within the document.</li>
-                    <li>Choose <b>Enable All</b> to automatically run all macros within the document.</li>
+                    <li>Choose <b>Show notification</b> to receive notifications about macros within the document.</li>
+                    <li>Choose <b>Enable all</b> to automatically run all macros within the document.</li>
                 </ul>
             </li>
         </ol>
-        <p>To save the changes you made, click the <b>Apply</b> button.</p>
+        <p>The changes are saved as you go.</p>
     </div>
 </body>
 </html>

apps/documenteditor/main/resources/help/en/HelpfulHints/Communicating.htm

@@ -16,19 +16,22 @@
         </div>
         <h1>Communicating in real time</h1>
         <p>The <a href="https://www.onlyoffice.com/en/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> allows you to maintain a constant team-wide approach to work flow: <a href="https://helpcenter.onlyoffice.com/userguides/groups-guides-documents-share-documents.aspx" onclick="onhyperlinkclick(this)">share</a> files and folders, <a href="../HelpfulHints/CollaborativeEditing.htm" onclick="onhyperlinkclick(this)">collaborate</a> on documents in real time, <a href="../HelpfulHints/Commenting.htm" onclick="onhyperlinkclick(this)">comment</a> certain parts of your documents that require additional third-party input, save <a href="../HelpfulHints/VersionHistory.htm" onclick="onhyperlinkclick(this)">document versions</a> for future use, <a href="../HelpfulHints/Review.htm" onclick="onhyperlinkclick(this)">review</a> documents and add your changes without actually editing the file, <a href="../HelpfulHints/Comparison.htm" onclick="onhyperlinkclick(this)">compare and merge</a> documents to facilitate processing and editing.</p>
-        <p>In <b>Document Editor</b>, you can communicate with your co-editors in real time using the built-in <b>Chat</b> tool as well as a number of useful plugins, i.e. <a href="../UsageInstructions/CommunicationPlugins.htm" onclick="onhyperlinkclick(this)">Telegram or Rainbow</a>.</p>
-        <p>To access the <b>Chat</b> tool and leave a message for other users,</p>
-        <ol>
-            <li>
-                click the <div class = "icon icon-chaticon"></div> icon on the left sidebar, or <br />
-                switch to the <b>Collaboration</b> tab of the top toolbar and click the <div class = "icon icon-chat_toptoolbar"></div> <b>Chat</b> button,
-            </li>
-            <li>enter your text into the corresponding field below,</li>
-            <li>press the <b>Send</b> button.</li>
-        </ol>
-        <p class="note">The chat messages are stored during one session only. To discuss the document content, it is better to <a href="../HelpfulHints/Commenting.htm" onclick="onhyperlinkclick(this)">use comments</a> which are stored until they are deleted.</p>
-        <p>All the messages left by users will be displayed on the panel on the left. If there are new messages you haven't read yet, the chat icon will look like this - <span class = "icon icon-chaticon_new"></span>.</p>
-        <p>To close the panel with chat messages, click the <span class = "icon icon-chaticon"></span> icon on the left sidebar or the <span class = "icon icon-chat_toptoolbar"></span> <b>Chat</b> button at the top toolbar once again.</p>
+        <p>In <b>Document Editor</b>, you can communicate with your co-editors in real time using the built-in <b>Chat</b> tool as well as a number of useful plugins, i.e., <a href="../UsageInstructions/CommunicationPlugins.htm" onclick="onhyperlinkclick(this)">Telegram or Rainbow</a>.</p>
+        <p><img class="floatleft" alt="Chat window" src="../../../../../../common/main/resources/help/en/images/chat.png" /></p>
+        <div style="margin-left: 280px;">
+            <p>To access the <b>Chat</b> tool and leave a message for other users,</p>
+            <ol>
+                <li>
+                    click the <div class="icon icon-chaticon"></div> icon on the left sidebar, or <br />
+                    switch to the <b>Collaboration</b> tab of the top toolbar and click the <div class="icon icon-chat_toptoolbar"></div> <b>Chat</b> button,
+                </li>
+                <li>enter your text into the corresponding field below,</li>
+                <li>press the <b>Send</b> button.</li>
+            </ol>
+            <p class="note">The chat messages are stored during one session only. To discuss the document content, it is better to <a href="../HelpfulHints/Commenting.htm" onclick="onhyperlinkclick(this)">use comments</a> which are stored until they are deleted.</p>
+            <p>All the messages left by users will be displayed on the panel on the left. If there are new messages you haven't read yet, the chat icon will look like this - <span class="icon icon-chaticon_new"></span>.</p>
+            <p>To close the panel with chat messages, click the <span class="icon icon-chaticon"></span> icon on the left sidebar or the <span class="icon icon-chat_toptoolbar"></span> <b>Chat</b> button at the top toolbar once again.</p>
+        </div>
     </div>
 </body>
 </html>

apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm

@@ -100,6 +100,10 @@ <h4>Method of comparison</h4>
         <p>Documents are compared <b>by words</b>. If a word contains a change of at least one character (e.g. if a character was removed or replaced), in the result, the difference will be displayed as the change of the entire word, not the character.</p>
         <p>The image below illustrates the case when the original file contains the word 'Characters' and the document for comparison contains the word 'Character'.</p>
         <p><img alt="Compare documents - method" src="../images/compare_method.png" /></p>
+        <h4>Difference between comparison and combining</h4>
+        <p>When <b>comparing</b> documents, the resulting document will be a redlined one. Document comparison is most commonly used to compare an original version and an edited version without the <em>Track Changes</em> feature enabled.</p>
+        <p>When <b>combining</b> documents, the resulting document will contain all <em>Tracked Changes</em> with their respective authors. If one and the same part of the document has been revised by multiple people, all changes will be displayed simultaneously.</p>
+        <p>The main difference lies in the <em>Track Changes</em> feature. If it is enabled by all co-authors, then <b>Combining</b> documents is better; if it is disabled, then <b>Comparing</b> documents might be more preferable.</p>
 
         <h4>Authorship of the document</h4>
         <p>When the comparison process is launched, the second document for comparison is being loaded and compared to the current one.</p>