IlyaSobolev/helpcenter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 27 Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/desktop6.1'

Browse Source
This commit is contained in:
Svetlana Maleeva 2020-12-07 13:21:35 +03:00
commit b598ea9df1
20 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Web/Controls/Help/Desktop/Documents/Common/ConnectPersonal/ConnectPersonal.ascx
View File

@ -26,7 +26,7 @@
<p>After you have installed <b>ONLYOFFICE Desktop Editors</b> on your computer, you can easily connect the application to your existing <a target="_blank" href="https://personal.onlyoffice.com">Personal cloud</a> so that you can use all the product capabilities:</p>
<ul>
<li>collaborative features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx")%>">collaborative editing</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Review.aspx")%>">reviewing</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#comments")%>">commenting</a> and communicating via the <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#chat")%>">built-in chat</a>,</li>
<li>online features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a> and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a> in the Document Editor and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PivotTables.aspx")%>">editing Pivot Tables</a> in the Spreadsheet Editor.</li>
<li>online features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a> and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a> in the Document Editor and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">managing Sheet View presets</a> in the Spreadsheet Editor.</li>
</ul>
<div class="notehelp">
An Internet connection is required for connecting a Personal cloud, as well as for real-time co-editing and using online features.

4
Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ascx
View File

@ -30,8 +30,8 @@
<p>After you have installed <b>ONLYOFFICE Desktop Editors</b> on your computer, you can easily connect the application to your existing SaaS portal or create a new one so that you can use all the product capabilities:</p>
<ul>
<li>collaborative features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx")%>">collaborative editing</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Review.aspx")%>">reviewing</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#comments")%>">commenting</a> and communicating via the <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#chat")%>">built-in chat</a>,</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">pro features</a> (for the paid cloud version only), such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a> and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a>,</li>
<li>online features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a> in the Document Editor and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PivotTables.aspx")%>">editing Pivot Tables</a> in the Spreadsheet Editor.</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">pro features</a> (for the paid cloud version only), such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a> and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a> in the Document Editor and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">managing Sheet View presets</a> in the Spreadsheet Editor,</li>
<li>online features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a> in the Document Editor.</li>
</ul>
<div class="notehelp">
An Internet connection is required for creating or connecting a portal, as well as for real-time co-editing, enabling pro features and using online features.

4
Web/Controls/Help/Desktop/Documents/Common/ConnectSaaS/ConnectSaaS.ru.ascx
View File

@ -30,8 +30,8 @@
<p>После установки <b>десктопных редакторов ONLYOFFICE</b> на компьютер их можно легко подключить к существующему SaaS-порталу или создать новый портал, чтобы использовать все возможности продукта:</p>
<ul>
<li>функции совместной работы, такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx")%>">совместное редактирование</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Review.aspx")%>">рецензирование</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#comments")%>">комментирование</a> и общение во <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#chat")%>">встроенном чате</a>,</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">профессиональные функции</a> (только для платной облачной версии), такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">сравнение документов</a> и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">вставка элементов управления содержимым</a>,</li>
<li>онлайн-функции, такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">слияние</a> в редакторе документов и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PivotTables.aspx")%>">редактирование сводных таблиц</a> в редакторе электронных таблиц.</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">профессиональные функции</a> (только для платной облачной версии), такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">сравнение документов</a> и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">вставка элементов управления содержимым</a> в редакторе документов и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">управление предустановками представления листа</a> в редакторе электронных таблиц,</li>
<li>онлайн-функции, такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">слияние</a> в редакторе документов.</li>
</ul>
<div class="notehelp">
Для создания или подключения портала, а также для совместного редактирования в режиме реального времени, включения профессиональных функций и использования онлайн-функций требуется соединение с Интернетом.

6
Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ascx
View File

@ -30,9 +30,9 @@
<p>After you have installed <b>ONLYOFFICE Desktop Editors</b> on your computer, you can easily connect the application to your <b>ONLYOFFICE Workspace Enterprise Edition</b> server so that you can use all the product capabilities:</p>
<ul>
<li>collaborative features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx")%>">collaborative editing</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Review.aspx")%>">reviewing</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#comments")%>">commenting</a> and communicating via the <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#chat")%>">built-in chat</a>,</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">pro features</a> (for the paid server version only), such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a> and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a>,</li>
<li>online features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a> in the Document Editor and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PivotTables.aspx")%>">editing Pivot Tables</a> in the Spreadsheet Editor,</li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/private-room.aspx")%>">Private Room</a> (for the paid server version only).</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">pro features</a> (for the paid server version only), such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a> and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a> in the Document Editor and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">managing Sheet View presets</a> in the Spreadsheet Editor,</li>
<li>online features, such as <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a> in the Document Editor,</li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/private-room.aspx")%>">Private Room</a> (for the server version only).</li>
</ul>
<div class="notehelp">
If you are using your <b>ONLYOFFICE Workspace Enterprise Edition</b> on a local network, and the users are accessing your server using the local network only, an Internet connection is not required. If you are using the <b>ONLYOFFICE Workspace Enterprise Edition</b> over the Internet, an Internet connection is required for connecting to your server, as well as for real-time co-editing, enabling pro features, using <b>Private rooms</b> and online features.

6
Web/Controls/Help/Desktop/Documents/Common/ConnectServerVersion/ConnectServerVersion.ru.ascx
View File

@ -30,9 +30,9 @@
<p>После установки <b>десктопных редакторов ONLYOFFICE</b> на компьютер их можно легко подключить к серверу <b>ONLYOFFICE Workspace Enterprise Edition</b>, чтобы использовать все возможности продукта:</p>
<ul>
<li>функции совместной работы, такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx")%>">совместное редактирование</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Review.aspx")%>">рецензирование</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#comments")%>">комментирование</a> и общение во <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#chat")%>">встроенном чате</a>,</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">профессиональные функции</a> (только для платной серверной версии), такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">сравнение документов</a> и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">вставка элементов управления содержимым</a>,</li>
<li>онлайн-функции, такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">слияние</a> в редакторе документов и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PivotTables.aspx")%>">редактирование сводных таблиц</a> в редакторе электронных таблиц,</li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/private-room.aspx")%>">Приватная комната</a> (только для платной серверной версии).</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">профессиональные функции</a> (только для платной серверной версии), такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">сравнение документов</a> и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">вставка элементов управления содержимым</a> в редакторе документов и <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">управление предустановками представления листа</a> в редакторе электронных таблиц,</li>
<li>онлайн-функции, такие как <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">слияние</a> в редакторе документов,</li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/private-room.aspx")%>">Приватная комната</a> (только для серверной версии).</li>
</ul>
<div class="notehelp">
Если вы используете <b>ONLYOFFICE Workspace Enterprise Edition</b> в локальной сети, и пользователи получают доступ к серверу только по локальной сети, подключение к Интернету не требуется. Если вы получаете доступ к <b>ONLYOFFICE Workspace Enterprise Edition</b> через Интернет, соединение с Интернетом потребуется для подключения к серверу, а также для совместного редактирования в режиме реального времени, включения профессиональных функций, использования <b>Приватных комнат</b> и онлайн-функций.

25
Web/Controls/Help/Desktop/Documents/Common/GettingStarted/GettingStarted.ascx
View File

@ -6,7 +6,7 @@
{
PageTitle = PageCaption = "Getting started with  ONLYOFFICE Desktop Editors";
MetaKeyWords = "create files, view documents, edit documents";
MetaDescription = "ONLYOFFICE Desktop Editors  is an open-source office suite distributed under AGPL v.3. The application does not require constant connection to the Internet and allows to work with documents stored on your computer.";
MetaDescription = "ONLYOFFICE Desktop Editors  is an open-source office suite distributed under AGPL v.3. The application does not require constant connection to the Internet and allows you to work with documents stored on your computer.";
var guides = new GuidesModel();
@ -40,7 +40,7 @@
<div class="gs_content" id="Overview_block">
<h2>Overview</h2>
<div class="PortalHelp">
<p><b>ONLYOFFICE Desktop Editors</b> is an open-source office suite distributed under AGPL v.3. The application does not require constant connection to the Internet and allows to work with documents stored on your computer.</p>
<p><b>ONLYOFFICE Desktop Editors</b> is an open-source office suite distributed under AGPL v.3. The application does not require constant connection to the Internet and allows you to work with documents stored on your computer.</p>
<p>You can create, view and edit text documents, spreadsheets and presentations of the most popular formats: <code>DOCX</code>, <code>ODT</code>, <code>XLSX</code>, <code>ODS</code>, <code>CSV</code>, <code>PPTX</code>, <code>ODP</code>, etc. View all the formats supported by <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/SupportedFormats.aspx")%>">Document Editor</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/HelpfulHints/SupportedFormats.aspx")%>">Spreadsheet Editor</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/HelpfulHints/SupportedFormats.aspx")%>">Presentation Editor</a>.</p>
</div>
</div>
@ -49,7 +49,7 @@
<h2>Installing</h2>
<div class="PortalHelp">
<p>ONLYOFFICE Desktop Editors is a cross-platform solution. You can install it on Windows, Linux or Mac OS.</p>
<p>To download the latest version of the ONLYOFFICE Desktop Editors for your operating system visit our <a target="_blank" href="https://www.onlyoffice.com/download-desktop.aspx">website</a> and follow our installation guides for <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/windows/index.aspx")%>">Windows</a> or <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/linux/index.aspx")%>">Linux</a>, and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/macos/index.aspx")%>">Mac OS</a>.</p>
<p>To download the latest version of the ONLYOFFICE Desktop Editors for your operating system visit our <a target="_blank" href="https://www.onlyoffice.com/download-desktop.aspx">website</a> and follow our installation guides for <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/windows/index.aspx")%>">Windows</a>, <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/linux/index.aspx")%>">Linux</a>, and <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/macos/index.aspx")%>">Mac OS</a>.</p>
</div>
</div>
@ -123,20 +123,20 @@
<li>communicating via the <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/CollaborativeEditing.aspx#chat")%>">built-in chat</a>.</li>
</ul>
<h6>Pro features</h6>
<p>Some features are only available in the paid online version (cloud or server). Starting from the version <b>5.6</b> of Desktop Editors, you can add these features to Desktop Editors and use them for working with your local files. The following pro features are currently available for the Document Editor: </p>
<p>Some features are only available in the paid online version (cloud or server). Starting from the version <b>5.6</b> of Desktop Editors, you can add these features to Desktop Editors and use them for working with your local files. The following pro features are currently available for the Document Editor and Spreadsheet Editor: </p>
<ul>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a>,</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a>.</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a>,</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">Sheet View presets</a>.</li>
</ul>
<p>The instruction on how to activate pro features in Desktop Editors is available here: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/pro-features.aspx")%>">Using pro features in ONLYOFFICE Desktop Editors</a></p>
<h6>Online features</h6>
<p>Some editing features are only available in the online version (both in the paid ONLYOFFICE cloud and in the free Community version). You can use them through the ONLYOFFICE Desktop Editors interface only after connecting to the cloud: </p>
<ul>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a> in the Document Editor,</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PivotTables.aspx")%>">editing Pivot Tables</a> in the Spreadsheet Editor.</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/UseMailMerge.aspx")%>">Mail Merge</a> in the Document Editor.</li>
</ul>
<h6>Private rooms</h6>
<p>After connecting to the ONLYOFFICE Cloud (paid server version), you can securely edit and co-author your documents within the <b>Private Room</b>, a special section in the <b>Documents</b> module where all documents and data transferred during collaboration are encrypted with the <b>AES-256</b> encryption algorithm.</p>
<p>After connecting to the ONLYOFFICE Cloud (server version), you can securely edit and co-author your documents within the <b>Private Room</b>, a special section in the <b>Documents</b> module where all documents and data transferred during collaboration are encrypted with the <b>AES-256</b> encryption algorithm.</p>
<p>To learn more, you can refer to this article: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/private-room.aspx")%>">How to use the Private Room to work on your documents securely?</a></p>
</div>
</div>
@ -146,9 +146,9 @@
<div class="PortalHelp">
<p>ONLYOFFICE Desktop Editors include a number of the pre-installed plugins.</p>
<ul class="list_getstart">
<li><b>Document Editor</b> contains the following plugins by default: PhotoEditor, YouTube, OCR, Translator, Send, Thesaurus, Highlight code. The detailed instructions on how to use plugins can be found here: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Plugins.aspx")%>">How to use plugins</a></li>
<li><b>Spreadsheet Editor</b> contains the following plugins by default: PhotoEditor, YouTube, Translator, Send, Thesaurus, Highlight code. The detailed instructions on how to use plugins can be found here: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/HelpfulHints/Plugins.aspx")%>">How to use plugins</a></li>
<li><b>Presentation Editor</b> contains the following plugins by default: Audio, Video, PhotoEditor, YouTube, Translator, Send, Thesaurus, Highlight code. The detailed instructions on how to use plugins can be found here: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/HelpfulHints/Plugins.aspx")%>">How to use plugins</a></li>
<li><b>Document Editor</b> contains the following plugins by default: PhotoEditor, YouTube, OCR, Translator, Send, Thesaurus, Highlight code. The detailed instructions on how to use plugins can be found here: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Plugins.aspx")%>">How to use plugins</a></li>
<li><b>Spreadsheet Editor</b> contains the following plugins by default: PhotoEditor, YouTube, Translator, Send, Thesaurus, Highlight code. The detailed instructions on how to use plugins can be found here: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/HelpfulHints/Plugins.aspx")%>">How to use plugins</a></li>
<li><b>Presentation Editor</b> contains the following plugins by default: Audio, Video, PhotoEditor, YouTube, Translator, Send, Thesaurus, Highlight code. The detailed instructions on how to use plugins can be found here: <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/HelpfulHints/Plugins.aspx")%>">How to use plugins</a></li>
</ul>
<div class="screen_block">
<img alt="Plugins tab" target="img6_eventcom_guides" class="screenphoto screen_guides" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/GettingStarted/Desktop/small/plugins.png")%>" />
@ -165,10 +165,11 @@
<div class="gs_content" id="ChangingSettings_block">
<h2>Changing application settings</h2>
<div class="PortalHelp">
<p>The <b>Settings</b> section in the left side menu of the main program window allows to:</p>
<p>The <b>Settings</b> section in the left side menu of the main program window allows you to:</p>
<ul>
<li>change the <b>user name</b> displayed in the header of each opened document</li>
<li>select the <b>interface language</b>. The list of the available languages can be found <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/available-languages.aspx")%>">here</a></li>
<li>adjust <b>interface scaling</b> (on Windows and Linux only). The available values are Auto, 100%, 200%. These changes will be applied after clicking the <b>Apply</b> button and restarting the application.</li>
<li>set the periodicity of <b>automatic checking for updates</b>: every day, every week or never
<div class="notehelp">
you can also check for updates manually using the <b>Check for updates</b> link in the <b>About</b> section of the main program window.

14
Web/Controls/Help/Desktop/Documents/Common/ProFeatures/ProFeatures.ascx
View File

@ -39,10 +39,14 @@
</div>
<p>Starting from the version <b>5.6</b> of Desktop Editors, you can add <b>pro features</b> to Desktop Editors and use them when working with local documents. Pro features are the features which are available in the paid online version (cloud or server), starting from Document Server v.<b>5.5</b>.</p>
<p>Currently, pro features are only available for the Document Editor:</p>
<p>Currently, the following pro features are available for the Document Editor:</p>
<ul>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/HelpfulHints/Comparison.aspx")%>">Document comparison</a> - this feature allows displaying the differences between two documents and merge the documents by accepting the changes.</li>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertContentControls.aspx")%>">Content Controls insertion</a> - this feature allows creating a form with input fields that can be filled in by other users. You can add the following types of content controls: Plain Text, Rich Text, Picture, Combo box, Drop-down list, Date, Check box.</li>
</ul>
<p>The following pro feature is available for the Spreadsheet Editor:</p>
<ul>
<li><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">Sheet View</a> - this feature allows creating view presets that are based on the applied filters.</li>
</ul>
</div>
</div>
@ -109,7 +113,13 @@
<img alt="Compare documents" id="img5_eventcom_guides" class="bigphoto_screen" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide125/compare.png")%>" />
<div target="img5_eventcom_guides" class="screenphoto magnifier"></div>
</div>
<p>To manage sheet view presets, switch to the <b>View</b> tab and use the <img alt="Sheet View icon" src="<%=VirtualPathUtility.ToAbsolute("~/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/images/sheetview_icon.png")%>" /> <b>Sheet View</b> button on the top toolbar.</p>
<p>The detailed instructions on how to work with sheet view presets are available <a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/SheetView.aspx")%>">here</a>.</p>
<div class="screen_block">
<img alt="Sheet View" target="img6_eventcom_guides" class="screenphoto screen_guides" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/small/guide125/sheetview.png")%>" />
<img alt="Sheet View" id="img6_eventcom_guides" class="bigphoto_screen" src="<%=VirtualPathUtility.ToAbsolute("~/images/help/Guides/big/guide125/sheetview.png")%>" />
<div target="img6_eventcom_guides" class="screenphoto magnifier"></div>
</div>
</div>
</div>
</div>

7
Web/Controls/Help/Desktop/Documents/DEChangelog.ascx
View File

@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
<div class="changelog-open-in-new-window"><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/desktop-editors-changelog.aspx")%>">Open in new window</a></div>
<%--<div class="changelog-version-block">
<div class="changelog-version-block">
<p class="changelog-main-header">Version 6.1</p>
<p class="changelog-release-date">Release date: <span class="crd-date">12/07/2020</span></p>
<div class="changelog-switcher">
@ -20,8 +20,7 @@
<ul>
<li>Added the <b>Line numbers</b> functionality.</li>
<li>Added the ability to insert, edit, and convert endnotes.</li>
<li>Added the ability to create cross-references.</li>
<li>Added the ability to differentiate review permissions by groups in the editor configuration file.</li>
<li>Added the ability to create cross-references.</li>
<li>Added the <b>Autoformat as you type</b> functionality to the proofing settings.</li>
</ul>
<p class="changelog-subsubheader">Spreadsheet Editor</p>
@ -40,7 +39,7 @@
<li>Updated the <b>Translator</b> plugin. It uses Google Translate instead of Yandex.</li>
</ul>
</div>
</div>--%>
</div>
<div class="changelog-version-block">
<p class="changelog-main-header">Version 6.0.2</p>
<p class="changelog-release-date">Release date: <span class="crd-date">11/19/2020</span></p>

7
Web/Controls/Help/Desktop/Documents/DEChangelog.ru.ascx
View File

@ -1,6 +1,6 @@
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
<div class="changelog-open-in-new-window"><a target="_blank" href="<%=VirtualPathUtility.ToAbsolute("~/desktop/documents/allplatforms/desktop-editors-changelog.aspx")%>">Открыть в новом окне</a></div>
<%--<div class="changelog-version-block">
<div class="changelog-version-block">
<p class="changelog-main-header">Версия 6.1</p>
<p class="changelog-release-date">Дата выпуска: <span class="crd-date">07.12.2020</span></p>
<div class="changelog-switcher">
@ -20,8 +20,7 @@
<ul>
<li>Добавлена функциональность <b>Нумерация строк</b>.</li>
<li>Добавлена возможность вставлять, редактировать и конвертировать концевые сноски.</li>
<li>Добавлена возможность создания перекрестных ссылок.</li>
<li>Добавлена возможность разграничения прав доступа к рецензированию для групп пользователей в файле конфигурации редактора.</li>
<li>Добавлена возможность создания перекрестных ссылок.</li>
<li>В настройки правописания добавлена функциональность <b>автоформатирования при вводе</b>.</li>
</ul>
<p class="changelog-subsubheader">Редактор электронных таблиц</p>
@ -40,7 +39,7 @@
<li>Обновлен плагин <b>Переводчик</b>. Используется Google Translate вместо Yandex.</li>
</ul>
</div>
</div>--%>
</div>
<div class="changelog-version-block">
<p class="changelog-main-header">Версия 6.0.2</p>
<p class="changelog-release-date">Дата выпуска: <span class="crd-date">19.11.2020</span></p>

2
Web/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditors_Current.ascx
View File

@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<a class="page_version_link" target="_blank" href="https://github.com/ONLYOFFICE/DesktopEditors"><cc:localizecontent runat="Server" controlname="~/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditorsProduct.ascx" /><span class="pvl_version pvl_current">v.6.0</span></a>
<a class="page_version_link" target="_blank" href="https://github.com/ONLYOFFICE/DesktopEditors"><cc:localizecontent runat="Server" controlname="~/Controls/Help/VariousControls/Versions/DesktopEditors/DesktopEditorsProduct.ascx" /><span class="pvl_version pvl_current">v.6.1</span></a>
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/Changelogs/DesktopEditorsChangelog.ascx" />

BIN
Web/images/Help/GettingStarted/Desktop/big/plugins.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
Web/images/Help/GettingStarted/Desktop/big/settings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
Web/images/Help/GettingStarted/Desktop/small/plugins.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
Web/images/Help/GettingStarted/Desktop/small/settings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Web/images/Help/Guides/big/guide125/compare.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 110 KiB

BIN
Web/images/Help/Guides/big/guide125/controls.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 111 KiB

BIN
Web/images/Help/Guides/big/guide125/sheetview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 KiB

BIN
Web/images/Help/Guides/small/guide125/compare.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
Web/images/Help/Guides/small/guide125/controls.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 47 KiB

BIN
Web/images/Help/Guides/small/guide125/sheetview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 99 KiB