Skip to content

W
web-apps
Commit e6379cda authored by Alexey Golubev's avatar Alexey Golubev
Browse files
Options

Merge tag 'v4.4.1' into develop 

v4.4.1
parents 53e272e5 6a9407d6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3825 additions and 533 deletions
Readme.md
View file @ e6379cda
[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)
[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html)
## web-apps
......
apps/api/documents/api.js
View file @ e6379cda
......@@ -43,6 +43,7 @@
print: <can print>, // default = true
rename: <can rename>, // default = false
changeHistory: <can change history>, // default = false
comment: <can comment in view mode> // default = edit
}
},
editorConfig: {
......
apps/common/main/lib/view/Comments.js
View file @ e6379cda
......@@ -517,7 +517,7 @@ define([
if (this.handlerHide) {
this.handlerHide ();
}
this.hideTips();
Common.UI.Window.prototype.hide.call(this);
if (!_.isUndefined(this.e) && this.e.keyCode == Common.UI.Keys.ESC) {
......
apps/documenteditor/main/app/controller/Main.js
View file @ e6379cda
......@@ -828,6 +828,7 @@ define([
} else if (!me.appOptions.isEdit && me.appOptions.canComments) {
me._state.fastCoauth = true;
me.api.asc_SetFastCollaborative(me._state.fastCoauth);
me.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None);
me.api.asc_setAutoSaveGap(1);
} else {
me._state.fastCoauth = false;
......@@ -1001,7 +1002,7 @@ define([
this.appOptions.canHistoryRestore= this.editorConfig.canHistoryRestore && !!this.permissions.changeHistory;
this.appOptions.canUseMailMerge= this.appOptions.canLicense && this.appOptions.canEdit && /*!this.appOptions.isDesktopApp*/ !this.appOptions.isOffline;
this.appOptions.canSendEmailAddresses = this.appOptions.canLicense && this.editorConfig.canSendEmailAddresses && this.appOptions.canEdit && this.appOptions.canCoAuthoring;
this.appOptions.canComments = this.appOptions.canLicense && (this.permissions.comments===undefined ? this.appOptions.isEdit : this.permissions.comments);
this.appOptions.canComments = this.appOptions.canLicense && (this.permissions.comment===undefined ? this.appOptions.isEdit : this.permissions.comment);
this.appOptions.canComments = this.appOptions.canComments && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
this.appOptions.canEditStyles = this.appOptions.canLicense && this.appOptions.canEdit;
......
apps/documenteditor/main/app/controller/Statusbar.js
View file @ e6379cda
......@@ -205,7 +205,7 @@ define([
} else {
var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl);
(this.api.asc_HaveRevisionsChanges()) ? iconEl.removeClass(this.statusbar.btnReviewCls).addClass('btn-ic-changes') : iconEl.removeClass('btn-ic-changes').addClass(this.statusbar.btnReviewCls);
if (value!==null && parseInt(value) == 1) {
if (value!==null && parseInt(value) == 1 && !showChangesPanel) { // when customization.showReviewChanges == true "track revisions" mode must be off!!!
this.changeReviewStatus(!this.statusbar.mode.isLightVersion);
// show tooltip "track changes in this document" and change icon
if (this.showTrackChangesTip && !statusbarIsHidden){
......
apps/documenteditor/main/app/view/ChartSettings.js
View file @ e6379cda
......@@ -145,7 +145,8 @@ define([
this.mnuChartTypePicker.selectRecord(record, true);
if (record) {
this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls'));
}
} else
this.btnChartType.setIconCls('');
this.updateChartStyles(this.api.asc_getChartPreviews(type));
this._state.ChartType = type;
}
......@@ -263,6 +264,7 @@ define([
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
// { id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
......@@ -290,6 +292,11 @@ define([
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
});
......@@ -552,7 +559,8 @@ define([
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textStyle: 'Style'
textStyle: 'Style',
textSurface: 'Surface'
}, DE.Views.ChartSettings || {}));
});
\ No newline at end of file
apps/documenteditor/main/app/view/Toolbar.js
View file @ e6379cda
......@@ -1417,6 +1417,7 @@ define([
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
// { id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true},
......@@ -1444,6 +1445,10 @@ define([
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, allowSelected: true, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, allowSelected: true, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, allowSelected: true, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, allowSelected: true, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, allowSelected: true, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, allowSelected: true, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
});
......@@ -1966,7 +1971,8 @@ define([
mniNoteSettings: 'Notes Settings',
textGotoFootnote: 'Go to Footnotes',
tipChangeChart: 'Change Chart Type',
textColumnsCustom: 'Custom Columns'
textColumnsCustom: 'Custom Columns',
textSurface: 'Surface'
}, DE.Views.Toolbar || {}));
});
apps/documenteditor/main/locale/cs.json
View file @ e6379cda
This diff is collapsed.
apps/documenteditor/main/locale/de.json
View file @ e6379cda
......@@ -119,7 +119,7 @@
"Common.Views.Comments.textCancel": "Abbrechen",
"Common.Views.Comments.textClose": "Schließen",
"Common.Views.Comments.textComments": "Kommentare",
"Common.Views.Comments.textEdit": "Bearbeiten",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Geben Sie Ihren Kommentar hier ein",
"Common.Views.Comments.textOpenAgain": "Erneut öffnen",
"Common.Views.Comments.textReply": "Antworten",
......@@ -291,6 +291,22 @@
"DE.Controllers.Main.txtRectangles": "Rechtecke",
"DE.Controllers.Main.txtSeries": "Reihen",
"DE.Controllers.Main.txtStarsRibbons": "Sterne und Bänder",
"DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
"DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
"DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
"DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
"DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
"DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
"DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
"DE.Controllers.Main.txtStyle_Intense_Quote": "Intensives Zitat",
"DE.Controllers.Main.txtStyle_List_Paragraph": "Listenabsatz",
"DE.Controllers.Main.txtStyle_No_Spacing": "Kein Abstand",
"DE.Controllers.Main.txtStyle_Normal": "Normal",
"DE.Controllers.Main.txtStyle_Quote": "Zitat",
"DE.Controllers.Main.txtStyle_Subtitle": "Untertitel",
"DE.Controllers.Main.txtStyle_Title": "Titel\t",
"DE.Controllers.Main.txtXAxis": "x-Achse",
"DE.Controllers.Main.txtYAxis": "y-Achse",
"DE.Controllers.Main.unknownErrorText": "Unbekannter Fehler.",
......@@ -658,6 +674,7 @@
"DE.Views.ChartSettings.textSize": "Größe",
"DE.Views.ChartSettings.textStock": "Kurs",
"DE.Views.ChartSettings.textStyle": "Stil",
"DE.Views.ChartSettings.textSurface": "Oberfläche",
"DE.Views.ChartSettings.textUndock": "Seitenbereich abdocken",
"DE.Views.ChartSettings.textWidth": "Breite",
"DE.Views.ChartSettings.textWrap": "Textumbruch",
......@@ -669,6 +686,12 @@
"DE.Views.ChartSettings.txtTight": "Passend",
"DE.Views.ChartSettings.txtTitle": "Diagramm",
"DE.Views.ChartSettings.txtTopAndBottom": "Oben und unten",
"DE.Views.CustomColumnsDialog.cancelButtonText": "Abbrechen",
"DE.Views.CustomColumnsDialog.okButtonText": "Ok",
"DE.Views.CustomColumnsDialog.textColumns": "Anzahl von Spalten\t",
"DE.Views.CustomColumnsDialog.textSeparator": "Spaltenunterteilers",
"DE.Views.CustomColumnsDialog.textSpacing": "Abstand zwischen Spalten",
"DE.Views.CustomColumnsDialog.textTitle": "Spalten",
"DE.Views.DocumentHolder.aboveText": "Oben",
"DE.Views.DocumentHolder.addCommentText": "Kommentar hinzufügen",
"DE.Views.DocumentHolder.advancedFrameText": "Rahmen - Erweiterte Einstellungen",
......@@ -751,7 +774,7 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Mittig ausrichten",
"DE.Views.DocumentHolder.textShapeAlignRight": "Rechtsbündig ausrichten",
"DE.Views.DocumentHolder.textShapeAlignTop": "Oben ausrichten",
"DE.Views.DocumentHolder.textUndo": "Undo",
"DE.Views.DocumentHolder.textUndo": "Rückgängig machen",
"DE.Views.DocumentHolder.textWrap": "Textumbruch",
"DE.Views.DocumentHolder.tipIsLocked": "Dieses Element wird gerade von einem anderen Benutzer bearbeitet.",
"DE.Views.DocumentHolder.txtAddBottom": "Unterer Rand hinzufügen",
......@@ -1475,6 +1498,7 @@
"DE.Views.Toolbar.textBottom": "Unten: ",
"DE.Views.Toolbar.textCharts": "Diagramme",
"DE.Views.Toolbar.textColumn": "Spalte",
"DE.Views.Toolbar.textColumnsCustom": "Benutzerdefinierte Spalten",
"DE.Views.Toolbar.textColumnsLeft": "Links",
"DE.Views.Toolbar.textColumnsOne": "Ein\t",
"DE.Views.Toolbar.textColumnsRight": "Rechts",
......@@ -1528,6 +1552,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "Aus der Auswahl neu aktualisieren",
"DE.Views.Toolbar.textSubscript": "Tiefgestellt",
"DE.Views.Toolbar.textSuperscript": "Hochgestellt",
"DE.Views.Toolbar.textSurface": "Oberfläche",
"DE.Views.Toolbar.textTitleError": "Fehler",
"DE.Views.Toolbar.textToCurrent": "An aktueller Position",
"DE.Views.Toolbar.textTop": "Oben: ",
......
apps/documenteditor/main/locale/en.json
View file @ e6379cda
......@@ -119,7 +119,7 @@
"Common.Views.Comments.textCancel": "Cancel",
"Common.Views.Comments.textClose": "Close",
"Common.Views.Comments.textComments": "Comments",
"Common.Views.Comments.textEdit": "Edit",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Enter your comment here",
"Common.Views.Comments.textOpenAgain": "Open Again",
"Common.Views.Comments.textReply": "Reply",
......@@ -291,6 +291,22 @@
"DE.Controllers.Main.txtRectangles": "Rectangles",
"DE.Controllers.Main.txtSeries": "Series",
"DE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
"DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
"DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
"DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
"DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
"DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
"DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
"DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
"DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
"DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
"DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
"DE.Controllers.Main.txtStyle_Normal": "Normal",
"DE.Controllers.Main.txtStyle_Quote": "Quote",
"DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
"DE.Controllers.Main.txtStyle_Title": "Title",
"DE.Controllers.Main.txtXAxis": "X Axis",
"DE.Controllers.Main.txtYAxis": "Y Axis",
"DE.Controllers.Main.unknownErrorText": "Unknown error.",
......@@ -305,22 +321,6 @@
"DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>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).<br>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.txtStyle_Normal": "Normal",
"DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
"DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
"DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
"DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
"DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
"DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
"DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
"DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
"DE.Controllers.Main.txtStyle_Title": "Title",
"DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
"DE.Controllers.Main.txtStyle_Quote": "Quote",
"DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
"DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
"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}%",
......@@ -674,6 +674,7 @@
"DE.Views.ChartSettings.textSize": "Size",
"DE.Views.ChartSettings.textStock": "Stock",
"DE.Views.ChartSettings.textStyle": "Style",
"DE.Views.ChartSettings.textSurface": "Surface",
"DE.Views.ChartSettings.textUndock": "Undock from panel",
"DE.Views.ChartSettings.textWidth": "Width",
"DE.Views.ChartSettings.textWrap": "Wrapping Style",
......@@ -685,12 +686,12 @@
"DE.Views.ChartSettings.txtTight": "Tight",
"DE.Views.ChartSettings.txtTitle": "Chart",
"DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
"DE.Views.CustomColumnsDialog.textTitle": "Columns",
"DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
"DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
"DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
"DE.Views.CustomColumnsDialog.cancelButtonText": "Cancel",
"DE.Views.CustomColumnsDialog.okButtonText": "Ok",
"DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
"DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
"DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
"DE.Views.CustomColumnsDialog.textTitle": "Columns",
"DE.Views.DocumentHolder.aboveText": "Above",
"DE.Views.DocumentHolder.addCommentText": "Add Comment",
"DE.Views.DocumentHolder.advancedFrameText": "Frame Advanced Settings",
......@@ -773,6 +774,7 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Align Middle",
"DE.Views.DocumentHolder.textShapeAlignRight": "Align Right",
"DE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
"DE.Views.DocumentHolder.textUndo": "Undo",
"DE.Views.DocumentHolder.textWrap": "Wrapping Style",
"DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
"DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
......@@ -858,7 +860,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"DE.Views.DocumentHolder.textUndo": "Undo",
"DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
"DE.Views.DropcapSettingsAdvanced.okButtonText": "Ok",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
......@@ -1497,6 +1498,7 @@
"DE.Views.Toolbar.textBottom": "Bottom: ",
"DE.Views.Toolbar.textCharts": "Charts",
"DE.Views.Toolbar.textColumn": "Column",
"DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
"DE.Views.Toolbar.textColumnsLeft": "Left",
"DE.Views.Toolbar.textColumnsOne": "One",
"DE.Views.Toolbar.textColumnsRight": "Right",
......@@ -1550,6 +1552,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
"DE.Views.Toolbar.textSubscript": "Subscript",
"DE.Views.Toolbar.textSuperscript": "Superscript",
"DE.Views.Toolbar.textSurface": "Surface",
"DE.Views.Toolbar.textTitleError": "Error",
"DE.Views.Toolbar.textToCurrent": "To current position",
"DE.Views.Toolbar.textTop": "Top: ",
......@@ -1629,6 +1632,5 @@
"DE.Views.Toolbar.txtScheme6": "Concourse",
"DE.Views.Toolbar.txtScheme7": "Equity",
"DE.Views.Toolbar.txtScheme8": "Flow",
"DE.Views.Toolbar.txtScheme9": "Foundry",
"DE.Views.Toolbar.textColumnsCustom": "Custom Columns"
"DE.Views.Toolbar.txtScheme9": "Foundry"
}
\ No newline at end of file
apps/documenteditor/main/locale/es.json
View file @ e6379cda
......@@ -105,7 +105,7 @@
"Common.Views.About.txtLicensee": "LICENCIATARIO ",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "email: ",
"Common.Views.About.txtPoweredBy": "Impulsado por",
"Common.Views.About.txtPoweredBy": "Desarrollado por",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versión ",
"Common.Views.AdvancedSettingsWindow.cancelButtonText": "Cancelar",
......@@ -119,7 +119,7 @@
"Common.Views.Comments.textCancel": "Cancelar",
"Common.Views.Comments.textClose": "Cerrar",
"Common.Views.Comments.textComments": "Comentarios",
"Common.Views.Comments.textEdit": "Editar",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Introduzca su comentario aquí",
"Common.Views.Comments.textOpenAgain": "Abrir de nuevo",
"Common.Views.Comments.textReply": "Responder",
......@@ -161,9 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "El valor mínimo para este campo es {0}.",
"Common.Views.InsertTableDialog.txtRows": "Número de filas",
"Common.Views.InsertTableDialog.txtTitle": "Tamaño de tabla",
"Common.Views.LanguageDialog.btnCancel": "Cancel",
"Common.Views.LanguageDialog.btnOk": "Ok",
"Common.Views.LanguageDialog.labelSelect": "Select document language",
"Common.Views.LanguageDialog.btnCancel": "Cancelar",
"Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Seleccionar el idioma de documento",
"Common.Views.OpenDialog.cancelButtonText": "Cancelar",
"Common.Views.OpenDialog.okButtonText": "Aceptar",
"Common.Views.OpenDialog.txtEncoding": "Codificación",
......@@ -291,6 +291,22 @@
"DE.Controllers.Main.txtRectangles": "Rectángulos",
"DE.Controllers.Main.txtSeries": "Serie",
"DE.Controllers.Main.txtStarsRibbons": "Cintas y estrellas",
"DE.Controllers.Main.txtStyle_Heading_1": "Título 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Título 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Título 3",
"DE.Controllers.Main.txtStyle_Heading_4": "Título 4",
"DE.Controllers.Main.txtStyle_Heading_5": "Título 5",
"DE.Controllers.Main.txtStyle_Heading_6": "Título 6",
"DE.Controllers.Main.txtStyle_Heading_7": "Título 7",
"DE.Controllers.Main.txtStyle_Heading_8": "Título 8",
"DE.Controllers.Main.txtStyle_Heading_9": "Título 9",
"DE.Controllers.Main.txtStyle_Intense_Quote": "Cita seleccionada",
"DE.Controllers.Main.txtStyle_List_Paragraph": "Párrafo de la lista",
"DE.Controllers.Main.txtStyle_No_Spacing": "Sin espacio",
"DE.Controllers.Main.txtStyle_Normal": "Normal",
"DE.Controllers.Main.txtStyle_Quote": "Cita",
"DE.Controllers.Main.txtStyle_Subtitle": "Subtítulo",
"DE.Controllers.Main.txtStyle_Title": "Título",
"DE.Controllers.Main.txtXAxis": "Eje X",
"DE.Controllers.Main.txtYAxis": "Eje Y",
"DE.Controllers.Main.unknownErrorText": "Error desconocido.",
......@@ -658,6 +674,7 @@
"DE.Views.ChartSettings.textSize": "Tamaño",
"DE.Views.ChartSettings.textStock": "De cotizaciones",
"DE.Views.ChartSettings.textStyle": "Estilo",
"DE.Views.ChartSettings.textSurface": "Superficie",
"DE.Views.ChartSettings.textUndock": "Desacoplar de panel",
"DE.Views.ChartSettings.textWidth": "Ancho",
"DE.Views.ChartSettings.textWrap": "Ajuste de texto",
......@@ -669,6 +686,12 @@
"DE.Views.ChartSettings.txtTight": "Estrecho",
"DE.Views.ChartSettings.txtTitle": "Gráfico",
"DE.Views.ChartSettings.txtTopAndBottom": "Superior e inferior",
"DE.Views.CustomColumnsDialog.cancelButtonText": "Cancelar",
"DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Número de columnas",
"DE.Views.CustomColumnsDialog.textSeparator": "Divisor de columnas",
"DE.Views.CustomColumnsDialog.textSpacing": "Espacio entre columnas",
"DE.Views.CustomColumnsDialog.textTitle": "Columnas",
"DE.Views.DocumentHolder.aboveText": "Arriba",
"DE.Views.DocumentHolder.addCommentText": "Añadir comentario",
"DE.Views.DocumentHolder.advancedFrameText": "Ajustes avanzados de marco",
......@@ -687,8 +710,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Borrar fila",
"DE.Views.DocumentHolder.deleteTableText": "Borrar tabla",
"DE.Views.DocumentHolder.deleteText": "Borrar",
"DE.Views.DocumentHolder.direct270Text": "Girar a 270°",
"DE.Views.DocumentHolder.direct90Text": "Girar a 90°",
"DE.Views.DocumentHolder.direct270Text": "Girar texto hacia arriba",
"DE.Views.DocumentHolder.direct90Text": "Girar texto hacia abajo",
"DE.Views.DocumentHolder.directHText": "Horizontal ",
"DE.Views.DocumentHolder.directionText": "Dirección de texto",
"DE.Views.DocumentHolder.editChartText": "Editar datos",
......@@ -751,7 +774,7 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Alinear al medio",
"DE.Views.DocumentHolder.textShapeAlignRight": "Alinear a la derecha",
"DE.Views.DocumentHolder.textShapeAlignTop": "Alinear en la parte superior",
"DE.Views.DocumentHolder.textUndo": "Undo",
"DE.Views.DocumentHolder.textUndo": "Deshacer",
"DE.Views.DocumentHolder.textWrap": "Ajuste de texto",
"DE.Views.DocumentHolder.tipIsLocked": "Otro usuario está editando este elemento ahora.",
"DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
......@@ -804,7 +827,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Insertar grieta manual",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Insertar la ecuación después de",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Insertar la ecuación antes de",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Mantener solo texto",
"DE.Views.DocumentHolder.txtLimitChange": "Cambiar ubicación de límites",
"DE.Views.DocumentHolder.txtLimitOver": "Límite sobre el texto",
"DE.Views.DocumentHolder.txtLimitUnder": "Límite debajo del texto",
......@@ -930,7 +953,7 @@
"DE.Views.FileMenuPanels.Settings.strForcesave": "Siempre guardar en el servidor (de lo contrario guardar en el servidor al cerrar documento)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Activar jeroglíficos",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Activar opción de demostración de comentarios",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Activar la visualización de los comentarios resueltos",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Cambios de colaboración en tiempo real",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activar corrección ortográfica",
"DE.Views.FileMenuPanels.Settings.strStrict": "Estricto",
......@@ -1475,6 +1498,7 @@
"DE.Views.Toolbar.textBottom": "Inferior: ",
"DE.Views.Toolbar.textCharts": "Gráficos",
"DE.Views.Toolbar.textColumn": "Gráfico de columnas",
"DE.Views.Toolbar.textColumnsCustom": "Columnas personalizadas",
"DE.Views.Toolbar.textColumnsLeft": "Izquierdo",
"DE.Views.Toolbar.textColumnsOne": "Uno",
"DE.Views.Toolbar.textColumnsRight": "Derecho",
......@@ -1528,6 +1552,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "Actualizar de la selección",
"DE.Views.Toolbar.textSubscript": "Subíndice",
"DE.Views.Toolbar.textSuperscript": "Sobreíndice",
"DE.Views.Toolbar.textSurface": "Superficie",
"DE.Views.Toolbar.textTitleError": "Error",
"DE.Views.Toolbar.textToCurrent": "A la posición actual",
"DE.Views.Toolbar.textTop": "Top: ",
......
apps/documenteditor/main/locale/fr.json
View file @ e6379cda
......@@ -119,7 +119,7 @@
"Common.Views.Comments.textCancel": "Annuler",
"Common.Views.Comments.textClose": "Fermer",
"Common.Views.Comments.textComments": "Commentaires",
"Common.Views.Comments.textEdit": "Modifier",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Entrez votre commentaire ici",
"Common.Views.Comments.textOpenAgain": "Ouvrir à nouveau",
"Common.Views.Comments.textReply": "Répondre",
......
apps/documenteditor/main/locale/it.json
View file @ e6379cda
......@@ -114,7 +114,7 @@
"Common.Views.Comments.textCancel": "Annulla",
"Common.Views.Comments.textClose": "Chiudi",
"Common.Views.Comments.textComments": "Commenti",
"Common.Views.Comments.textEdit": "Modifica",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Inserisci il commento qui",
"Common.Views.Comments.textOpenAgain": "Apri di nuovo",
"Common.Views.Comments.textReply": "Rispondi",
......
apps/documenteditor/main/locale/pt.json
View file @ e6379cda
This diff is collapsed.
apps/documenteditor/main/locale/ru.json
View file @ e6379cda
......@@ -119,7 +119,7 @@
"Common.Views.Comments.textCancel": "Отмена",
"Common.Views.Comments.textClose": "Закрыть",
"Common.Views.Comments.textComments": "Комментарии",
"Common.Views.Comments.textEdit": "Правка",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEnterCommentHint": "Введите здесь свой комментарий",
"Common.Views.Comments.textOpenAgain": "Открыть снова",
"Common.Views.Comments.textReply": "Ответить",
......@@ -291,6 +291,22 @@
"DE.Controllers.Main.txtRectangles": "Прямоугольники",
"DE.Controllers.Main.txtSeries": "Ряд",
"DE.Controllers.Main.txtStarsRibbons": "Звезды и ленты",
"DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Заголовок 3",
"DE.Controllers.Main.txtStyle_Heading_4": "Заголовок 4",
"DE.Controllers.Main.txtStyle_Heading_5": "Заголовок 5",
"DE.Controllers.Main.txtStyle_Heading_6": "Заголовок 6",
"DE.Controllers.Main.txtStyle_Heading_7": "Заголовок 7",
"DE.Controllers.Main.txtStyle_Heading_8": "Заголовок 8",
"DE.Controllers.Main.txtStyle_Heading_9": "Заголовок 9",
"DE.Controllers.Main.txtStyle_Intense_Quote": "Выделенная цитата",
"DE.Controllers.Main.txtStyle_List_Paragraph": "Абзац списка",
"DE.Controllers.Main.txtStyle_No_Spacing": "Без интервала",
"DE.Controllers.Main.txtStyle_Normal": "Обычный",
"DE.Controllers.Main.txtStyle_Quote": "Цитата",
"DE.Controllers.Main.txtStyle_Subtitle": "Подзаголовок",
"DE.Controllers.Main.txtStyle_Title": "Название",
"DE.Controllers.Main.txtXAxis": "Ось X",
"DE.Controllers.Main.txtYAxis": "Ось Y",
"DE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",
......@@ -305,22 +321,6 @@
"DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"DE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"DE.Controllers.Main.txtStyle_Normal": "Обычный",
"DE.Controllers.Main.txtStyle_No_Spacing": "Без интервала",
"DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Заголовок 3",
"DE.Controllers.Main.txtStyle_Heading_4": "Заголовок 4",
"DE.Controllers.Main.txtStyle_Heading_5": "Заголовок 5",
"DE.Controllers.Main.txtStyle_Heading_6": "Заголовок 6",
"DE.Controllers.Main.txtStyle_Heading_7": "Заголовок 7",
"DE.Controllers.Main.txtStyle_Heading_8": "Заголовок 8",
"DE.Controllers.Main.txtStyle_Heading_9": "Заголовок 9",
"DE.Controllers.Main.txtStyle_Title": "Название",
"DE.Controllers.Main.txtStyle_Subtitle": "Подзаголовок",
"DE.Controllers.Main.txtStyle_Quote": "Цитата",
"DE.Controllers.Main.txtStyle_Intense_Quote": "Выделенная цитата",
"DE.Controllers.Main.txtStyle_List_Paragraph": "Абзац списка",
"DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
"DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений",
"DE.Controllers.Statusbar.zoomText": "Масштаб {0}%",
......@@ -674,6 +674,7 @@
"DE.Views.ChartSettings.textSize": "Размер",
"DE.Views.ChartSettings.textStock": "Биржевая",
"DE.Views.ChartSettings.textStyle": "Стиль",
"DE.Views.ChartSettings.textSurface": "Поверхность",
"DE.Views.ChartSettings.textUndock": "Открепить от панели",
"DE.Views.ChartSettings.textWidth": "Ширина",
"DE.Views.ChartSettings.textWrap": "Стиль обтекания",
......@@ -685,6 +686,12 @@
"DE.Views.ChartSettings.txtTight": "По контуру",
"DE.Views.ChartSettings.txtTitle": "Диаграмма",
"DE.Views.ChartSettings.txtTopAndBottom": "Сверху и снизу",
"DE.Views.CustomColumnsDialog.cancelButtonText": "Отмена",
"DE.Views.CustomColumnsDialog.okButtonText": "Ok",
"DE.Views.CustomColumnsDialog.textColumns": "Количество колонок",
"DE.Views.CustomColumnsDialog.textSeparator": "Разделитель",
"DE.Views.CustomColumnsDialog.textSpacing": "Интервал между колонками",
"DE.Views.CustomColumnsDialog.textTitle": "Колонки",
"DE.Views.DocumentHolder.aboveText": "Выше",
"DE.Views.DocumentHolder.addCommentText": "Добавить комментарий",
"DE.Views.DocumentHolder.advancedFrameText": "Дополнительные параметры рамки",
......@@ -1491,6 +1498,7 @@
"DE.Views.Toolbar.textBottom": "Нижнее: ",
"DE.Views.Toolbar.textCharts": "Диаграммы",
"DE.Views.Toolbar.textColumn": "Гистограмма",
"DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
"DE.Views.Toolbar.textColumnsLeft": "Слева",
"DE.Views.Toolbar.textColumnsOne": "Одна",
"DE.Views.Toolbar.textColumnsRight": "Справа",
......@@ -1544,6 +1552,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "Обновить из выделенного фрагмента",
"DE.Views.Toolbar.textSubscript": "Подстрочные знаки",
"DE.Views.Toolbar.textSuperscript": "Надстрочные знаки",
"DE.Views.Toolbar.textSurface": "Поверхность",
"DE.Views.Toolbar.textTitleError": "Ошибка",
"DE.Views.Toolbar.textToCurrent": "В текущей позиции",
"DE.Views.Toolbar.textTop": "Верхнее: ",
......
apps/documenteditor/main/locale/zh.json
View file @ e6379cda
......@@ -291,6 +291,22 @@
"DE.Controllers.Main.txtRectangles": "矩形",
"DE.Controllers.Main.txtSeries": "系列",
"DE.Controllers.Main.txtStarsRibbons": "星星和丝带",
"DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
"DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
"DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
"DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
"DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
"DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
"DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
"DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
"DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
"DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
"DE.Controllers.Main.txtStyle_Normal": "Normal",
"DE.Controllers.Main.txtStyle_Quote": "Quote",
"DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
"DE.Controllers.Main.txtStyle_Title": "Title",
"DE.Controllers.Main.txtXAxis": "X轴",
"DE.Controllers.Main.txtYAxis": "Y轴",
"DE.Controllers.Main.unknownErrorText": "示知错误",
......@@ -658,6 +674,7 @@
"DE.Views.ChartSettings.textSize": "大小",
"DE.Views.ChartSettings.textStock": "股票",
"DE.Views.ChartSettings.textStyle": "类型",
"DE.Views.ChartSettings.textSurface": "Surface",
"DE.Views.ChartSettings.textUndock": "离开面板",
"DE.Views.ChartSettings.textWidth": "宽度",
"DE.Views.ChartSettings.textWrap": "包裹风格",
......@@ -669,6 +686,12 @@
"DE.Views.ChartSettings.txtTight": "紧",
"DE.Views.ChartSettings.txtTitle": "图表",
"DE.Views.ChartSettings.txtTopAndBottom": "上下",
"DE.Views.CustomColumnsDialog.cancelButtonText": "Cancel",
"DE.Views.CustomColumnsDialog.okButtonText": "Ok",
"DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
"DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
"DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
"DE.Views.CustomColumnsDialog.textTitle": "Columns",
"DE.Views.DocumentHolder.aboveText": "以上",
"DE.Views.DocumentHolder.addCommentText": "发表评论",
"DE.Views.DocumentHolder.advancedFrameText": "框架高级设置",
......@@ -1475,6 +1498,7 @@
"DE.Views.Toolbar.textBottom": "底部：",
"DE.Views.Toolbar.textCharts": "图表",
"DE.Views.Toolbar.textColumn": "列",
"DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
"DE.Views.Toolbar.textColumnsLeft": "左",
"DE.Views.Toolbar.textColumnsOne": "一",
"DE.Views.Toolbar.textColumnsRight": "右",
......@@ -1528,6 +1552,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "从选择更新",
"DE.Views.Toolbar.textSubscript": "下标",
"DE.Views.Toolbar.textSuperscript": "上标",
"DE.Views.Toolbar.textSurface": "Surface",
"DE.Views.Toolbar.textTitleError": "错误:",
"DE.Views.Toolbar.textToCurrent": "到当前位置",
"DE.Views.Toolbar.textTop": "顶边：",
......
apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm
View file @ e6379cda
......@@ -12,7 +12,7 @@
<p><b>Document Editor</b> lets you change its advanced settings. To access them, click the <b>File</b> <img alt="File icon" src="../images/file.png" /> icon at the left sidebar and select the <b>Advanced Settings...</b> option. You can also use the <img alt="Advanced Settings icon" src="../images/advanced_settings_icon.png" /> icon in the right upper corner of the top toolbar.</p>
<p>The advanced settings are:</p>
<ul>
<li><b>Commenting Display</b><sup class="oOfficeFeatures">*</sup> is used to turn on/off the live commenting option. If you disable this feature, the commented passages will be highlighted only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</li>
<li><b>Commenting Display</b> is used to turn on/off the live commenting option. If you disable this feature, the commented passages will be highlighted only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</li>
<li><b>Spell Checking</b> is used to turn on/off the spell checking option.</li>
<li><b>Alternate Input</b> is used to turn on/off hieroglyphs.</li>
<li><b>Alignment Guides</b> is used to turn on/off alignment guides that appear when you move objects and allow you to position them on the page precisely.</li>
......@@ -43,7 +43,6 @@
<li><b>Unit of Measurement</b> is used to specify what units are used on the rulers and in properties windows for measuring elements parameters such as width, height, spacing, margins etc. You can select the <b>Centimeter</b>, <b>Point</b>, or <b>Inch</b> option.</li>
</ul>
<p>To save the changes you made, click the <b>Apply</b> button.</p>
<p class="oOfficeFeatures"><sup>*</sup>available for paid versions only</p>
</div>
</body>
</html>
\ No newline at end of file
apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
View file @ e6379cda
......@@ -26,7 +26,7 @@
<p>When no users are viewing or editing the file, the icon in the status bar will look like <img alt="Manage document access rights icon" src="../images/access_rights.png" /> allowing you to manage the users who have access to the file right from the document: invite new users giving them either full or read-only access, or denying some users access rights to the file. Click this icon to manage the access to the file; this can be done both when there are no other users who view or co-edit the document at the moment and when there are other users and the icon looks like <img alt="Number of users icon" src="../images/usersnumber.png" />.</p>
<p>As soon as one of the users saves his/her changes by clicking the <img alt="Save icon" src="../images/savewhilecoediting.png" /> icon, the others will see a note within the status bar stating that they have updates. To save the changes you made, so that other users can view them, and get the updates saved by your co-editors, click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar. The updates will be highlighted for you to check what exactly has been changed.</p>
<p>You can specify what changes you want to be highlighted during co-editing if you click the <img alt="File icon" src="../images/file.png" /> icon at the left sidebar, select the <b>Advanced Settings...</b> option and choose between <b>none</b>, <b>all</b> and <b>last</b> realtime collaboration changes. Selecting <b>View all</b> changes, all the changes made during the current session will be highlighted. Selecting <b>View last</b> changes, only the changes made since you last time clicked the <img alt="Save icon" src="../images/saveupdate.png" /> icon will be highlighted. Selecting <b>View None</b> changes, changes made during the current session will not be highlighted.</p>
<h3>Chat<a class="sup_link" href="../HelpfulHints/CollaborativeEditing.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></h3>
<h3>Chat</h3>
<p>You can use this tool to coordinate the co-editing process on-the-fly, for example, to arrange with your collaborators about who is doing what, which paragraph you are going to edit now etc.</p>
<p>The chat messages are stored during one session only. To discuss the document content it is better to use comments which are stored until you decide to delete them.</p>
<p>To access the chat and leave a message for other users,</p>
......@@ -38,7 +38,7 @@
<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 - <img alt="Chat icon" src="../images/chaticon_new.png" />.</p>
<p>To close the panel with chat messages, click the <img alt="Chat icon" src="../images/chaticon.png" /> icon once again.</p>
</div>
<h3>Comments<a class="sup_link oOfficeFeatures" href="../HelpfulHints/CollaborativeEditing.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></h3>
<h3>Comments</h3>
<p>To leave a comment,</p>
<ol>
<li>select a text passage where you think there is an error or problem,</li>
......@@ -59,7 +59,6 @@
</ul>
<p>New comments added by other users will become visible only after you click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar.</p>
<p>To close the panel with comments, click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon once again.</p>
<p class="oOfficeFeatures"><sup id="footnote">*</sup>available for paid versions only</p>
</div>
</body>
</html>
\ No newline at end of file
apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
View file @ e6379cda
......@@ -25,17 +25,17 @@
<td>Open the <b>Search</b> panel to start searching for a character/word/phrase in the currently edited document.</td>
</tr>
<tr>
<td>Open 'Comments' panel<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
<td>Open 'Comments' panel</td>
<td>Ctrl+Shift+H</td>
<td>Open the <b>Comments</b> panel to add your own comment or reply to other users' comments.</td>
</tr>
<tr>
<td>Open comment field<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
<td>Open comment field</td>
<td>Alt+H</td>
<td>Open a data entry field where you can add the text of your comment.</td>
</tr>
<tr class="onlineDocumentFeatures">
<td>Open 'Chat' panel<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
<td>Open 'Chat' panel</td>
<td>Alt+Q</td>
<td>Open the <b>Chat</b> panel and send a message.</td>
</tr>
......@@ -347,7 +347,6 @@
<td>Hold down the Ctrl key and use the keybord arrows to move the selected object by three pixels at a time.</td>
</tr>
</table>
<p class="oOfficeFeatures"><sup id="footnote">*</sup> - available for paid versions only</p>
</div>
</body>
</html>
\ No newline at end of file
apps/documenteditor/main/resources/help/fr/UsageInstructions/AddHyperlinks.htm
View file @ e6379cda
......@@ -13,21 +13,21 @@
<p>Pour ajouter un lien hypertexte,</p>
<ol>
<li>placez le curseur là où vous voulez insérer un lien hypertexte,</li>
<li>cliquez sur l'icône <b>Ajouter un lien hypertexte</b> <img alt="l'icône Ajouter un lien hypertexte" src="../images/addhyperlink.png" /> de la barre d'outils supérieure,</li>
<li>cliquez sur l'icône <b>Ajouter un lien hypertexte</b> <img alt="l'icône Ajouter un lien hypertexte" src="../images/addhyperlink.png" /> sur la barre d'outils supérieure,</li>
<li>dans la fenêtre ouverte spécifiez les paramètres du lien hypertexte :
<ul>
<li><b>Lien vers</b> - entrez une URL au format <i>http://www.exemple.com</i>.</li>
<li><b>Afficher</b> - entrez un texte qui sera cliquable et amènera à l'adresse Web indiquée dans le champ supérieur.</li>
<li><b>Texte de l'info-bulle</b> - entrez un texte qui sera visible dans une petite fenêtre contextuelle qui offre une courte remarque ou l'étiquette concernant le lien hypertexte sur lequel est placé le pointeur de la souris.</li>
<li><b>Texte de l'info-bulle</b> - entrez un texte qui sera visible dans une petite fenêtre contextuelle qui offre une courte remarque ou l'étiquette concernant le lien hypertexte sur lequel le pointeur de la souris est placé.</li>
</ul>
<p><img alt="Ajouter une fenêtre de lien hypertexte" src="../images/hyperlinkwindow.png" /></p>
</li>
<li>Cliquez sur le bouton <b>OK</b>.</li>
</ol>
<p>Pour ajouter un lien hypertexte, vous pouvez également cliquer avec le bouton droit de la souris et sélectionner l'option <b>Lien hypertexte</b> du menu contextuel pour ouvrir la fenêtre ci-dessus.</p>
<p class="note"><b>Remarque</b>: il est également possible de sélectionner un caractère, mot, combinaison de mots, passage de texte contenant une image avec la souris ou <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">en utilisant le clavier</a> et cliquer sur
l'icône <b>Ajouter un lien hypertexte</b> <img alt="l'icône Ajouter un lien hypertexte" src="../images/addhyperlink.png" /> de la barre d'outils supérieure ou cliquer droit sur la selection et choisir l'option <b>Lien hypertexte</b> du menu contextuel.
Après quoi la fenêtre indiquée ci-dessus s'ouvre avec le fragment de texte sélectionné affiché dans le champ <b>Afficher</b>.</p>
<p>Pour ajouter un lien hypertexte, vous pouvez également cliquer avec le bouton droit de la souris à l'endroit nécessaire et sélectionner l'option <b>Lien hypertexte</b> du menu contextuel pour ouvrir la fenêtre affichée ci-dessus.</p>
<p class="note"><b>Remarque</b>: il est également possible de sélectionner un caractère, mot, combinaison de mots, passage de texte avec la souris ou <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">en utilisant le clavier</a> et cliquer sur
l'icône <b>Ajouter un lien hypertexte</b> <img alt="l'icône Ajouter un lien hypertexte" src="../images/addhyperlink.png" /> sur la barre d'outils supérieure ou cliquer droit sur la selection et choisir l'option <b>Lien hypertexte</b> du menu contextuel.
Après quoi la fenêtre indiquée ci-dessus s'ouvre et le fragment du texte sélectionné s'affiche dans le champ <b>Afficher</b>.</p>
<p>Placez le curseur sur le lien hypertexte ajouté pour voir l'info-bulle contenant le texte que vous avez spécifié.
Pour suivre le lien appuyez sur la touche <b>CTRL</b> et cliquez sur le lien dans votre document.</p>
<p>Pour modifier ou supprimer le lien hypertexte ajouté, cliquez-le droit, sélectionnez l'option <b>Lien hypertexte</b> et l'opération à effectuer - <b>Modifier le lien hypertexte</b> ou <b>Supprimer le lien hypertexte</b>.</p>
......
apps/documenteditor/main/resources/help/fr/UsageInstructions/CopyClearFormatting.htm
View file @ e6379cda
......@@ -12,9 +12,16 @@
<h1>Copier/effacer la mise en forme du texte</h1>
<p>Pour copier une certaine mise en forme du texte,</p>
<ol>
<li>sélectionnez le passage du texte avec la mise en forme à copier en utilisant la souris <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">ou le clavier</a>,</li>
<li>cliquez sur l'icône de la barre d'outils supérieure <b>Copier le style</b> <img alt="Copier le style" src="../images/copystyle.png" /> ,</li>
<li>sélectionnez le passage du texte à mettre en forme.</li>
<li>sélectionnez le passage du texte contenant la mise en forme à copier en utilisant la souris <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">ou le clavier</a>,</li>
<li>cliquez sur l'icône <b>Copier le style</b> <img alt="Copier le style" src="../images/copystyle.png" /> sur la barre d'outils supérieure ( le pointeur de la souris aura la forme suivante <img alt="Pointeur de la souris lors du collage du style" src="../images/paste_style.png" />),</li>
<li>sélectionnez le passage du texte à appliquer la mise en forme.</li>
</ol>
<p>Pour appliquer la mise en forme copiée aux plusieurs fragments du texte,</p>
<ol>
<li>sélectionnez le fragment du texte contenant la mise en forme à copier en utilisant la souris ou <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">le clavier</a>,</li>
<li>couble-cliquez sur l'icône <b>Copier le style</b> <img alt="Copier le style" src="../images/copystyle.png" /> sur la barre d'outils superieure ( le pointeur de la souris aura la forme suivante <img alt="Pointeur de la souris lors du collage du style" src="../images/paste_style.png" /> et l'icône <b>Copier le style</b> reste sélectionnée : <img alt="Multiples copies de styles" src="../images/copystyle_selected.png" />),</li>
<li>sélectionnez les fragments du texte nécessaires un par un pour appliquer la même mise en forme pour chacun d'eux,</li>
<li>pour quitter ce mode, cliquez sur l'icône <b>Copier le style</b> <img alt="Multiples copies de styles" src="../images/copystyle_selected.png" /> encore une fois ou appuyez sur la touche <b>Échap</b> sur le clavier.</li>
</ol>
<p>Pour effacer la mise en forme appliquée à partir de votre texte,</p>
<ol>
......
apps/documenteditor/main/resources/help/fr/UsageInstructions/DecorationStyles.htm
View file @ e6379cda
......@@ -13,7 +13,7 @@
<p>Vous pouvez appliquer de différents styles de police en utilisant les icônes correspondantes situées sur la barre d'outils supérieure.</p>
<p class="note"><b>Remarque</b> : si vous voulez appliquer la mise en forme au texte déjà saisi, sélectionnez-le avec la souris ou <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">en utilisant le clavier</a> et appliquez la mise en forme.</p>
<table>
<tr>
<!--<tr>
<td>Incrément de la taille de la police </td>
<td><img alt="La taille de la police d'un incrément" src="../images/larger.png" /></td>
<td>Sert à modifier la taille de la police en la rendant plus grosse chaque fois que l'icône est cliquée.</td>
......@@ -22,10 +22,10 @@
<td>Decrement de la taille de la police </td>
<td><img alt="Decrement de la taille de la police" src="../images/smaller.png" /></td>
<td>Sert à modifier la taille de la police en la rendant plus petite chaque fois que l'icône est cliquée.</td>
</tr>
</tr>-->
<tr>
<td>Gras</td>
<td><img alt="Gras" src="../images/bold.png" /></td>
<td><img alt="Bold" src="../images/bold.png" /></td>
<td>Sert à mettre la police en gras pour lui donner plus de poids.</td>
</tr>
<tr>
......@@ -36,12 +36,12 @@
<tr>
<td>Souligné</td>
<td><img alt="Souligné" src="../images/underline.png" /></td>
<td>Sert à souligner le texte.</td>
<td>Sert à souligner le texte par la ligne passant sous les lettres.</td>
</tr>
<tr>
<td>Barré</td>
<td><img alt="Barré" src="../images/strike.png" /></td>
<td>Sert à barrer le texte d'une ligne passant par les lettres.</td>
<td>Sert à barrer le texte par la ligne passant par les lettres.</td>
</tr>
<tr>
<td>Exposant</td>
......@@ -57,8 +57,8 @@
<p>Pour accéder aux paramètres avancés de la police, cliquez avec le bouton droit de la souris et sélectionnez l'option <b>Paramètres avancés du paragraphe</b> du menu contextuel ou utilisez le lien <b>Afficher les paramètres avancés</b> sur la barre latérale droite. Dans la fenêtre <b>Paragraphe - Paramètres avancés</b> ouverte passez à l'onglet <b>Police</b>.</p>
<p>Ici vous pouvez utiliser les styles de décoration de police et les paramètres suivants :</p>
<ul>
<li><b>Barré</b> sert à barrer le texte d'une ligne passant par les lettres.</li>
<li><b>Barré double</b> sert à barrer le texte d'une ligne double passant par les lettres.</li>
<li><b>Barré</b> sert à barrer le texte par la ligne passant par les lettres.</li>
<li><b>Barré double</b> sert à barrer le texte par la ligne double passant par les lettres.</li>
<li><b>Exposant</b> sert à rendre le texte plus petit et le déplacer vers la partie supérieure de la ligne du texte, par exemple comme dans les fractions.</li>
<li><b>Indice</b> sert à rendre le texte plus petit et le déplacer vers la partie inférieure de la ligne du texte, par exemple comme dans les formules chimiques.</li>
<li><b>Petites majuscules</b> sert à mettre toutes les lettres en petite majuscule.</li>
......
apps/documenteditor/main/resources/help/fr/UsageInstructions/FontTypeSizeColor.htm
View file @ e6379cda
<!DOCTYPE html>
<html>
<head>
<head>
<title>Définir le type de police, la taille et la couleur</title>
<meta charset="utf-8" />
<meta name="description" content="Modifier les paramètres suivants de la mise en forme du texte: le type de police, la taille, et la couleur" />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
</head>
<body>
</head>
<body>
<div class="mainpart">
<h1>Définir le type de police, la taille et la couleur</h1>
<p>Vous pouvez sélectionner le type de police, sa taille et sa couleur en utilisant les icônes correspondantes de la barre d'outils supérieure.</p>
......@@ -35,15 +35,11 @@
</tr>
<tr>
<td>Couleur de surlignage</td>
<td><img alt="Couleur de surlignage" src="../images/highlightcolor.png" /></td>
<td>Sert à marquer les phrases, les mots ou les caractères séparés à l'aide de la bande couleur ajoutée qui imite l'effet du surligneur autour du texte. Vous pouvez sélectionner la partie nécessaire du texte et puis cliquer sur la flèche vers le bas située à côté de l'icône pour sélectionner une couleur dans la palette (cette couleur ne depend pas du <b>Jeu de couleurs</b> sélectionnée et inclut 16 couleurs) - cette couleur sera appliquée à la sélection de texte. Vous pouvez également choisir une couleur de surlignage et puis commencer à sélectionner le texte avec la souris - le pointeur de souris prendra l'apparence suivante <img alt="Mouse pointer while highlighting" src="../images/highlight_color_mouse_pointer.png" /> et vous pourrez surligner de différentes parties de votre texte de manière séquentielle. To stop highlighting just click the icon once again. To clear the highlight color, choose the <b>No Fill</b> option. <b>Highlight Color</b> is different from the <a href="../UsageInstructions/BackgroundColor.htm" onclick="onhyperlinkclick(this)"><b>Background Color</b></a> <img alt="Paragraph Background Color Icon" src="../images/backgroundcolor.png" /> as the latter is applied to the whole paragraph and completely fills all the paragraph space from the left page margin to the right page margin.</td>
</tr>
<tr>
<td>Couleur de police</td>
<td><img alt="Couleur de police" src="../images/fontcolor.png" /></td>
<td>Sert à changer la couleur des lettres /characters dans le texte. Cliquez sur la flèche vers le bas à côté de l'icône pour sélectionner une couleur à partir des palettes disponibles. Les couleurs dans les palettes dépendent du jeu de couleurs sélectionné qu'on peut choisir en cliquant sur l'icône <b>Modifier le jeu de couleurs</b> <img alt="Modifier le jeu de couleurs" src="../images/changecolorscheme.png" /> sur la barre d'outils supérieure.</td>
<td><img alt="Font Color" src="../images/fontcolor.png" /></td>
<td>Sert à changer la couleur des lettres /characters dans le texte. Par défaut, la couleur de police automatique est définie dans un nouveau document vide. Elle s'affiche comme la police noire sur l'arrière-plan blanc. Si vous choisissez le noir comme la couleur d'arrière-plan, la couleur de la police se change automatiquement à la couleur blanche pour que le texte soit visible. Pour choisir une autre couleur, cliquez sur la flèche vers le bas située à côté de l'icône et sélectionnez une couleur disponible dans les palettes (les couleurs de la palette <b>Couleurs de thème</b> dépend du <a href="../UsageInstructions/ChangeColorScheme.htm" onclick="onhyperlinkclick(this)">jeu de couleurs</a> sélectionné). Après avoir modifié la couleur de police par défaut, vous pouvez utiliser l'option <b>Automatique</b> dans la fenêtre des palettes de couleurs pour restaurer rapidement la couleur automatique pour le fragment du texte sélectionné.</td>
</tr>
</table>
<p class="note"><b>Remarque</b>: pour en savoir plus sur l'utilisation des palettes de couleurs, consultez <a href="../UsageInstructions/ChangeColorScheme.htm" onclick="onhyperlinkclick(this)">cette page</a>.</p>
</div>
</body>
</body>
</html>
\ No newline at end of file
apps/presentationeditor/main/locale/cs.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/de.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/en.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/es.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/fr.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/it.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/pt.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/ru.json
View file @ e6379cda
This diff is collapsed.
apps/presentationeditor/main/locale/zh.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/cs.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/de.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/en.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/es.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/fr.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/it.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/pt.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/ru.json
View file @ e6379cda
This diff is collapsed.
apps/spreadsheeteditor/main/locale/zh.json
View file @ e6379cda
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7