',
- ''
- ].join('')),
- data: this.options.languages
- });
-
- if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true});
- this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this));
- this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]);
- this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord());
- },
-
- close: function(suppressevent) {
- var $window = this.getChild();
- if (!$window.find('.combobox.open').length) {
- Common.UI.Window.prototype.close.call(this, arguments);
- }
- },
-
- onBtnClick: function(event) {
- if (this.options.handler) {
- this.options.handler.call(this, event.currentTarget.attributes['result'].value, this.cmbLanguage.getValue());
- }
-
- this.close();
- },
-
- onLangSelect: function(cmb, rec, e) {
- var icon = cmb.$el.find('.input-lang-icon'),
- plang = icon.attr('lang');
-
- if (plang) icon.removeClass(plang);
- icon.addClass(rec.value).attr('lang',rec.value);
- },
-
- labelSelect : 'Select document language',
- btnCancel : 'Cancel',
- btnOk : 'Ok'
- }, LanguageDialog||{}));
}
);
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js
index 14e605088..8fd238dd1 100644
--- a/apps/documenteditor/main/app/view/StyleTitleDialog.js
+++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js
@@ -70,7 +70,7 @@ define([
''
].join('');
- this.options.tpl = _.template(this.template, this.options);
+ this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@@ -107,10 +107,11 @@ define([
menuStyle : 'width: 100%; max-height: 290px;',
editable : false,
cls : 'input-group-nr',
- data : this.options.formats
+ data : this.options.formats,
+ disabled : (this.options.formats.length==0)
});
-
- this.cmbNextStyle.setValue(this.options.formats[0].value);
+ if (this.options.formats.length>0)
+ this.cmbNextStyle.setValue(this.options.formats[0].value);
},
show: function() {
@@ -129,7 +130,7 @@ define([
getNextStyle: function () {
var me = this;
- return me.cmbNextStyle.getValue();
+ return (me.options.formats.length>0) ? me.cmbNextStyle.getValue() : null;
},
onBtnClick: function(event) {
diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js
index 4a8259e87..479909abb 100644
--- a/apps/documenteditor/main/app/view/TextArtSettings.js
+++ b/apps/documenteditor/main/app/view/TextArtSettings.js
@@ -916,6 +916,18 @@ define([
this.sldrGradient.on('thumbdblclick', function(cmp){
me.btnGradColor.cmpEl.find('button').dropdown('toggle');
});
+ this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+ var colors = [],
+ currentIdx;
+ _.each (recalc_indexes, function(recalc_index, index) {
+ colors.push(me.GradColor.colors[recalc_index]);
+ if (me.GradColor.currentIdx == recalc_index)
+ currentIdx = index;
+ });
+ me.OriginalFillType = null;
+ me.GradColor.colors = colors;
+ me.GradColor.currentIdx = currentIdx;
+ });
this.lockedControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index fa20b37f2..15ace2bb8 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -1220,15 +1220,16 @@ define([
this.btnNumbers.setMenu(
new Common.UI.Menu({
items: [
- { template: _.template('') }
+ { template: _.template('') }
]
})
);
this.btnMultilevels.setMenu(
new Common.UI.Menu({
+ style: 'min-width: 90px',
items: [
- { template: _.template('') }
+ { template: _.template('') }
]
})
);
@@ -1353,19 +1354,19 @@ define([
this.mnuNumbersPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-numbering'),
parentMenu: this.btnNumbers.menu,
- restoreHeight: 164,
+ restoreHeight: 92,
allowScrollbar: false,
store: new Common.UI.DataViewStore([
{offsety: 0, data: {type: 1, subtype: -1}},
- {offsety: 518, data: {type: 1, subtype: 4}},
- {offsety: 592, data: {type: 1, subtype: 5}},
- {offsety: 666, data: {type: 1, subtype: 6}},
- {offsety: 296, data: {type: 1, subtype: 1}},
- {offsety: 370, data: {type: 1, subtype: 2}},
- {offsety: 444, data: {type: 1, subtype: 3}},
- {offsety: 740, data: {type: 1, subtype: 7}}
+ {offsety: 570, data: {type: 1, subtype: 4}},
+ {offsety: 532, data: {type: 1, subtype: 5}},
+ {offsety: 608, data: {type: 1, subtype: 6}},
+ {offsety: 418, data: {type: 1, subtype: 1}},
+ {offsety: 456, data: {type: 1, subtype: 2}},
+ {offsety: 494, data: {type: 1, subtype: 3}},
+ {offsety: 646, data: {type: 1, subtype: 7}}
]),
- itemTemplate: _.template('')
+ itemTemplate: _.template('')
});
_conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true);
@@ -1373,15 +1374,15 @@ define([
this.mnuMultilevelPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-multilevels'),
parentMenu: this.btnMultilevels.menu,
- restoreHeight: 164,
+ restoreHeight: 92,
allowScrollbar: false,
store: new Common.UI.DataViewStore([
{ offsety:0, data:{type:2, subtype:-1} },
- { offsety:74, data:{type:2, subtype:1} },
- { offsety:148, data:{type:2, subtype:2} },
- { offsety:222, data:{type:2, subtype:3} }
- ]),
- itemTemplate: _.template('')
+ {offsety: 304, data: {type: 2, subtype: 1}},
+ {offsety: 342, data: {type: 2, subtype: 2}},
+ {offsety: 380, data: {type: 2, subtype: 3}}
+ ]),
+ itemTemplate: _.template('')
});
_conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true);
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index d15f17707..49d9e8fa0 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -56,7 +56,6 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
- jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@@ -125,7 +124,6 @@ require([
'locale',
'jszip',
'jsziputils',
- 'jsrsasign',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json
index 3292d4abd..ebe94dd21 100644
--- a/apps/documenteditor/main/locale/de.json
+++ b/apps/documenteditor/main/locale/de.json
@@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "Der minimale Wert für dieses Feld ist {0}.",
"Common.Views.InsertTableDialog.txtRows": "Anzahl von Zeilen\t",
"Common.Views.InsertTableDialog.txtTitle": "Größe der Tabelle",
+ "Common.Views.LanguageDialog.btnCancel": "Abbrechen",
+ "Common.Views.LanguageDialog.btnOk": "OK",
+ "Common.Views.LanguageDialog.labelSelect": "Sprache des Dokuments wählen",
"Common.Views.OpenDialog.cancelButtonText": "Abbrechen",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Verschlüsselung ",
@@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Zeile löschen",
"DE.Views.DocumentHolder.deleteTableText": "Tabelle löschen",
"DE.Views.DocumentHolder.deleteText": "Löschen",
- "DE.Views.DocumentHolder.direct270Text": "um 270° drehen",
- "DE.Views.DocumentHolder.direct90Text": "um 90° drehen ",
+ "DE.Views.DocumentHolder.direct270Text": "Text nach oben drehen",
+ "DE.Views.DocumentHolder.direct90Text": "Text nach unten drehen",
"DE.Views.DocumentHolder.directHText": "Horizontal",
"DE.Views.DocumentHolder.directionText": "Textausrichtung\t",
"DE.Views.DocumentHolder.editChartText": "Daten ändern",
@@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Manuellen Umbruch einfügen\t",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Formel nachher einfügen\t",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Formel vorher einfügen\t",
+ "DE.Views.DocumentHolder.txtKeepTextOnly": "Nur Text beibehalten",
"DE.Views.DocumentHolder.txtLimitChange": "Grenzwerten ändern ",
"DE.Views.DocumentHolder.txtLimitOver": "Grenzwert über den Text\n",
"DE.Views.DocumentHolder.txtLimitUnder": "Grenzwert unter den Text",
@@ -928,6 +932,7 @@
"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.strResolvedComment": "Die Anzeige der aufgelösten Kommentare einschalten",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Änderungen bei der Echtzeit-Zusammenarbeit zeigen",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Rechtschreibprüfung einschalten",
"DE.Views.FileMenuPanels.Settings.strStrict": "Formal",
@@ -1287,9 +1292,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Oben und unten",
"DE.Views.ShapeSettings.txtWood": "Holz",
"DE.Views.Statusbar.goToPageText": "Auf die Seite übergehen",
- "DE.Views.Statusbar.LanguageDialog.btnCancel": "Abbrechen",
- "DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
- "DE.Views.Statusbar.LanguageDialog.labelSelect": "Sprache des Dokuments wählen",
"DE.Views.Statusbar.pageIndexText": "Seite {0} von {1}",
"DE.Views.Statusbar.textChangesPanel": "Änderungen anzeigen",
"DE.Views.Statusbar.textTrackChanges": "Nachverfolgen von Änderungen",
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 4ab3363d7..627d70cea 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.",
"Common.Views.InsertTableDialog.txtRows": "Number of Rows",
"Common.Views.InsertTableDialog.txtTitle": "Table Size",
+ "Common.Views.LanguageDialog.btnCancel": "Cancel",
+ "Common.Views.LanguageDialog.btnOk": "Ok",
+ "Common.Views.LanguageDialog.labelSelect": "Select document language",
"Common.Views.OpenDialog.cancelButtonText": "Cancel",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
@@ -674,11 +677,11 @@
"DE.Views.DocumentHolder.advancedText": "Advanced Settings",
"DE.Views.DocumentHolder.alignmentText": "Alignment",
"DE.Views.DocumentHolder.belowText": "Below",
- "DE.Views.DocumentHolder.bottomCellText": "Align Bottom",
+ "del_DE.Views.DocumentHolder.bottomCellText": "Align Bottom",
"DE.Views.DocumentHolder.breakBeforeText": "Page break before",
"DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
"DE.Views.DocumentHolder.cellText": "Cell",
- "DE.Views.DocumentHolder.centerCellText": "Align Center",
+ "del_DE.Views.DocumentHolder.centerCellText": "Align Center",
"DE.Views.DocumentHolder.centerText": "Center",
"DE.Views.DocumentHolder.chartText": "Chart Advanced Settings",
"DE.Views.DocumentHolder.columnText": "Column",
@@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Delete Row",
"DE.Views.DocumentHolder.deleteTableText": "Delete Table",
"DE.Views.DocumentHolder.deleteText": "Delete",
- "DE.Views.DocumentHolder.direct270Text": "Rotate at 270°",
- "DE.Views.DocumentHolder.direct90Text": "Rotate at 90°",
+ "DE.Views.DocumentHolder.direct270Text": "Rotate Text Up",
+ "DE.Views.DocumentHolder.direct90Text": "Rotate Text Down",
"DE.Views.DocumentHolder.directHText": "Horizontal",
"DE.Views.DocumentHolder.directionText": "Text Direction",
"DE.Views.DocumentHolder.editChartText": "Edit Data",
@@ -752,7 +755,7 @@
"DE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
"DE.Views.DocumentHolder.textWrap": "Wrapping Style",
"DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
- "DE.Views.DocumentHolder.topCellText": "Align Top",
+ "del_DE.Views.DocumentHolder.topCellText": "Align Top",
"DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
"DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
"DE.Views.DocumentHolder.txtAddHor": "Add horizontal line",
@@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
+ "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
"DE.Views.DocumentHolder.txtLimitChange": "Change limits location",
"DE.Views.DocumentHolder.txtLimitOver": "Limit over text",
"DE.Views.DocumentHolder.txtLimitUnder": "Limit under text",
@@ -835,6 +839,7 @@
"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",
@@ -928,6 +933,7 @@
"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.strResolvedComment": "Turn on display of the resolved comments",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Realtime Collaboration Changes",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Turn on spell checking option",
"DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
@@ -1287,9 +1293,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
"DE.Views.ShapeSettings.txtWood": "Wood",
"DE.Views.Statusbar.goToPageText": "Go to Page",
- "DE.Views.Statusbar.LanguageDialog.btnCancel": "Cancel",
- "DE.Views.Statusbar.LanguageDialog.btnOk": "Ok",
- "DE.Views.Statusbar.LanguageDialog.labelSelect": "Select document language",
"DE.Views.Statusbar.pageIndexText": "Page {0} of {1}",
"DE.Views.Statusbar.textChangesPanel": "Changes Panel",
"DE.Views.Statusbar.textTrackChanges": "Track Changes",
diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json
index 81a6bfaa0..df02fa1a3 100644
--- a/apps/documenteditor/main/locale/fr.json
+++ b/apps/documenteditor/main/locale/fr.json
@@ -20,7 +20,7 @@
"Common.Controllers.ReviewChanges.textCenter": "Aligner au centre",
"Common.Controllers.ReviewChanges.textChart": "Graphique",
"Common.Controllers.ReviewChanges.textColor": "Couleur de police",
- "Common.Controllers.ReviewChanges.textContextual": "N'ajoutez pas l'intervalle entre paragraphes du même style",
+ "Common.Controllers.ReviewChanges.textContextual": "Ne pas ajouter d'intervalle entre paragraphes du même style",
"Common.Controllers.ReviewChanges.textDeleted": "Supprimé:\n\n",
"Common.Controllers.ReviewChanges.textDStrikeout": "Double barré",
"Common.Controllers.ReviewChanges.textEquation": "Équation",
@@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "La valeur minimale pour ce champ est {0}.",
"Common.Views.InsertTableDialog.txtRows": "Nombre de lignes",
"Common.Views.InsertTableDialog.txtTitle": "Taille du tableau",
+ "Common.Views.LanguageDialog.btnCancel": "Annuler",
+ "Common.Views.LanguageDialog.btnOk": "OK",
+ "Common.Views.LanguageDialog.labelSelect": "Sélectionner la langue du document",
"Common.Views.OpenDialog.cancelButtonText": "Annuler",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Codage ",
@@ -195,7 +198,7 @@
"DE.Controllers.LeftMenu.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues. Êtes-vous sûr de vouloir continuer ?",
"DE.Controllers.Main.applyChangesTextText": "Chargement des changemets...",
"DE.Controllers.Main.applyChangesTitleText": "Chargement des changemets",
- "DE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.",
+ "DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
"DE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.",
"DE.Controllers.Main.criticalErrorTitle": "Erreur",
"DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
@@ -218,8 +221,8 @@
"DE.Controllers.Main.errorMailMergeSaveFile": "Fusionner échoué.",
"DE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement",
"DE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
- "DE.Controllers.Main.errorSessionAbsolute": "La session de la modification de document a expiré.Veuillez recharger la page.",
- "DE.Controllers.Main.errorSessionIdle": "Le document n'est pas modifié depuis longtemps. Veuillez recharger la page.",
+ "DE.Controllers.Main.errorSessionAbsolute": "Votre session a expiré. Veuillez recharger la page.",
+ "DE.Controllers.Main.errorSessionIdle": "Le document n'a pas été modifié depuis trop longtemps. Veuillez recharger la page.",
"DE.Controllers.Main.errorSessionToken": "La connexion au serveur a été interrompue. Veuillez recharger la page.",
"DE.Controllers.Main.errorStockChart": "Ordre des lignes est incorrect. Pour créer un graphique boursier organisez vos données sur la feuille de calcul dans l'ordre suivant: cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.",
"DE.Controllers.Main.errorToken": "Le jeton de sécurité du document n’était pas formé correctement. Veuillez contacter l'administrateur de Document Server.",
@@ -262,7 +265,7 @@
"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.textChangesSaved": "Toutes les modifications ont été 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",
@@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Supprimer la ligne",
"DE.Views.DocumentHolder.deleteTableText": "Supprimer le tableau",
"DE.Views.DocumentHolder.deleteText": "Supprimer",
- "DE.Views.DocumentHolder.direct270Text": "Rotation à 270 °",
- "DE.Views.DocumentHolder.direct90Text": "Rotation à 90 °",
+ "DE.Views.DocumentHolder.direct270Text": "Rotation du texte vers le haut",
+ "DE.Views.DocumentHolder.direct90Text": "Rotation du texte vers le bas",
"DE.Views.DocumentHolder.directHText": "Horizontal",
"DE.Views.DocumentHolder.directionText": "Orientation du texte",
"DE.Views.DocumentHolder.editChartText": "Modifier les données",
@@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Insérer pause manuelle",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Insérer équation après",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Insérez l'équation avant",
+ "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
"DE.Views.DocumentHolder.txtLimitChange": "Modifier d'emplacement des locations",
"DE.Views.DocumentHolder.txtLimitOver": "Limite au-dessous le texte",
"DE.Views.DocumentHolder.txtLimitUnder": "Limite en dessous le texte",
@@ -921,14 +925,15 @@
"DE.Views.FileMenuPanels.Settings.strAutoRecover": "Activer la récupération automatique",
"DE.Views.FileMenuPanels.Settings.strAutosave": "Activer l'enregistrement automatique",
"DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Mode de co-édition ",
- "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Les autres utilisateurs pourront voir immédiatement vos modifications ",
+ "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Les autres utilisateurs verront vos modifications en temps reel",
"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",
+ "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
+ "DE.Views.FileMenuPanels.Settings.strShowChanges": "Visibilité des modifications en co-édition",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activer la vérification de l'orthographe",
"DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
"DE.Views.FileMenuPanels.Settings.strUnit": "Unité de mesure",
@@ -943,7 +948,7 @@
"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.txtAll": "Surligner toutes les modifications",
"DE.Views.FileMenuPanels.Settings.txtCm": "Centimètre",
"DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajuster à la page",
"DE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajuster à la largeur",
@@ -953,7 +958,7 @@
"DE.Views.FileMenuPanels.Settings.txtLiveComment": "Affichage des commentaires ",
"DE.Views.FileMenuPanels.Settings.txtMac": "comme OS X",
"DE.Views.FileMenuPanels.Settings.txtNative": "Natif",
- "DE.Views.FileMenuPanels.Settings.txtNone": "Aucuns",
+ "DE.Views.FileMenuPanels.Settings.txtNone": "Surligner aucune modification",
"DE.Views.FileMenuPanels.Settings.txtPt": "Point",
"DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Vérification de l'orthographe",
"DE.Views.FileMenuPanels.Settings.txtWin": "comme Windows",
@@ -1163,7 +1168,7 @@
"DE.Views.PageSizeDialog.textWidth": "Largeur",
"DE.Views.ParagraphSettings.strLineHeight": "Interligne",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Espacement de paragraphe",
- "DE.Views.ParagraphSettings.strSomeParagraphSpace": "N'ajoutez pas l'intervalle entre paragraphes du même style",
+ "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style",
"DE.Views.ParagraphSettings.strSpacingAfter": "Après",
"DE.Views.ParagraphSettings.strSpacingBefore": "Avant",
"DE.Views.ParagraphSettings.textAdvanced": "Afficher les paramètres avancés",
@@ -1180,7 +1185,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": "Barré double",
+ "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double barré",
"DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Première ligne",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
@@ -1287,9 +1292,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Haut et bas",
"DE.Views.ShapeSettings.txtWood": "Bois",
"DE.Views.Statusbar.goToPageText": "Aller à la page",
- "DE.Views.Statusbar.LanguageDialog.btnCancel": "Annuler",
- "DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
- "DE.Views.Statusbar.LanguageDialog.labelSelect": "Sélectionner la langue du document",
"DE.Views.Statusbar.pageIndexText": "Page {0} de {1}",
"DE.Views.Statusbar.textChangesPanel": "Сhangements de panneau",
"DE.Views.Statusbar.textTrackChanges": "Suivi des modifications",
@@ -1408,7 +1410,7 @@
"DE.Views.TableSettingsAdvanced.textRightOf": "à droite de",
"DE.Views.TableSettingsAdvanced.textRightTooltip": "A droite",
"DE.Views.TableSettingsAdvanced.textTable": "Tableau",
- "DE.Views.TableSettingsAdvanced.textTableBackColor": "Tableau de fond",
+ "DE.Views.TableSettingsAdvanced.textTableBackColor": "Fond du tableau",
"DE.Views.TableSettingsAdvanced.textTablePosition": "Position du tableau",
"DE.Views.TableSettingsAdvanced.textTableSize": "Taille du tableau",
"DE.Views.TableSettingsAdvanced.textTitle": "Tableau - Paramètres avancés",
@@ -1456,7 +1458,7 @@
"DE.Views.TextArtSettings.textTemplate": "Modèle",
"DE.Views.TextArtSettings.textTransform": "Transformer",
"DE.Views.TextArtSettings.txtNoBorders": "Pas de ligne",
- "DE.Views.Toolbar.mniCustomTable": "Inserer tableau personnalisé",
+ "DE.Views.Toolbar.mniCustomTable": "Inserer un tableau personnalisé",
"DE.Views.Toolbar.mniDelFootnote": "Supprimer les notes de bas de page",
"DE.Views.Toolbar.mniEditDropCap": "Paramètres de la lettrine",
"DE.Views.Toolbar.mniEditFooter": "Modifier le pied de page",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 12ee32989..3e2ac4a6b 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -161,6 +161,9 @@
"Common.Views.InsertTableDialog.txtMinText": "Минимальное значение для этого поля - {0}.",
"Common.Views.InsertTableDialog.txtRows": "Количество строк",
"Common.Views.InsertTableDialog.txtTitle": "Размер таблицы",
+ "Common.Views.LanguageDialog.btnCancel": "Отмена",
+ "Common.Views.LanguageDialog.btnOk": "Ок",
+ "Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа",
"Common.Views.OpenDialog.cancelButtonText": "Отмена",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Кодировка",
@@ -686,8 +689,8 @@
"DE.Views.DocumentHolder.deleteRowText": "Удалить строку",
"DE.Views.DocumentHolder.deleteTableText": "Удалить таблицу",
"DE.Views.DocumentHolder.deleteText": "Удалить",
- "DE.Views.DocumentHolder.direct270Text": "Поворот на 270°",
- "DE.Views.DocumentHolder.direct90Text": "Поворот на 90°",
+ "DE.Views.DocumentHolder.direct270Text": "Повернуть текст вверх",
+ "DE.Views.DocumentHolder.direct90Text": "Повернуть текст вниз",
"DE.Views.DocumentHolder.directHText": "Горизонтальное",
"DE.Views.DocumentHolder.directionText": "Направление текста",
"DE.Views.DocumentHolder.editChartText": "Изменить данные",
@@ -803,6 +806,7 @@
"DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить формулу после",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить формулу перед",
+ "DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",
"DE.Views.DocumentHolder.txtLimitChange": "Изменить положение пределов",
"DE.Views.DocumentHolder.txtLimitOver": "Предел над текстом",
"DE.Views.DocumentHolder.txtLimitUnder": "Предел под текстом",
@@ -928,6 +932,7 @@
"DE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Включить отображение комментариев в тексте",
+ "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Включить отображение решенных комментариев",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Включить проверку орфографии",
"DE.Views.FileMenuPanels.Settings.strStrict": "Строгий",
@@ -1287,9 +1292,6 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Сверху и снизу",
"DE.Views.ShapeSettings.txtWood": "Дерево",
"DE.Views.Statusbar.goToPageText": "Перейти на страницу",
- "DE.Views.Statusbar.LanguageDialog.btnCancel": "Отмена",
- "DE.Views.Statusbar.LanguageDialog.btnOk": "ОК",
- "DE.Views.Statusbar.LanguageDialog.labelSelect": "Выбрать язык документа",
"DE.Views.Statusbar.pageIndexText": "Страница {0} из {1}",
"DE.Views.Statusbar.textChangesPanel": "Панель изменений",
"DE.Views.Statusbar.textTrackChanges": "Отслеживание изменений",
diff --git a/apps/documenteditor/main/resources/help/en/Contents.json b/apps/documenteditor/main/resources/help/en/Contents.json
index 100024d79..d319d7900 100644
--- a/apps/documenteditor/main/resources/help/en/Contents.json
+++ b/apps/documenteditor/main/resources/help/en/Contents.json
@@ -23,7 +23,8 @@
{"src": "UsageInstructions/AddHyperlinks.htm", "name": "Add hyperlinks"},
{"src": "UsageInstructions/InsertDropCap.htm", "name": "Insert a drop cap"},
{"src": "UsageInstructions/InsertHeadersFooters.htm", "name": "Insert headers and footers"},
- {"src":"UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers" },
+ { "src": "UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers" },
+ {"src": "UsageInstructions/InsertFootnotes.htm", "name": "Insert footnotes" },
{"src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations" },
{"src": "UsageInstructions/InsertTextObjects.htm", "name": "Insert text objects" },
{"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge"},
diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertAutoshapes.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertAutoshapes.htm
index 5328bd72a..099ed430b 100644
--- a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertAutoshapes.htm
+++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertAutoshapes.htm
@@ -183,6 +183,8 @@
The Text Padding tab allows to change the autoshape Top, Bottom, Left and Right internal margins (i.e. the distance between the text within the shape and the autoshape borders).
Note: this tab is only available if text is added within the autoshape, otherwise the tab is disabled.
+
+
The Alternative Text tab allows to specify a Title and Description which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the shape.