Commit 2fea6099 authored by Alexey Golubev's avatar Alexey Golubev

v4.4.2

parents 6a9407d6 9f6cbe65
......@@ -49,23 +49,24 @@ Common.Utils = _.extend(new(function() {
return (is && (m = regex.exec(userAgent))) ? parseFloat(m[1]) : 0;
},
docMode = document.documentMode,
isEdge = check(/edge/),
isOpera = check(/opera/),
isOpera10_5 = isOpera && check(/version\/10\.5/),
isChrome = check(/\bchrome\b/),
isWebKit = check(/webkit/),
isSafari = !isChrome && check(/safari/),
isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2
isSafari3 = isSafari && check(/version\/3/),
isSafari4 = isSafari && check(/version\/4/),
isSafari5_0 = isSafari && check(/version\/5\.0/),
isSafari5 = isSafari && check(/version\/5/),
isIE = !isOpera && (check(/msie/) || check(/trident/)),
isIE = !isOpera && (check(/msie/) || check(/trident/) || check(/edge/)),
isIE7 = isIE && ((check(/msie 7/) && docMode != 8 && docMode != 9 && docMode != 10) || docMode == 7),
isIE8 = isIE && ((check(/msie 8/) && docMode != 7 && docMode != 9 && docMode != 10) || docMode == 8),
isIE9 = isIE && ((check(/msie 9/) && docMode != 7 && docMode != 8 && docMode != 10) || docMode == 9),
isIE10 = isIE && ((check(/msie 10/) && docMode != 7 && docMode != 8 && docMode != 9) || docMode == 10),
isIE11 = isIE && ((check(/trident\/7\.0/) && docMode != 7 && docMode != 8 && docMode != 9 && docMode != 10) || docMode == 11),
isIE6 = isIE && check(/msie 6/),
isChrome = !isIE && check(/\bchrome\b/),
isWebKit = !isIE && check(/webkit/),
isSafari = !isIE && !isChrome && check(/safari/),
isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2
isSafari3 = isSafari && check(/version\/3/),
isSafari4 = isSafari && check(/version\/4/),
isSafari5_0 = isSafari && check(/version\/5\.0/),
isSafari5 = isSafari && check(/version\/5/),
isGecko = !isWebKit && !isIE && check(/gecko/), // IE11 adds "like gecko" into the user agent string
isGecko3 = isGecko && check(/rv:1\.9/),
isGecko4 = isGecko && check(/rv:2\.0/),
......
......@@ -603,7 +603,7 @@ define([
if (action) {
this.setLongActionView(action)
} else {
if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && !this.appOptions.isOffline) {
if (this._state.fastCoauth && this._state.usersCount>1) {
var me = this;
me._state.timerSave = setTimeout(function () {
......@@ -642,8 +642,8 @@ define([
case Asc.c_oAscAsyncAction['ForceSaveButton']:
clearTimeout(this._state.timerSave);
force = true;
title = this.saveTitleText;
text = this.saveTextText;
title = (!this.appOptions.isOffline) ? this.saveTitleText : '';
text = (!this.appOptions.isOffline) ? this.saveTextText : '';
break;
case Asc.c_oAscAsyncAction['ForceSaveTimeout']:
......
......@@ -52,7 +52,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
DE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 325,
contentWidth: 335,
height: 394,
toggleGroup: 'paragraph-adv-settings-group',
storageName: 'de-para-settings-adv-category'
......@@ -1063,6 +1063,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
});
if (rec) {
rec.set('tabAlign', align);
this._tabListChanged = true;
} else {
rec = new Common.UI.DataViewModel();
rec.set({
......
This diff is collapsed.
......@@ -119,7 +119,7 @@
"Common.Views.Comments.textCancel": "Annuler",
"Common.Views.Comments.textClose": "Fermer",
"Common.Views.Comments.textComments": "Commentaires",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEdit": "Modifier",
"Common.Views.Comments.textEnterCommentHint": "Entrez votre commentaire ici",
"Common.Views.Comments.textOpenAgain": "Ouvrir à nouveau",
"Common.Views.Comments.textReply": "Répondre",
......@@ -291,6 +291,22 @@
"DE.Controllers.Main.txtRectangles": "Rectangles",
"DE.Controllers.Main.txtSeries": "Série",
"DE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
"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": "Axe X",
"DE.Controllers.Main.txtYAxis": "Axe Y",
"DE.Controllers.Main.unknownErrorText": "Erreur inconnue.",
......@@ -658,6 +674,7 @@
"DE.Views.ChartSettings.textSize": "Taille",
"DE.Views.ChartSettings.textStock": "Boursier",
"DE.Views.ChartSettings.textStyle": "Style",
"DE.Views.ChartSettings.textSurface": "Surface",
"DE.Views.ChartSettings.textUndock": "Détacher du panneau",
"DE.Views.ChartSettings.textWidth": "Largeur",
"DE.Views.ChartSettings.textWrap": "Style d'habillage",
......@@ -669,6 +686,12 @@
"DE.Views.ChartSettings.txtTight": "Rapproché",
"DE.Views.ChartSettings.txtTitle": "Graphique",
"DE.Views.ChartSettings.txtTopAndBottom": "Haut et bas",
"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": "Au-dessus",
"DE.Views.DocumentHolder.addCommentText": "Ajouter un commentaire",
"DE.Views.DocumentHolder.advancedFrameText": "Paramètres avancés du cadre",
......@@ -1475,6 +1498,7 @@
"DE.Views.Toolbar.textBottom": "En bas: ",
"DE.Views.Toolbar.textCharts": "Graphiques",
"DE.Views.Toolbar.textColumn": "Colonne",
"DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
"DE.Views.Toolbar.textColumnsLeft": "A gauche",
"DE.Views.Toolbar.textColumnsOne": "Un",
"DE.Views.Toolbar.textColumnsRight": "A droite",
......@@ -1528,6 +1552,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "Mettre à jour selon la sélection",
"DE.Views.Toolbar.textSubscript": "Indice",
"DE.Views.Toolbar.textSuperscript": "Exposant",
"DE.Views.Toolbar.textSurface": "Surface",
"DE.Views.Toolbar.textTitleError": "Erreur",
"DE.Views.Toolbar.textToCurrent": "À la position actuelle",
"DE.Views.Toolbar.textTop": "En haut: ",
......
This diff is collapsed.
......@@ -1498,7 +1498,7 @@
"DE.Views.Toolbar.textBottom": "Нижнее: ",
"DE.Views.Toolbar.textCharts": "Диаграммы",
"DE.Views.Toolbar.textColumn": "Гистограмма",
"DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
"DE.Views.Toolbar.textColumnsCustom": "Настраиваемые колонки",
"DE.Views.Toolbar.textColumnsLeft": "Слева",
"DE.Views.Toolbar.textColumnsOne": "Одна",
"DE.Views.Toolbar.textColumnsRight": "Справа",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -342,9 +342,9 @@
<td>Maintain the proportions of the selected object when resizing.</td>
</tr>
<tr>
<td>Movement by three-pixel increments</td>
<td>Movement by one-pixel increments</td>
<td>Ctrl</td>
<td>Hold down the Ctrl key and use the keybord arrows to move the selected object by three pixels at a time.</td>
<td>Hold down the Ctrl key and use the keybord arrows to move the selected object by one pixel at a time.</td>
</tr>
</table>
</div>
......
......@@ -340,9 +340,9 @@
<td>Сохранять пропорции выбранного объекта при изменении размера.</td>
</tr>
<tr>
<td>Перемещение с шагом в три пикселя</td>
<td>Перемещение с шагом в один пиксель</td>
<td>Ctrl</td>
<td>Удерживайте клавишу Ctrl и используйте стрелки на клавиатуре, чтобы перемещать выбранный объект на три пикселя за раз.</td>
<td>Удерживайте клавишу Ctrl и используйте стрелки на клавиатуре, чтобы перемещать выбранный объект на один пиксель за раз.</td>
</tr>
</table>
</div>
......
......@@ -484,8 +484,6 @@ define([
me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode
Common.localStorage.setItem("de-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0);
me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me));
me.api.asc_registerCallback('asc_onEndAction', _.bind(me.onLongActionEnd, me));
me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me));
......
This diff is collapsed.
......@@ -120,6 +120,22 @@
"DE.Controllers.Main.txtDiagramTitle": "Diagrammtitel",
"DE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus einschalten...",
"DE.Controllers.Main.txtSeries": "Reihen",
"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",
"DE.Controllers.Main.txtXAxis": "x-Achse",
"DE.Controllers.Main.txtYAxis": "y-Achse",
"DE.Controllers.Main.unknownErrorText": "Unbekannter Fehler.",
......@@ -348,6 +364,7 @@
"DE.Views.Settings.textPages": "Seiten",
"DE.Views.Settings.textParagraphs": "Absätze",
"DE.Views.Settings.textPortrait": "Hochformat",
"DE.Views.Settings.textPoweredBy": "Betrieben von",
"DE.Views.Settings.textReader": "Lesemodus",
"DE.Views.Settings.textSettings": "Einstellungen",
"DE.Views.Settings.textSpaces": "Abstände",
......
......@@ -120,6 +120,22 @@
"DE.Controllers.Main.txtDiagramTitle": "Chart Title",
"DE.Controllers.Main.txtEditingMode": "Set editing mode...",
"DE.Controllers.Main.txtSeries": "Series",
"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.",
......@@ -132,22 +148,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.Search.textNoTextFound": "Text not Found",
"DE.Controllers.Search.textReplaceAll": "Replace All",
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",
......
This diff is collapsed.
......@@ -43,7 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Choisir les options TXT",
"DE.Controllers.Main.applyChangesTextText": "Chargement des données...",
"DE.Controllers.Main.applyChangesTitleText": "Chargement des données",
"DE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.",
"DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
"DE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.",
"DE.Controllers.Main.criticalErrorTitle": "Erreur",
"DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
......@@ -120,6 +120,22 @@
"DE.Controllers.Main.txtDiagramTitle": "Titre du graphique",
"DE.Controllers.Main.txtEditingMode": "Définition du mode d'édition...",
"DE.Controllers.Main.txtSeries": "Séries",
"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": "Axe X",
"DE.Controllers.Main.txtYAxis": "Axe Y",
"DE.Controllers.Main.unknownErrorText": "Erreur inconnue.",
......@@ -348,6 +364,7 @@
"DE.Views.Settings.textPages": "Pages",
"DE.Views.Settings.textParagraphs": "Paragraphes",
"DE.Views.Settings.textPortrait": "Portrait",
"DE.Views.Settings.textPoweredBy": "Powered by",
"DE.Views.Settings.textReader": "Mode de lecture",
"DE.Views.Settings.textSettings": "Paramètres",
"DE.Views.Settings.textSpaces": "Espaces",
......
This diff is collapsed.
......@@ -120,6 +120,22 @@
"DE.Controllers.Main.txtDiagramTitle": "Заголовок диаграммы",
"DE.Controllers.Main.txtEditingMode": "Установка режима редактирования...",
"DE.Controllers.Main.txtSeries": "Ряд",
"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": "Неизвестная ошибка.",
......@@ -132,22 +148,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.Search.textNoTextFound": "Текст не найден",
"DE.Controllers.Search.textReplaceAll": "Заменить все",
"DE.Controllers.Settings.notcriticalErrorTitle": "Внимание",
......@@ -364,6 +364,7 @@
"DE.Views.Settings.textPages": "Страницы",
"DE.Views.Settings.textParagraphs": "Абзацы",
"DE.Views.Settings.textPortrait": "Книжная",
"DE.Views.Settings.textPoweredBy": "Powered by",
"DE.Views.Settings.textReader": "Режим чтения",
"DE.Views.Settings.textSettings": "Настройки",
"DE.Views.Settings.textSpaces": "Пробелы",
......
This diff is collapsed.
......@@ -120,6 +120,22 @@
"DE.Controllers.Main.txtDiagramTitle": "图表标题",
"DE.Controllers.Main.txtEditingMode": "设置编辑模式..",
"DE.Controllers.Main.txtSeries": "系列",
"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": "示知错误",
......@@ -348,6 +364,7 @@
"DE.Views.Settings.textPages": "页面",
"DE.Views.Settings.textParagraphs": "段落",
"DE.Views.Settings.textPortrait": "肖像",
"DE.Views.Settings.textPoweredBy": "Powered by",
"DE.Views.Settings.textReader": "阅读模式",
"DE.Views.Settings.textSettings": "设置",
"DE.Views.Settings.textSpaces": "间隔",
......
......@@ -421,7 +421,7 @@ define([
if (action) {
this.setLongActionView(action)
} else {
if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && !this.appOptions.isOffline) {
if (this._state.fastCoauth && this._state.usersCount>1) {
var me = this;
me._state.timerSave = setTimeout(function () {
......@@ -458,8 +458,8 @@ define([
case Asc.c_oAscAsyncAction['ForceSaveButton']:
clearTimeout(this._state.timerSave);
force = true;
title = this.saveTitleText;
text = this.saveTextText;
title = (!this.appOptions.isOffline) ? this.saveTitleText : '';
text = (!this.appOptions.isOffline) ? this.saveTextText : '';
break;
case Asc.c_oAscAsyncAction['ForceSaveTimeout']:
......
......@@ -507,6 +507,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
});
if (rec) {
rec.set('tabAlign', align);
this._tabListChanged = true;
} else {
rec = new Common.UI.DataViewModel();
rec.set({
......
......@@ -496,9 +496,10 @@ define([
this._state.no_paragraph = true;
var i = -1;
while (++i < selectedObjects.length) {
if (selectedObjects[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) {
var type = selectedObjects[i].get_ObjectType();
if (type == Asc.c_oAscTypeSelectElement.Paragraph || type == Asc.c_oAscTypeSelectElement.Shape || type == Asc.c_oAscTypeSelectElement.Chart || type == Asc.c_oAscTypeSelectElement.Table) {
this._state.no_paragraph = selectedObjects[i].get_ObjectValue().get_Locked();
break;
if (this._state.no_paragraph) break; // break if one of the objects is locked
}
}
this._state.no_paragraph = this._state.no_paragraph || this.langMenu.items.length<1;
......
This diff is collapsed.
......@@ -61,7 +61,7 @@
"Common.Views.Comments.textCancel": "Annuler",
"Common.Views.Comments.textClose": "Fermer",
"Common.Views.Comments.textComments": "Commentaires",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEdit": "Modifier",
"Common.Views.Comments.textEnterCommentHint": "Entrez votre commentaire ici",
"Common.Views.Comments.textOpenAgain": "Ouvrir à nouveau",
"Common.Views.Comments.textReply": "Répondre",
......@@ -192,12 +192,20 @@
"PE.Controllers.Main.txtButtons": "Boutons",
"PE.Controllers.Main.txtCallouts": "Légendes",
"PE.Controllers.Main.txtCharts": "Graphiques",
"PE.Controllers.Main.txtClipArt": "Clip Art",
"PE.Controllers.Main.txtDateTime": "Date and time",
"PE.Controllers.Main.txtDiagram": "SmartArt",
"PE.Controllers.Main.txtDiagramTitle": "Titre du graphique",
"PE.Controllers.Main.txtEditingMode": "Définissez le mode d'édition...",
"PE.Controllers.Main.txtFiguredArrows": "Flèches figurées",
"PE.Controllers.Main.txtFooter": "Footer",
"PE.Controllers.Main.txtHeader": "Header",
"PE.Controllers.Main.txtImage": "Image",
"PE.Controllers.Main.txtLines": "Lignes",
"PE.Controllers.Main.txtMath": "Maths",
"PE.Controllers.Main.txtMedia": "Media",
"PE.Controllers.Main.txtNeedSynchronize": "Vous avez des mises à jour",
"PE.Controllers.Main.txtPicture": "Picture",
"PE.Controllers.Main.txtRectangles": "Rectangles",
"PE.Controllers.Main.txtSeries": "Série",
"PE.Controllers.Main.txtSldLtTBlank": "Vide",
......@@ -236,6 +244,10 @@
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Titre vertical et texte",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Titre vertical et texte sur graphique",
"PE.Controllers.Main.txtSldLtTVertTx": "Texte vertical",
"PE.Controllers.Main.txtSlideNumber": "Slide number",
"PE.Controllers.Main.txtSlideSubtitle": "Slide subtitle",
"PE.Controllers.Main.txtSlideText": "Slide text",
"PE.Controllers.Main.txtSlideTitle": "Slide title",
"PE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
"PE.Controllers.Main.txtXAxis": "Axe X",
"PE.Controllers.Main.txtYAxis": "Axe Y",
......@@ -598,6 +610,7 @@
"PE.Views.ChartSettings.textSize": "Taille",
"PE.Views.ChartSettings.textStock": "Boursier",
"PE.Views.ChartSettings.textStyle": "Style",
"PE.Views.ChartSettings.textSurface": "Surface",
"PE.Views.ChartSettings.textWidth": "Largeur",
"PE.Views.ChartSettingsAdvanced.cancelButtonText": "Annuler",
"PE.Views.ChartSettingsAdvanced.okButtonText": "OK",
......@@ -1270,6 +1283,7 @@
"PE.Views.Toolbar.textStrikeout": "Barré",
"PE.Views.Toolbar.textSubscript": "Indice",
"PE.Views.Toolbar.textSuperscript": "Exposant",
"PE.Views.Toolbar.textSurface": "Surface",
"PE.Views.Toolbar.textTitleError": "Erreur",
"PE.Views.Toolbar.textUnderline": "Souligné",
"PE.Views.Toolbar.textZoom": "Zoom",
......
This diff is collapsed.
This diff is collapsed.
......@@ -456,8 +456,6 @@ define([
var zf = (value!==null) ? parseInt(value) : (me.appOptions.customization && me.appOptions.customization.zoom ? parseInt(me.appOptions.customization.zoom) : -1);
(zf == -1) ? me.api.zoomFitToPage() : ((zf == -2) ? me.api.zoomFitToWidth() : me.api.zoom(zf>0 ? zf : 100));
Common.localStorage.setItem("pe-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0);
me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode
me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me));
......@@ -480,8 +478,6 @@ define([
me.api.asc_SetFastCollaborative(me._state.fastCoauth);
/** coauthoring end **/
Common.localStorage.setItem("pe-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0);
if (me.appOptions.isEdit) {
value = me._state.fastCoauth; // Common.localStorage.getItem("de-settings-autosave");
value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : (me.appOptions.canCoAuthoring ? 1 : 0);
......
This diff is collapsed.
......@@ -136,12 +136,20 @@
"PE.Controllers.Main.txtButtons": "Buttons",
"PE.Controllers.Main.txtCallouts": "Legenden",
"PE.Controllers.Main.txtCharts": "Diagramme",
"PE.Controllers.Main.txtClipArt": "ClipArt",
"PE.Controllers.Main.txtDateTime": "Datum und Zeit",
"PE.Controllers.Main.txtDiagram": "SmartArt",
"PE.Controllers.Main.txtDiagramTitle": "Diagrammtitel",
"PE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus einschalten...",
"PE.Controllers.Main.txtFiguredArrows": "Geformte Pfeile",
"PE.Controllers.Main.txtFooter": "Fußzeile",
"PE.Controllers.Main.txtHeader": "Kopfzeile",
"PE.Controllers.Main.txtImage": "Bild",
"PE.Controllers.Main.txtLines": "Linien",
"PE.Controllers.Main.txtMath": "Mathematik",
"PE.Controllers.Main.txtMedia": "Medien",
"PE.Controllers.Main.txtNeedSynchronize": "Änderungen wurden vorgenommen",
"PE.Controllers.Main.txtPicture": "Bild",
"PE.Controllers.Main.txtRectangles": "Rechtecke",
"PE.Controllers.Main.txtSeries": "Reihen",
"PE.Controllers.Main.txtSldLtTBlank": "Leer",
......@@ -180,6 +188,10 @@
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Vertikaler Titel und Text",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Vertikaler Titel und Text über Diagramm",
"PE.Controllers.Main.txtSldLtTVertTx": "Vertikaler Text",
"PE.Controllers.Main.txtSlideNumber": "Foliennummer",
"PE.Controllers.Main.txtSlideSubtitle": "Folienuntertitel",
"PE.Controllers.Main.txtSlideText": "Folientext",
"PE.Controllers.Main.txtSlideTitle": "Folientitel",
"PE.Controllers.Main.txtStarsRibbons": "Sterne & Bänder",
"PE.Controllers.Main.txtXAxis": "x-Achse",
"PE.Controllers.Main.txtYAxis": "y-Achse",
......@@ -420,6 +432,7 @@
"PE.Views.Settings.textFind": "Suchen",
"PE.Views.Settings.textHelp": "Hilfe",
"PE.Views.Settings.textLoading": "Ladevorgang...",
"PE.Views.Settings.textPoweredBy": "Betrieben von",
"PE.Views.Settings.textPresentInfo": "Päsentation Infos",
"PE.Views.Settings.textPresentSetup": "Präsentation-Einstellungen",
"PE.Views.Settings.textPresentTitle": "Titel der Präsentation",
......
......@@ -136,12 +136,20 @@
"PE.Controllers.Main.txtButtons": "Buttons",
"PE.Controllers.Main.txtCallouts": "Callouts",
"PE.Controllers.Main.txtCharts": "Charts",
"PE.Controllers.Main.txtClipArt": "Clip Art",
"PE.Controllers.Main.txtDateTime": "Date and time",
"PE.Controllers.Main.txtDiagram": "SmartArt",
"PE.Controllers.Main.txtDiagramTitle": "Chart Title",
"PE.Controllers.Main.txtEditingMode": "Set editing mode...",
"PE.Controllers.Main.txtFiguredArrows": "Figured Arrows",
"PE.Controllers.Main.txtFooter": "Footer",
"PE.Controllers.Main.txtHeader": "Header",
"PE.Controllers.Main.txtImage": "Image",
"PE.Controllers.Main.txtLines": "Lines",
"PE.Controllers.Main.txtMath": "Math",
"PE.Controllers.Main.txtMedia": "Media",
"PE.Controllers.Main.txtNeedSynchronize": "You have updates",
"PE.Controllers.Main.txtPicture": "Picture",
"PE.Controllers.Main.txtRectangles": "Rectangles",
"PE.Controllers.Main.txtSeries": "Series",
"PE.Controllers.Main.txtSldLtTBlank": "Blank",
......@@ -180,6 +188,10 @@
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Vertical Title and Text",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Vertical Title and Text Over Chart",
"PE.Controllers.Main.txtSldLtTVertTx": "Vertical Text",
"PE.Controllers.Main.txtSlideNumber": "Slide number",
"PE.Controllers.Main.txtSlideSubtitle": "Slide subtitle",
"PE.Controllers.Main.txtSlideText": "Slide text",
"PE.Controllers.Main.txtSlideTitle": "Slide title",
"PE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
"PE.Controllers.Main.txtXAxis": "X Axis",
"PE.Controllers.Main.txtYAxis": "Y Axis",
......@@ -193,18 +205,6 @@
"PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"PE.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.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Main.txtSlideText": "Slide text",
"PE.Controllers.Main.txtClipArt": "ClipArt",
"PE.Controllers.Main.txtDiagram": "SmartArt",
"PE.Controllers.Main.txtDateTime": "Date and time",
"PE.Controllers.Main.txtFooter": "Footer",
"PE.Controllers.Main.txtHeader": "Header",
"PE.Controllers.Main.txtMedia": "Media",
"PE.Controllers.Main.txtPicture": "Picture",
"PE.Controllers.Main.txtImage": "Image",
"PE.Controllers.Main.txtSlideNumber": "Slide number",
"PE.Controllers.Main.txtSlideSubtitle": "Slide subtitle",
"PE.Controllers.Main.txtSlideTitle": "Slide title",
"PE.Controllers.Search.textNoTextFound": "Text not Found",
"PE.Controllers.Settings.notcriticalErrorTitle": "Warning",
"PE.Controllers.Settings.txtLoading": "Loading...",
......
This diff is collapsed.
......@@ -60,7 +60,7 @@
"PE.Controllers.Main.advDRMPassword": " Mot de passe",
"PE.Controllers.Main.applyChangesTextText": "Chargement des données en cours...",
"PE.Controllers.Main.applyChangesTitleText": "Chargement des données",
"PE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.",
"PE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
"PE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.",
"PE.Controllers.Main.criticalErrorTitle": "Erreur",
"PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
......@@ -136,12 +136,20 @@
"PE.Controllers.Main.txtButtons": "Boutons",
"PE.Controllers.Main.txtCallouts": "Légendes",
"PE.Controllers.Main.txtCharts": "Graphiques",
"PE.Controllers.Main.txtClipArt": "Clip Art",
"PE.Controllers.Main.txtDateTime": "Date and time",
"PE.Controllers.Main.txtDiagram": "SmartArt",
"PE.Controllers.Main.txtDiagramTitle": "Titre du graphique",
"PE.Controllers.Main.txtEditingMode": "Définition du mode d'édition...",
"PE.Controllers.Main.txtFiguredArrows": "Flèches figurées",
"PE.Controllers.Main.txtFooter": "Footer",
"PE.Controllers.Main.txtHeader": "Header",
"PE.Controllers.Main.txtImage": "Image",
"PE.Controllers.Main.txtLines": "Lignes",
"PE.Controllers.Main.txtMath": "Maths",
"PE.Controllers.Main.txtMedia": "Media",
"PE.Controllers.Main.txtNeedSynchronize": "Vous avez des mises à jour",
"PE.Controllers.Main.txtPicture": "Picture",
"PE.Controllers.Main.txtRectangles": "Rectangles",
"PE.Controllers.Main.txtSeries": "Série",
"PE.Controllers.Main.txtSldLtTBlank": "Vide",
......@@ -180,6 +188,10 @@
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Titre vertical et texte",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Titre vertical et texte sur graphique",
"PE.Controllers.Main.txtSldLtTVertTx": "Texte vertical",
"PE.Controllers.Main.txtSlideNumber": "Slide number",
"PE.Controllers.Main.txtSlideSubtitle": "Slide subtitle",
"PE.Controllers.Main.txtSlideText": "Slide text",
"PE.Controllers.Main.txtSlideTitle": "Slide title",
"PE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
"PE.Controllers.Main.txtXAxis": "Axe X",
"PE.Controllers.Main.txtYAxis": "Axe Y",
......@@ -420,6 +432,7 @@
"PE.Views.Settings.textFind": "Trouver",
"PE.Views.Settings.textHelp": "Aide",
"PE.Views.Settings.textLoading": "Chargement en cours...",
"PE.Views.Settings.textPoweredBy": "Powered by",
"PE.Views.Settings.textPresentInfo": "Infos sur présentation",
"PE.Views.Settings.textPresentSetup": "Paramètres de la présentation",
"PE.Views.Settings.textPresentTitle": "Titre de la présentation",
......
This diff is collapsed.
......@@ -136,12 +136,20 @@
"PE.Controllers.Main.txtButtons": "Кнопки",
"PE.Controllers.Main.txtCallouts": "Выноски",
"PE.Controllers.Main.txtCharts": "Схемы",
"PE.Controllers.Main.txtClipArt": "Картинка",
"PE.Controllers.Main.txtDateTime": "Дата и время",
"PE.Controllers.Main.txtDiagram": "Рисунок SmartArt",
"PE.Controllers.Main.txtDiagramTitle": "Заголовок диаграммы",
"PE.Controllers.Main.txtEditingMode": "Установка режима редактирования...",
"PE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки",
"PE.Controllers.Main.txtFooter": "Нижний колонтитул",
"PE.Controllers.Main.txtHeader": "Верхний колонтитул",
"PE.Controllers.Main.txtImage": "Образ слайда",
"PE.Controllers.Main.txtLines": "Линии",
"PE.Controllers.Main.txtMath": "Математические знаки",
"PE.Controllers.Main.txtMedia": "Клип мультимедиа",
"PE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
"PE.Controllers.Main.txtPicture": "Рисунок",
"PE.Controllers.Main.txtRectangles": "Прямоугольники",
"PE.Controllers.Main.txtSeries": "Ряд",
"PE.Controllers.Main.txtSldLtTBlank": "Пустой слайд",
......@@ -180,6 +188,10 @@
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Вертикальный заголовок и текст",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Вертикальный заголовок и текст над диаграммой",
"PE.Controllers.Main.txtSldLtTVertTx": "Вертикальный текст",
"PE.Controllers.Main.txtSlideNumber": "Номер слайда",
"PE.Controllers.Main.txtSlideSubtitle": "Подзаголовок слайда",
"PE.Controllers.Main.txtSlideText": "Текст слайда",
"PE.Controllers.Main.txtSlideTitle": "Заголовок слайда",
"PE.Controllers.Main.txtStarsRibbons": "Звезды и ленты",
"PE.Controllers.Main.txtXAxis": "Ось X",
"PE.Controllers.Main.txtYAxis": "Ось Y",
......@@ -193,18 +205,6 @@
"PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"PE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"PE.Controllers.Main.txtSlideText": "Текст слайда",
"PE.Controllers.Main.txtClipArt": "Картинка",
"PE.Controllers.Main.txtDiagram": "Рисунок SmartArt",
"PE.Controllers.Main.txtDateTime": "Дата и время",
"PE.Controllers.Main.txtFooter": "Нижний колонтитул",
"PE.Controllers.Main.txtHeader": "Верхний колонтитул",
"PE.Controllers.Main.txtMedia": "Клип мультимедиа",
"PE.Controllers.Main.txtPicture": "Рисунок",
"PE.Controllers.Main.txtImage": "Образ слайда",
"PE.Controllers.Main.txtSlideNumber": "Номер слайда",
"PE.Controllers.Main.txtSlideSubtitle": "Подзаголовок слайда",
"PE.Controllers.Main.txtSlideTitle": "Заголовок слайда",
"PE.Controllers.Search.textNoTextFound": "Текст не найден",
"PE.Controllers.Settings.notcriticalErrorTitle": "Внимание",
"PE.Controllers.Settings.txtLoading": "Загрузка...",
......@@ -432,6 +432,7 @@
"PE.Views.Settings.textFind": "Найти",
"PE.Views.Settings.textHelp": "Справка",
"PE.Views.Settings.textLoading": "Загрузка...",
"PE.Views.Settings.textPoweredBy": "Powered by",
"PE.Views.Settings.textPresentInfo": "Информация о презентации",
"PE.Views.Settings.textPresentSetup": "Настройка презентации",
"PE.Views.Settings.textPresentTitle": "Название презентации",
......
This diff is collapsed.
......@@ -136,12 +136,20 @@
"PE.Controllers.Main.txtButtons": "按钮",
"PE.Controllers.Main.txtCallouts": "标注",
"PE.Controllers.Main.txtCharts": "图表",
"PE.Controllers.Main.txtClipArt": "Clip Art",
"PE.Controllers.Main.txtDateTime": "Date and time",
"PE.Controllers.Main.txtDiagram": "SmartArt",
"PE.Controllers.Main.txtDiagramTitle": "图表标题",
"PE.Controllers.Main.txtEditingMode": "设置编辑模式..",
"PE.Controllers.Main.txtFiguredArrows": "图形箭头",
"PE.Controllers.Main.txtFooter": "Footer",
"PE.Controllers.Main.txtHeader": "Header",
"PE.Controllers.Main.txtImage": "Image",
"PE.Controllers.Main.txtLines": "行",
"PE.Controllers.Main.txtMath": "数学",
"PE.Controllers.Main.txtMedia": "Media",
"PE.Controllers.Main.txtNeedSynchronize": "你有更新",
"PE.Controllers.Main.txtPicture": "Picture",
"PE.Controllers.Main.txtRectangles": "矩形",
"PE.Controllers.Main.txtSeries": "系列",
"PE.Controllers.Main.txtSldLtTBlank": "空白",
......@@ -180,6 +188,10 @@
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "垂直标题和文字",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "垂直标题和文字在图表上",
"PE.Controllers.Main.txtSldLtTVertTx": "垂直文本",
"PE.Controllers.Main.txtSlideNumber": "Slide number",
"PE.Controllers.Main.txtSlideSubtitle": "Slide subtitle",
"PE.Controllers.Main.txtSlideText": "Slide text",
"PE.Controllers.Main.txtSlideTitle": "Slide title",
"PE.Controllers.Main.txtStarsRibbons": "星星和丝带",
"PE.Controllers.Main.txtXAxis": "X轴",
"PE.Controllers.Main.txtYAxis": "Y轴",
......@@ -420,6 +432,7 @@
"PE.Views.Settings.textFind": "发现",
"PE.Views.Settings.textHelp": "帮助",
"PE.Views.Settings.textLoading": "载入中…",
"PE.Views.Settings.textPoweredBy": "Powered by",
"PE.Views.Settings.textPresentInfo": "演示信息",
"PE.Views.Settings.textPresentSetup": "演示设置",
"PE.Views.Settings.textPresentTitle": "演讲题目",
......
......@@ -370,7 +370,7 @@
</td>
</tr>
<tr>
<td class="padding-small" width="200">
<td class="padding-small" width="230">
<label class="input-label"><%= scope.textShowEmptyCells %></label>
<div id="spark-dlg-combo-empty" class="input-group-nr" style="margin-right: 10px;"></div>
</td>
......
......@@ -888,7 +888,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
];
this.cmbEmptyCells = new Common.UI.ComboBox({
el : $('#spark-dlg-combo-empty'),
menuStyle : 'min-width: 188px;',
menuStyle : 'min-width: 220px;',
editable : false,
cls : 'input-group-nr'
});
......@@ -1288,7 +1288,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
if (this._changedProps) {
this._changedProps.asc_setType(rawData.type);
}
this.chartSettings.asc_setType(rawData.type);
this._state.SparkType = rawData.type;
var changed = false,
......@@ -1305,7 +1304,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.cmbEmptyCells.setValue((rawData.type !== Asc.c_oAscSparklineType.Line && value==Asc.c_oAscEDispBlanksAs.Span) ? this.textEmptyLine : value);
}
this.updateSparkStyles(this.chartSettings.asc_getStyles());
this.updateSparkStyles(this.chartSettings.asc_getStyles(rawData.type));
},
......
......@@ -506,6 +506,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
});
if (rec) {
rec.set('tabAlign', align);
this._tabListChanged = true;
} else {
rec = new Common.UI.DataViewModel();
rec.set({
......
This diff is collapsed.
......@@ -1599,6 +1599,7 @@
"SSE.Views.Toolbar.textDiagUpBorder": "Rahmenlinien diagonal nach oben",
"SSE.Views.Toolbar.textEntireCol": "Ganze Spalte",
"SSE.Views.Toolbar.textEntireRow": "Ganze Zeile",
"SSE.Views.Toolbar.textFreezePanes": "Fenster fixieren",
"SSE.Views.Toolbar.textHideFBar": "Formelleiste vergeben",
"SSE.Views.Toolbar.textHideGridlines": "Gitternetzlinien vergeben",
"SSE.Views.Toolbar.textHideHeadings": "Überschriften vergeben",
......
......@@ -1599,6 +1599,7 @@
"SSE.Views.Toolbar.textDiagUpBorder": "Diagonal Up Border",
"SSE.Views.Toolbar.textEntireCol": "Entire Column",
"SSE.Views.Toolbar.textEntireRow": "Entire Row",
"SSE.Views.Toolbar.textFreezePanes": "Freeze Panes",
"SSE.Views.Toolbar.textHideFBar": "Hide Formula Bar",
"SSE.Views.Toolbar.textHideGridlines": "Hide Gridlines",
"SSE.Views.Toolbar.textHideHeadings": "Hide Headings",
......
......@@ -1599,6 +1599,7 @@
"SSE.Views.Toolbar.textDiagUpBorder": "Borde diagonal ascendente",
"SSE.Views.Toolbar.textEntireCol": "Toda la columna",
"SSE.Views.Toolbar.textEntireRow": "Toda la fila",
"SSE.Views.Toolbar.textFreezePanes": "Inmovilizar paneles",
"SSE.Views.Toolbar.textHideFBar": "Ocultar barra de fórmulas",
"SSE.Views.Toolbar.textHideGridlines": "Ocultar cuadrícula",
"SSE.Views.Toolbar.textHideHeadings": "Ocultar títulos",
......
......@@ -58,7 +58,7 @@
"Common.Views.Comments.textCancel": "Annuler",
"Common.Views.Comments.textClose": "Fermer",
"Common.Views.Comments.textComments": "Commentaires",
"Common.Views.Comments.textEdit": "OK",
"Common.Views.Comments.textEdit": "Modifier",
"Common.Views.Comments.textEnterCommentHint": "Entrez votre commentaire ici",
"Common.Views.Comments.textOpenAgain": "Ouvrir à nouveau",
"Common.Views.Comments.textReply": "Répondre",
......@@ -330,6 +330,7 @@
"SSE.Controllers.Main.titleLicenseExp": "Licence expirée",
"SSE.Controllers.Main.titleRecalcFormulas": "Calcul en cours...",
"SSE.Controllers.Main.titleServerVersion": "L'éditeur est mis à jour",
"SSE.Controllers.Main.txtAccent": "Accent",
"SSE.Controllers.Main.txtArt": "Votre texte ici",
"SSE.Controllers.Main.txtBasicShapes": "Formes de base",
"SSE.Controllers.Main.txtButtons": "Boutons",
......@@ -343,6 +344,27 @@
"SSE.Controllers.Main.txtRectangles": "Rectangles",
"SSE.Controllers.Main.txtSeries": "Série",
"SSE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
"SSE.Controllers.Main.txtStyle_Bad": "Bad",
"SSE.Controllers.Main.txtStyle_Calculation": "Calculation",
"SSE.Controllers.Main.txtStyle_Check_Cell": "Check Cell",
"SSE.Controllers.Main.txtStyle_Comma": "Comma",
"SSE.Controllers.Main.txtStyle_Currency": "Currency",
"SSE.Controllers.Main.txtStyle_Explanatory_Text": "Explanatory Text",
"SSE.Controllers.Main.txtStyle_Good": "Good",
"SSE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
"SSE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
"SSE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
"SSE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
"SSE.Controllers.Main.txtStyle_Input": "Input",
"SSE.Controllers.Main.txtStyle_Linked_Cell": "Linked Cell",
"SSE.Controllers.Main.txtStyle_Neutral": "Neutral",
"SSE.Controllers.Main.txtStyle_Normal": "Normal",
"SSE.Controllers.Main.txtStyle_Note": "Note",
"SSE.Controllers.Main.txtStyle_Output": "Output",
"SSE.Controllers.Main.txtStyle_Percent": "Percent",
"SSE.Controllers.Main.txtStyle_Title": "Title",
"SSE.Controllers.Main.txtStyle_Total": "Total",
"SSE.Controllers.Main.txtStyle_Warning_Text": "Warning Text",
"SSE.Controllers.Main.txtXAxis": "Axe X",
"SSE.Controllers.Main.txtYAxis": "Axe Y",
"SSE.Controllers.Main.unknownErrorText": "Erreur inconnue.",
......@@ -782,6 +804,7 @@
"SSE.Views.ChartSettings.textSize": "Taille",
"SSE.Views.ChartSettings.textStock": "Boursier",
"SSE.Views.ChartSettings.textStyle": "Style",
"SSE.Views.ChartSettings.textSurface": "Surface",
"SSE.Views.ChartSettings.textType": "Type",
"SSE.Views.ChartSettings.textWidth": "Largeur",
"SSE.Views.ChartSettings.textWinLossSpark": "Positif/Négatif",
......@@ -897,6 +920,7 @@
"SSE.Views.ChartSettingsDlg.textStock": "Boursier",
"SSE.Views.ChartSettingsDlg.textStraight": "Droit",
"SSE.Views.ChartSettingsDlg.textStyle": "Style",
"SSE.Views.ChartSettingsDlg.textSurface": "Surface",
"SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000",
"SSE.Views.ChartSettingsDlg.textTenThousands": "10 000",
"SSE.Views.ChartSettingsDlg.textThousands": "Milliers",
......@@ -1575,6 +1599,7 @@
"SSE.Views.Toolbar.textDiagUpBorder": "Bordure diagonale haut",
"SSE.Views.Toolbar.textEntireCol": "Colonne entière",
"SSE.Views.Toolbar.textEntireRow": "Ligne entière",
"SSE.Views.Toolbar.textFreezePanes": "Verrouiller les volets",
"SSE.Views.Toolbar.textHideFBar": "Masquer la barre de formule",
"SSE.Views.Toolbar.textHideGridlines": "Masquer le quadrillage",
"SSE.Views.Toolbar.textHideHeadings": "Masquer les en-têtes",
......@@ -1603,6 +1628,7 @@
"SSE.Views.Toolbar.textRotateUp": "Rotation du texte vers le haut",
"SSE.Views.Toolbar.textSparks": "Graphiques sparkline",
"SSE.Views.Toolbar.textStock": "Boursier",
"SSE.Views.Toolbar.textSurface": "Surface",
"SSE.Views.Toolbar.textTopBorders": "Bordures supérieures",
"SSE.Views.Toolbar.textUnderline": "Souligné",
"SSE.Views.Toolbar.textWinLossSpark": "Positif/Négatif",
......
This diff is collapsed.
......@@ -1599,6 +1599,7 @@
"SSE.Views.Toolbar.textDiagUpBorder": "Диагональная граница снизу вверх",
"SSE.Views.Toolbar.textEntireCol": "Столбец",
"SSE.Views.Toolbar.textEntireRow": "Строку",
"SSE.Views.Toolbar.textFreezePanes": "Закрепить области",
"SSE.Views.Toolbar.textHideFBar": "Скрыть строку формул",
"SSE.Views.Toolbar.textHideGridlines": "Скрыть линии сетки",
"SSE.Views.Toolbar.textHideHeadings": "Скрыть заголовки",
......
This diff is collapsed.
......@@ -1599,6 +1599,7 @@
"SSE.Views.Toolbar.textDiagUpBorder": "对角线上边界",
"SSE.Views.Toolbar.textEntireCol": "整列",
"SSE.Views.Toolbar.textEntireRow": "整行",
"SSE.Views.Toolbar.textFreezePanes": "Freeze Panes",
"SSE.Views.Toolbar.textHideFBar": "隐藏公式栏",
"SSE.Views.Toolbar.textHideGridlines": "隐藏网格线",
"SSE.Views.Toolbar.textHideHeadings": "隐藏标题",
......
......@@ -304,7 +304,14 @@
<td>Alt+'='</td>
<td>Insert the <b>SUM</b> function into the selected cell.</td>
</tr>
<tr>
<th colspan="3">Modifying Objects</th>
</tr>
<tr>
<td>Movement by one-pixel increments</td>
<td>Ctrl</td>
<td>Hold down the Ctrl key and use the keybord arrows to move the selected object by one pixel at a time.</td>
</tr>
</table>
</div>
</body>
......
......@@ -305,6 +305,13 @@
<td>Alt+'='</td>
<td>Вставить функцию <b>SUM</b> в выделенную ячейку.</td>
</tr>
<th colspan="3">Модификация объектов</th>
</tr>
<tr>
<td>Перемещение с шагом в один пиксель</td>
<td>Ctrl</td>
<td>Удерживайте клавишу Ctrl и используйте стрелки на клавиатуре, чтобы перемещать выбранный объект на один пиксель за раз.</td>
</tr>
</table>
</div>
</body>
......
This diff is collapsed.
......@@ -205,6 +205,7 @@
"SSE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
"SSE.Controllers.Main.titleServerVersion": "Editor wurde aktualisiert",
"SSE.Controllers.Main.titleUpdateVersion": "Version wurde geändert",
"SSE.Controllers.Main.txtAccent": "Akzent",
"SSE.Controllers.Main.txtArt": "Hier den Text eingeben",
"SSE.Controllers.Main.txtBasicShapes": "Standardformen",
"SSE.Controllers.Main.txtButtons": "Buttons",
......@@ -222,6 +223,27 @@
"SSE.Controllers.Main.txtSeries": "Reihen",
"SSE.Controllers.Main.txtSpace": "Leerzeichen",
"SSE.Controllers.Main.txtStarsRibbons": "Sterne & Bänder",
"SSE.Controllers.Main.txtStyle_Bad": "Schlecht",
"SSE.Controllers.Main.txtStyle_Calculation": "Berechnung",
"SSE.Controllers.Main.txtStyle_Check_Cell": "Zelle überprüfen",
"SSE.Controllers.Main.txtStyle_Comma": "Finanziell",
"SSE.Controllers.Main.txtStyle_Currency": "Währung",
"SSE.Controllers.Main.txtStyle_Explanatory_Text": "Erklärender Text",
"SSE.Controllers.Main.txtStyle_Good": "Gut",
"SSE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
"SSE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
"SSE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
"SSE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
"SSE.Controllers.Main.txtStyle_Input": "Eingabe",
"SSE.Controllers.Main.txtStyle_Linked_Cell": "Verknüpfte Zelle",
"SSE.Controllers.Main.txtStyle_Neutral": "Neutral",
"SSE.Controllers.Main.txtStyle_Normal": "Normal",
"SSE.Controllers.Main.txtStyle_Note": "Hinweis",
"SSE.Controllers.Main.txtStyle_Output": "Ausgabe",
"SSE.Controllers.Main.txtStyle_Percent": "Prozent",
"SSE.Controllers.Main.txtStyle_Title": "Titel\t",
"SSE.Controllers.Main.txtStyle_Total": "Insgesamt",
"SSE.Controllers.Main.txtStyle_Warning_Text": "Warnungstext",
"SSE.Controllers.Main.txtTab": "Tabulator",
"SSE.Controllers.Main.txtXAxis": "x-Achse",
"SSE.Controllers.Main.txtYAxis": "y-Achse",
......@@ -456,6 +478,7 @@
"SSE.Views.Settings.textFindAndReplace": "Suchen und ersetzen\t",
"SSE.Views.Settings.textHelp": "Hilfe",
"SSE.Views.Settings.textLoading": "Ladevorgang...",
"SSE.Views.Settings.textPoweredBy": "Betrieben von",
"SSE.Views.Settings.textSettings": "Einstellungen",
"SSE.Views.Settings.textTel": "Tel.",
"SSE.Views.Settings.textVersion": "Version",
......
This diff is collapsed.
This diff is collapsed.
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