Commit Graph

112 Commits

Author SHA1 Message Date
b107b60371 Edit several tags 2023-10-16 17:36:51 +03:00
fc9d81c75e Edit document-structure.ascx and line-breaks.ascx tags 2023-10-15 21:44:25 +03:00
4a6124b46f Edit several pages 2023-10-13 17:12:18 +03:00
6d38294b2e Structure fixes for /mobile-applications/documents/document-editor/page-formatting/set-page-parameters.aspx
Partial fix for /ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/InsertFunction.aspx
2023-10-13 11:22:52 +03:00
6c44bcb6f6 Merge branch 'feature/linode' into release/1.14.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
2023-07-27 13:45:58 +03:00
e96af023d3 Merge branch 'feature/ios7.4' into release/1.14.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2023-07-18 14:19:00 +03:00
trovier
f7cffd9cdb SpeechInput plugin (German) 2023-06-21 12:09:31 +02:00
7c73673533 Merge branch 'feature/structure' into release/1.13.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
2023-06-09 18:35:46 +03:00
a080447597 Edit math-trigonometry-functions.ascx tag 2023-05-02 18:51:02 +03:00
1649678fb3 Add translation, edit controls 2023-04-26 13:04:27 +03:00
d2db11f171 Edit financial-functions.ascx tag 2023-04-21 15:59:54 +03:00
22c4c39419 Edit engineering-functions.ascx tag 2023-04-11 18:40:37 +03:00
0e53b85f9d Remove outdated controls, edit 3 tags 2023-04-10 17:10:41 +03:00
043689366c Merge branch 'feature/workspace-12.5' into release/1.11.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/CommunicationPlugins.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HTML.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HighlightedCode.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertReferences.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Jitsi.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/PhotoEditor.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Speech.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Thesaurus.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Translator.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Typograf.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/WordCounter.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/CommunicationPlugins.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/HighlightedCode.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/PhotoEditor.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Thesaurus.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Translator.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/CommunicationPlugins.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/HighlightedCode.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PhotoEditor.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Thesaurus.aspx
#	Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Translator.aspx
2023-03-24 16:21:30 +03:00
3cf2880f0c Edit tag 2023-03-23 17:35:14 +03:00
37d55c3a87 Edit several tags 2023-03-22 16:12:03 +03:00
trovier
c16aef90b8 German translation added. 2023-03-20 15:04:22 +01:00
44a4b5b42e Edit two tags 2023-03-17 16:21:21 +03:00
d153102a14 Edit controls in articles complete list, edit several tags 2023-03-15 17:30:01 +03:00
2e85a9408e Continue fixes in ArticlesCompleteList 2023-03-10 14:13:11 +03:00
ca6ab5d94a Partial structure fixes in ArticlesCompleteList 2023-03-09 14:40:17 +03:00
50338ad4a3 Merge branch 'feature/translations-fr' into release/1.10.0 2023-03-06 17:59:11 +03:00
83210312ae Merge branch 'develop' into feature/workspace-12.5
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2023-02-22 15:11:53 +03:00
trovier
a21530189a German translation. 2023-02-21 21:35:27 +01:00
a3986844bd Edit controls in ArticlesCompleteList and .resx files for Installation -> Desktop section 2023-02-13 12:53:58 +03:00
trovier
5031af00d2 Added vsyscall (DE). 2023-02-09 14:21:20 +01:00
1899f5c892 Merge branch 'feature/structure' into release/1.9.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
2023-01-31 11:37:55 +03:00
a6859bed51 Edit tags: text-data-functions.ascx, using-functions.ascx, using-named-ranges.ascx; edit several aspx pages 2023-01-30 15:31:27 +03:00
ccca1e560a Partial fixes for text-data-functions.ascx tag 2023-01-26 18:24:19 +03:00
d73a91ae18 Edit lookup-reference-functions.ascx tag, start editing text-data-functions.ascx tag 2023-01-26 14:09:07 +03:00
0bbda1b219 Merge branch 'feature/issue31' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.resx
2022-11-18 16:48:02 +03:00
9adeed9022 Merge branch 'feature/structure-fixes' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.it.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrToolsAndSettings/AndrChangeSpreadsheetSettings/AndrChangeSpreadsheetSettings.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebDE/AndrWebDETableOfContents/AndrWebDETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebPE/AndrWebPETableOfContents/AndrWebPETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/Android/AndrWebSE/AndrWebSETableOfContents/AndrWebSETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebDE/iOSWebDETableOfContents/iOSWebDETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebPE/iOSWebPETableOfContents/iOSWebPETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobWebEditors/iOS/iOSWebSE/iOSWebSETableOfContents/iOSWebSETableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PresentationEditorTableOfContents/PresentationEditorTableOfContents.ru.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.es.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/SpreadsheetEditorTableOfContents/SpreadsheetEditorTableOfContents.ru.ascx
#	Web/Controls/Help/Tags/TagsCompleteArticleList.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.de.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.es.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.fr.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.it.ascx
#	Web/Controls/Help/Tags/page-margins/page-margins.ru.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.de.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.es.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.fr.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.it.ascx
#	Web/Controls/Help/Tags/page-orientation/page-orientation.ru.ascx
#	Web/Controls/Help/Tags/page-size/page-size.ascx
#	Web/Controls/Help/Tags/page-size/page-size.de.ascx
#	Web/Controls/Help/Tags/page-size/page-size.es.ascx
#	Web/Controls/Help/Tags/page-size/page-size.fr.ascx
#	Web/Controls/Help/Tags/page-size/page-size.it.ascx
#	Web/Controls/Help/Tags/page-size/page-size.ru.ascx
2022-11-14 12:15:47 +03:00
49112c908e Merge branch 'feature/android-5.5.0' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/ArticlesCompleteList/MobileApps/4338_mob_andr_endnotes.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrOperationsOnObjects/AndrAdjustChartSettings/AndrAdjustChartSettings.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrToolsAndSettings/AndrSaveExportPrintDoc/AndrSaveExportPrintDoc.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPEOperationsOnObjects/AndrPEAdjustChartSettings/AndrPEAdjustChartSettings.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrToolsAndSettings/AndrChangeSpreadsheetSettings/AndrChangeSpreadsheetSettings.fr.ascx
2022-11-14 11:29:46 +03:00
da589b70d7 Merge branch 'feature/help_fixes' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.it.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrDE/AndrDETableOfContents/AndrDETableOfContents.fr.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrCellTextFormatting/AndrSEFontTypeSizeColor/AndrSEFontTypeSizeColor.fr.ascx
#	Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/SpreadsheetEditor/FreezeRowsColumns/FreezeRowsColumns.fr.ascx
#	Web/Controls/Help/Tags/TagsCompleteArticleList.ascx
2022-11-14 10:42:10 +03:00
975641a499 Edit font-formatting.ascx and other tags 2022-11-08 18:27:55 +03:00
153ac52a12 Edit paragraph-formatting.ascx and other tags 2022-11-03 16:17:39 +03:00
trovier
db64127d4e Fixed resource.de 2022-11-02 17:15:16 +03:00
trovier
eb2f17a724 Merge branch 'feature/help_fixes' of https://github.com/ONLYOFFICE/helpcenter into feature/help_fixes
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2022-11-02 17:02:18 +03:00
trovier
ed375c5f18 German fixes + minor English fixes (typos). 2022-11-02 16:55:45 +03:00
c3e589e3eb Edit several tags 2022-11-02 16:26:50 +03:00
4446ae633f Edit page-formatting.ascx, footnotes.ascx, endnotes.ascx 2022-11-01 14:24:02 +03:00
c96fa6ef10 Add docs-community-https-windows.aspx 2022-10-25 14:33:21 +03:00
29613b3269 Edit several tags 2022-10-25 12:01:47 +03:00
97e56f7e66 Edit operations-with-files.ascx tag 2022-10-24 17:18:37 +03:00
10bfae6e9f Merge branch 'feature/android-5.5.0' into feature/structure-fixes
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrPE/AndrPETableOfContents/AndrPETableOfContents.de.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.ascx
#	Web/Controls/Help/MobApps/MobDocs/MobDocsAndr/AndrSE/AndrSETableOfContents/AndrSETableOfContents.de.ascx
2022-10-21 16:12:17 +03:00
trovier
fb2e843256 German translation updated (complete). 2022-10-17 18:12:29 +03:00
9b5fe7a64a Edit onlyoffice-online-editor-settings.ascx tag, remove unnecessary files 2022-10-05 13:43:14 +03:00
befe52a34a Build 7.2: German translation updated. 2022-09-21 18:06:03 +03:00
5c99bbc7eb Build 7.2: German translation updated. 2022-09-19 15:45:10 +03:00
f35aee6360 Build 7.2: minor fixes, screenshots updated (EN+DE) 2022-09-15 18:07:36 +03:00