diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less
index 4f6a337b0..b53c4f6ad 100644
--- a/apps/common/main/resources/less/plugins.less
+++ b/apps/common/main/resources/less/plugins.less
@@ -54,7 +54,7 @@
margin-right: 10px;
margin-top: -1px;
- .background-ximage('@{common-image-path}/plugin/icon_add_on_default.png', '@{common-image-path}/plugin/icon_add_on_default@2x.png', 31px);
+ .background-ximage('@{common-image-path}/plugin/icon_add_on_default.png', '@{common-image-path}/plugin/icon_add_on_default@2x.png', 40px);
}
.plugin-caret {
diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json
index 21609fe1a..3292d4abd 100644
--- a/apps/documenteditor/main/locale/de.json
+++ b/apps/documenteditor/main/locale/de.json
@@ -141,7 +141,6 @@
"Common.Views.ExternalMergeEditor.textTitle": "Seriendruckempfänger\t",
"Common.Views.Header.openNewTabText": "In neuer Registerkarte öffnen",
"Common.Views.Header.textBack": "Zu Dokumenten übergehen",
- "Common.Views.Header.txtHeaderDeveloper": "ENTWICKLERMODUS",
"Common.Views.Header.txtRename": "Umbenennen",
"Common.Views.History.textCloseHistory": "Historie schließen",
"Common.Views.History.textHide": "Reduzieren",
@@ -206,6 +205,7 @@
"DE.Controllers.Main.downloadTextText": "Dokument wird heruntergeladen...",
"DE.Controllers.Main.downloadTitleText": "Herunterladen des Dokuments",
"DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.
Wenden Sie sich an Ihren Serveradministrator.",
+ "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.",
"DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.
Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.
Mehr Information zur Verbindung des Dokument Servers finden Sie hier",
"DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
@@ -262,10 +262,12 @@
"DE.Controllers.Main.splitMaxRowsErrorText": "Die Zeilenanzahl muss weniger als %1 sein.",
"DE.Controllers.Main.textAnonymous": "Anonym",
"DE.Controllers.Main.textBuyNow": "Webseite besuchen",
+ "DE.Controllers.Main.textChangesSaved": "Alle Änderungen werden gespeichert",
"DE.Controllers.Main.textCloseTip": "Klicken Sie, um den Tipp zu schließen",
"DE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
"DE.Controllers.Main.textLoadingDocument": "Dokument wird geladen...\t",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Open Source Version",
+ "DE.Controllers.Main.textShape": "Form",
"DE.Controllers.Main.textStrict": "Formaler Modus",
"DE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.
Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.",
"DE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
@@ -923,6 +925,7 @@
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Sie müssen die Änderungen annehmen, bevor Sie diese sehen können",
"DE.Views.FileMenuPanels.Settings.strFast": "Schnell",
"DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting der Schriftarten",
+ "DE.Views.FileMenuPanels.Settings.strForcesave": "Immer auf dem Server speichern (ansonsten auf dem Server beim Schließen des Dokuments speichern)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Hieroglyphen einschalten",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Live-Kommentare einschalten",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Änderungen bei der Echtzeit-Zusammenarbeit zeigen",
@@ -938,6 +941,7 @@
"DE.Views.FileMenuPanels.Settings.textAutoRecover": "Autowiederherstellen",
"DE.Views.FileMenuPanels.Settings.textAutoSave": "Automatisch speichern",
"DE.Views.FileMenuPanels.Settings.textDisabled": "Deaktiviert",
+ "DE.Views.FileMenuPanels.Settings.textForceSave": "Auf dem Server speichern",
"DE.Views.FileMenuPanels.Settings.textMinute": "Jede Minute",
"DE.Views.FileMenuPanels.Settings.txtAll": "Alle anzeigen",
"DE.Views.FileMenuPanels.Settings.txtCm": "Zentimeter",
@@ -1070,6 +1074,7 @@
"DE.Views.LeftMenu.tipSearch": "Suchen",
"DE.Views.LeftMenu.tipSupport": "Feedback und Support",
"DE.Views.LeftMenu.tipTitles": "Titel",
+ "DE.Views.LeftMenu.txtDeveloper": "ENTWICKLERMODUS",
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Abbrechen",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Senden",
@@ -1342,7 +1347,7 @@
"DE.Views.TableSettings.textSelectBorders": "Wählen Sie Rahmenlinien, auf die ein anderer Stil angewandt wird",
"DE.Views.TableSettings.textTemplate": "Vorlage auswählen",
"DE.Views.TableSettings.textTotal": "Insgesamt",
- "DE.Views.TableSettings.textWrap": "Textumbruch",
+ "DE.Views.TableSettings.textWrap": "Umbruch",
"DE.Views.TableSettings.textWrapNoneTooltip": "Inline-Tabelle",
"DE.Views.TableSettings.textWrapParallelTooltip": "Flow-Tabelle",
"DE.Views.TableSettings.tipAll": "Äußere Rahmenlinie und alle inneren Linien festlegen",
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 177a0ceb2..2eead2efd 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -146,7 +146,6 @@
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.textBack": "Go to Documents",
- "del_Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.tipAccessRights": "Manage document access rights",
@@ -223,6 +222,7 @@
"DE.Controllers.Main.downloadTextText": "Downloading document...",
"DE.Controllers.Main.downloadTitleText": "Downloading Document",
"DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.",
+ "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.
Find more information about connecting Document Server here",
"DE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.",
@@ -234,6 +234,7 @@
"DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
"DE.Controllers.Main.errorMailMergeSaveFile": "Merge failed.",
"DE.Controllers.Main.errorProcessSaveResult": "Saving failed.",
+ "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
"DE.Controllers.Main.errorSessionAbsolute": "The document editing session has expired. Please reload the page.",
"DE.Controllers.Main.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
"DE.Controllers.Main.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
@@ -278,13 +279,16 @@
"DE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.",
"DE.Controllers.Main.textAnonymous": "Anonymous",
"DE.Controllers.Main.textBuyNow": "Visit website",
+ "del_DE.Controllers.Main.textChangesSaved": "All changes saved",
"DE.Controllers.Main.textCloseTip": "Click to close the tip",
"DE.Controllers.Main.textContactUs": "Contact sales",
"DE.Controllers.Main.textLoadingDocument": "Loading document",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
+ "DE.Controllers.Main.textShape": "Shape",
"DE.Controllers.Main.textStrict": "Strict mode",
"DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.
Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
"DE.Controllers.Main.titleLicenseExp": "License expired",
+ "DE.Controllers.Main.titleServerVersion": "Editor updated",
"DE.Controllers.Main.titleUpdateVersion": "Version changed",
"DE.Controllers.Main.txtArt": "Your text here",
"DE.Controllers.Main.txtBasicShapes": "Basic Shapes",
@@ -315,9 +319,6 @@
"DE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.",
"DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
- "DE.Controllers.Main.titleServerVersion": "Editor updated",
- "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
- "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -942,6 +943,7 @@
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them",
"DE.Views.FileMenuPanels.Settings.strFast": "Fast",
"DE.Views.FileMenuPanels.Settings.strFontRender": "Font Hinting",
+ "DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Turn on hieroglyphs",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Turn on display of the comments",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Realtime Collaboration Changes",
@@ -957,6 +959,7 @@
"DE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover",
"DE.Views.FileMenuPanels.Settings.textAutoSave": "Autosave",
"DE.Views.FileMenuPanels.Settings.textDisabled": "Disabled",
+ "DE.Views.FileMenuPanels.Settings.textForceSave": "Save to Server",
"DE.Views.FileMenuPanels.Settings.textMinute": "Every Minute",
"DE.Views.FileMenuPanels.Settings.txtAll": "View All",
"DE.Views.FileMenuPanels.Settings.txtCm": "Centimeter",
@@ -972,8 +975,6 @@
"DE.Views.FileMenuPanels.Settings.txtPt": "Point",
"DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking",
"DE.Views.FileMenuPanels.Settings.txtWin": "as Windows",
- "DE.Views.FileMenuPanels.Settings.textForceSave": "Save to Server",
- "DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)",
"DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom Center",
"DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom Left",
"DE.Views.HeaderFooterSettings.textBottomRight": "Bottom Right",
@@ -1353,7 +1354,7 @@
"DE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above",
"DE.Views.TableSettings.textTemplate": "Select From Template",
"DE.Views.TableSettings.textTotal": "Total",
- "DE.Views.TableSettings.textWrap": "Text Wrapping",
+ "DE.Views.TableSettings.textWrap": "Wrapping Style",
"DE.Views.TableSettings.textWrapNoneTooltip": "Inline table",
"DE.Views.TableSettings.textWrapParallelTooltip": "Flow table",
"DE.Views.TableSettings.tipAll": "Set Outer Border and All Inner Lines",
diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json
index ce66640d0..81a6bfaa0 100644
--- a/apps/documenteditor/main/locale/fr.json
+++ b/apps/documenteditor/main/locale/fr.json
@@ -141,7 +141,6 @@
"Common.Views.ExternalMergeEditor.textTitle": "Destinataires de fusion et publipostage",
"Common.Views.Header.openNewTabText": "Ouvrir dans un nouvel onglet",
"Common.Views.Header.textBack": "Aller aux Documents",
- "Common.Views.Header.txtHeaderDeveloper": "MODE DEVELOPPEUR",
"Common.Views.Header.txtRename": "Renommer",
"Common.Views.History.textCloseHistory": "Fermer l'historique",
"Common.Views.History.textHide": "Réduire",
@@ -206,8 +205,9 @@
"DE.Controllers.Main.downloadTextText": "Téléchargement du document...",
"DE.Controllers.Main.downloadTitleText": "Téléchargement du document",
"DE.Controllers.Main.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.
Veuillez contacter l'administrateur de Document Server.",
+ "DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.",
- "DE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.
Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.
Trouvez plus d'informations sur la connexion Document Serverhere",
+ "DE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.
Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.
Trouvez plus d'informations sur la connexion de Document Serverici",
"DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.
Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
"DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
"DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
@@ -262,10 +262,12 @@
"DE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être inférieure à %1.",
"DE.Controllers.Main.textAnonymous": "Anonyme",
"DE.Controllers.Main.textBuyNow": "Visiter le site web",
+ "DE.Controllers.Main.textChangesSaved": "Toutes les modifications sont enregistrées",
"DE.Controllers.Main.textCloseTip": "Cliquez pour fermer le conseil",
"DE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
"DE.Controllers.Main.textLoadingDocument": "Chargement du document",
"DE.Controllers.Main.textNoLicenseTitle": "La version open source de ONLYOFFICE",
+ "DE.Controllers.Main.textShape": "Forme",
"DE.Controllers.Main.textStrict": "Mode strict",
"DE.Controllers.Main.textTryUndoRedo": "Les fonctions annuler/rétablir sont désactivées pour le mode de co-édition rapide.
Cliquez sur le bouton \"Mode strict\" pour passer au mode de la co-édition stricte pour modifier le fichier sans interférence d'autres utilisateurs et envoyer vos modifications seulement après que vous les enregistrez. Vous pouvez basculer entre les modes de co-édition à l'aide de paramètres avancés d'éditeur.",
"DE.Controllers.Main.titleLicenseExp": "Licence expirée",
@@ -923,6 +925,7 @@
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Avant de pouvoir afficher les modifications, vous avez besoin de les accépter ",
"DE.Views.FileMenuPanels.Settings.strFast": "Rapide",
"DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting de la police",
+ "DE.Views.FileMenuPanels.Settings.strForcesave": "Toujours enregistrer sur le serveur ( sinon enregistrer sur le serveur lors de la fermeture du document )",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Activer des hiéroglyphes",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Activer l'affichage des commentaires",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Changements de collaboration en temps réel",
@@ -938,6 +941,7 @@
"DE.Views.FileMenuPanels.Settings.textAutoRecover": "Récupération automatique",
"DE.Views.FileMenuPanels.Settings.textAutoSave": "Enregistrement automatique",
"DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé",
+ "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur",
"DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
"DE.Views.FileMenuPanels.Settings.txtAll": "Tous",
"DE.Views.FileMenuPanels.Settings.txtCm": "Centimètre",
@@ -1070,6 +1074,7 @@
"DE.Views.LeftMenu.tipSearch": "Recherche",
"DE.Views.LeftMenu.tipSupport": "Commentaires & assistance",
"DE.Views.LeftMenu.tipTitles": "Titres",
+ "DE.Views.LeftMenu.txtDeveloper": "MODE DEVELOPPEUR",
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Annuler",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Envoyer",
@@ -1175,7 +1180,7 @@
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Toutes en majuscules",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordures et remplissage",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Saut de page avant",
- "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double biffés",
+ "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Barré double",
"DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Première ligne",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
@@ -1187,7 +1192,7 @@
"DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Retraits et emplacement",
"DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Emplacement",
"DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Petites majuscules",
- "DE.Views.ParagraphSettingsAdvanced.strStrike": "Biffés",
+ "DE.Views.ParagraphSettingsAdvanced.strStrike": "Barré",
"DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indice",
"DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Exposant",
"DE.Views.ParagraphSettingsAdvanced.strTabs": "Tabulation",
@@ -1342,7 +1347,7 @@
"DE.Views.TableSettings.textSelectBorders": "Sélectionnez les bordures à modifier en appliquant le style choisi ci-dessus",
"DE.Views.TableSettings.textTemplate": "Sélectionner à partir d'un modèle",
"DE.Views.TableSettings.textTotal": "Total",
- "DE.Views.TableSettings.textWrap": "Habillage du texte",
+ "DE.Views.TableSettings.textWrap": "Style d'habillage",
"DE.Views.TableSettings.textWrapNoneTooltip": "Tableau aligné",
"DE.Views.TableSettings.textWrapParallelTooltip": "Tableau flottant",
"DE.Views.TableSettings.tipAll": "Bordure extérieure et la totalité des lignes intérieures",
@@ -1540,7 +1545,7 @@
"DE.Views.Toolbar.tipColumns": "Insérer des colonnes ",
"DE.Views.Toolbar.tipCopy": "Copier",
"DE.Views.Toolbar.tipCopyStyle": "Copier le style",
- "DE.Views.Toolbar.tipDecFont": "Réduire taille de la police",
+ "DE.Views.Toolbar.tipDecFont": "Réduire la taille de la police",
"DE.Views.Toolbar.tipDecPrLeft": "Réduire le retrait",
"DE.Views.Toolbar.tipDropCap": "Insérer une lettrine",
"DE.Views.Toolbar.tipEditHeader": "Modifier l'en-tête ou le pied de page",
@@ -1549,7 +1554,7 @@
"DE.Views.Toolbar.tipFontSize": "Taille de la police",
"DE.Views.Toolbar.tipHAligh": "Alignement horizontal",
"DE.Views.Toolbar.tipHighlightColor": "Couleur de surlignage",
- "DE.Views.Toolbar.tipIncFont": "Augmenter taille de la police",
+ "DE.Views.Toolbar.tipIncFont": "Augmenter la taille de la police",
"DE.Views.Toolbar.tipIncPrLeft": "Augmenter le retrait",
"DE.Views.Toolbar.tipInsertChart": "Insérer un graphique",
"DE.Views.Toolbar.tipInsertEquation": "Insérer une équation",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 5aea5cecc..12ee32989 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -141,7 +141,6 @@
"Common.Views.ExternalMergeEditor.textTitle": "Получатели слияния",
"Common.Views.Header.openNewTabText": "Открыть в новой вкладке",
"Common.Views.Header.textBack": "Перейти к Документам",
- "Common.Views.Header.txtHeaderDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
"Common.Views.Header.txtRename": "Переименовать",
"Common.Views.History.textCloseHistory": "Закрыть историю",
"Common.Views.History.textHide": "Свернуть",
@@ -206,6 +205,7 @@
"DE.Controllers.Main.downloadTextText": "Загрузка документа...",
"DE.Controllers.Main.downloadTitleText": "Загрузка документа",
"DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.
Пожалуйста, обратитесь к администратору Сервера документов.",
+ "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.",
"DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.
Дополнительную информацию о подключении Сервера документов можно найти здесь",
"DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
@@ -262,10 +262,12 @@
"DE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1.",
"DE.Controllers.Main.textAnonymous": "Аноним",
"DE.Controllers.Main.textBuyNow": "Перейти на сайт",
+ "DE.Controllers.Main.textChangesSaved": "Все изменения сохранены",
"DE.Controllers.Main.textCloseTip": "Щелкните, чтобы закрыть эту подсказку",
"DE.Controllers.Main.textContactUs": "Связаться с отделом продаж",
"DE.Controllers.Main.textLoadingDocument": "Загрузка документа",
"DE.Controllers.Main.textNoLicenseTitle": "Open source версия ONLYOFFICE",
+ "DE.Controllers.Main.textShape": "Фигура",
"DE.Controllers.Main.textStrict": "Строгий режим",
"DE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.",
"DE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии",
@@ -923,6 +925,7 @@
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Прежде чем вы сможете увидеть изменения, их надо будет принять",
"DE.Views.FileMenuPanels.Settings.strFast": "Быстрый",
"DE.Views.FileMenuPanels.Settings.strFontRender": "Хинтинг шрифтов",
+ "DE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Включить отображение комментариев в тексте",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе",
@@ -938,6 +941,7 @@
"DE.Views.FileMenuPanels.Settings.textAutoRecover": "Автовосстановление",
"DE.Views.FileMenuPanels.Settings.textAutoSave": "Автосохранение",
"DE.Views.FileMenuPanels.Settings.textDisabled": "Отключено",
+ "DE.Views.FileMenuPanels.Settings.textForceSave": "Сохранить на сервере",
"DE.Views.FileMenuPanels.Settings.textMinute": "Каждую минуту",
"DE.Views.FileMenuPanels.Settings.txtAll": "Все",
"DE.Views.FileMenuPanels.Settings.txtCm": "Сантиметр",
@@ -1070,6 +1074,7 @@
"DE.Views.LeftMenu.tipSearch": "Поиск",
"DE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка",
"DE.Views.LeftMenu.tipTitles": "Заголовки",
+ "DE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Отмена",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Отправить",
@@ -1342,7 +1347,7 @@
"DE.Views.TableSettings.textSelectBorders": "Выберите границы, к которым надо применить выбранный стиль",
"DE.Views.TableSettings.textTemplate": "По шаблону",
"DE.Views.TableSettings.textTotal": "Итоговая",
- "DE.Views.TableSettings.textWrap": "Обтекание текстом",
+ "DE.Views.TableSettings.textWrap": "Стиль обтекания",
"DE.Views.TableSettings.textWrapNoneTooltip": "Встроенная таблица",
"DE.Views.TableSettings.textWrapParallelTooltip": "Плавающая таблица",
"DE.Views.TableSettings.tipAll": "Задать внешнюю границу и все внутренние линии",
diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm
index 722746f9a..3c10ae6a4 100644
--- a/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm
+++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/About.htm
@@ -9,8 +9,8 @@
About Document Editor
-
Document Editor is an online application that lets you look through
- and edit documents directly in your browser.
+
Document Editor is an online application that lets you look through
+ and edit documents directly in your browser.
Using Document Editor, you can perform various editing operations like in any desktop editor,
print the edited documents keeping all the formatting details or download them onto your computer hard disk drive
as PDF, TXT, DOCX, ODT, or HTML files.
diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
index d584e3ce2..cb92d719a 100644
--- a/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
+++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
@@ -12,12 +12,13 @@
Collaborative Document Editing
Document Editor offers you the possibility to work at a document collaboratively with other users. This feature includes:
- - simultaneous multi-user access to the edited document
- - visual indication of passages that are being edited by other users
- - synchronization of changes with one button click
- - chat to share ideas concerning particular document parts
+ - simultaneous multi-user access to the edited document
+ - visual indication of passages that are being edited by other users
+ - synchronization of changes with one button click
+ - chat to share ideas concerning particular document parts
- comments containing the description of a task or problem that should be solved
+
Co-editing
Document Editor allows to select one of the two available co-editing modes. Fast is used by default and shows the changes made by other users in realtime. Strict is selected to hide other user changes until you click the Save icon to save your own changes and accept the changes made by others. The mode can be selected in the Advanced Settings.
When a document is being edited by several users simultaneously in the Strict mode, the edited text passages are marked with dashed lines of different colors. By hovering the mouse cursor over one of the edited passages, the name of the user who is editing it at the moment is displayed. The Fast mode will show the actions and the names of the co-editors once they are editing the text.
@@ -36,7 +37,8 @@
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 - .
To close the panel with chat messages, click the icon once again.
-
Comments*
+
+
Comments*
To leave a comment,
- select a text passage where you think there is an error or problem,
@@ -57,7 +59,7 @@
New comments added by other users will become visible only after you click the icon in the left upper corner of the top toolbar.
To close the panel with comments, click the icon once again.
- available for paid versions only
+ available for paid versions only