diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
index f35abbd3de..6d311f1d6f 100644
--- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -112,9 +112,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.CurSpecial = undefined;
this._arrTextAlignment = [
- {displayValue: this.textLeft, value: c_paragraphTextAlignment.LEFT},
- {displayValue: this.textCentered, value: c_paragraphTextAlignment.CENTERED},
- {displayValue: this.textRight, value: c_paragraphTextAlignment.RIGHT},
+ {displayValue: this.textTabLeft, value: c_paragraphTextAlignment.LEFT},
+ {displayValue: this.textTabCenter, value: c_paragraphTextAlignment.CENTERED},
+ {displayValue: this.textTabRight, value: c_paragraphTextAlignment.RIGHT},
{displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED}
];
@@ -1505,11 +1505,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textNoneSpecial: '(none)',
textFirstLine: 'First line',
textHanging: 'Hanging',
- textCentered: 'Centered',
textJustified: 'Justified',
textBodyText: 'BodyText',
textLevel: 'Level ',
- strIndentsTextAlignment: 'Text Alignment',
strIndentsOutlinelevel: 'Outline level',
strIndent: 'Indents',
strSpacing: 'Spacing'
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 3b0bbac7e7..255c7fbf8f 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1772,7 +1772,6 @@
"DE.Views.ParagraphSettingsAdvanced.textJustified": "Justified",
"DE.Views.ParagraphSettingsAdvanced.textBodyText": "BodyText",
"DE.Views.ParagraphSettingsAdvanced.textLevel": "Level ",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsTextAlignment": "Text Alignment",
"DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level",
"DE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
"DE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 0e7a5ed34f..dc93b40d9c 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -1712,7 +1712,8 @@
"DE.Views.ParagraphSettingsAdvanced.strMargins": "Внутренние поля",
"DE.Views.ParagraphSettingsAdvanced.strOrphan": "Запрет висячих строк",
"DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт",
- "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и положение",
+ "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и интервалы",
+ "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Положение на странице",
"DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Положение",
"DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малые прописные",
"DE.Views.ParagraphSettingsAdvanced.strStrike": "Зачёркивание",
@@ -1753,6 +1754,24 @@
"DE.Views.ParagraphSettingsAdvanced.tipRight": "Задать только правую границу",
"DE.Views.ParagraphSettingsAdvanced.tipTop": "Задать только верхнюю границу",
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Без границ",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Перед",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "После",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Междустрочный интервал",
+ "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
+ "DE.Views.ParagraphSettingsAdvanced.textAuto": "Множитель",
+ "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Минимум",
+ "DE.Views.ParagraphSettingsAdvanced.textExact": "Точно",
+ "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Не добавлять интервал между абзацами одного стиля",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Первая строка",
+ "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(нет)",
+ "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Отступ",
+ "DE.Views.ParagraphSettingsAdvanced.textHanging": "Выступ",
+ "DE.Views.ParagraphSettingsAdvanced.textJustified": "По ширине",
+ "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Основной текст",
+ "DE.Views.ParagraphSettingsAdvanced.textLevel": "Уровень ",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Уровень",
+ "DE.Views.ParagraphSettingsAdvanced.strIndent": "Отступы",
+ "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Интервал между абзацами",
"DE.Views.RightMenu.txtChartSettings": "Параметры диаграммы",
"DE.Views.RightMenu.txtHeaderFooterSettings": "Параметры верхнего и нижнего колонтитулов",
"DE.Views.RightMenu.txtImageSettings": "Параметры изображения",
diff --git a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
index 88d2cb31cc..622c720517 100644
--- a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
@@ -2,7 +2,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
index 36f30ee9fc..b432738741 100644
--- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -91,9 +91,9 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.CurLineRuleIdx = this._arrLineRule.indexOf(curItem);
this._arrTextAlignment = [
- {displayValue: this.textLeft, value: c_paragraphTextAlignment.LEFT},
- {displayValue: this.textCentered, value: c_paragraphTextAlignment.CENTERED},
- {displayValue: this.textRight, value: c_paragraphTextAlignment.RIGHT},
+ {displayValue: this.textTabLeft, value: c_paragraphTextAlignment.LEFT},
+ {displayValue: this.textTabCenter, value: c_paragraphTextAlignment.CENTERED},
+ {displayValue: this.textTabRight, value: c_paragraphTextAlignment.RIGHT},
{displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED}
];
@@ -798,11 +798,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
textTabPosition: 'Tab Position',
textDefault: 'Default Tab',
noTabs: 'The specified tabs will appear in this field',
- strIndentsTextAlignment: 'Text Alignment',
- textLeft: 'Left',
- textCentered: 'Centered',
textJustified: 'Justified',
- textRight: 'Right',
strIndentsSpecial: 'Special',
textNoneSpecial: '(none)',
textFirstLine: 'First line',
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 375ab56579..1bd4d734bc 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1345,11 +1345,7 @@
"PE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab Position",
"PE.Views.ParagraphSettingsAdvanced.textTabRight": "Right",
"PE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced Settings",
- "PE.Views.ParagraphSettingsAdvanced.strIndentsTextAlignment": "Text Alignment",
- "PE.Views.ParagraphSettingsAdvanced.textLeft": "Left",
- "PE.Views.ParagraphSettingsAdvanced.textCentered": "Centered",
"PE.Views.ParagraphSettingsAdvanced.textJustified": "Justified",
- "PE.Views.ParagraphSettingsAdvanced.textRight": "Right",
"PE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Special",
"PE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
"PE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json
index 61bac22100..4c132fcfa9 100644
--- a/apps/presentationeditor/main/locale/ru.json
+++ b/apps/presentationeditor/main/locale/ru.json
@@ -1326,7 +1326,7 @@
"PE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Слева",
"PE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Справа",
"PE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт",
- "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и положение",
+ "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и интервалы",
"PE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малые прописные",
"PE.Views.ParagraphSettingsAdvanced.strStrike": "Зачёркивание",
"PE.Views.ParagraphSettingsAdvanced.strSubscript": "Подстрочные",
@@ -1344,6 +1344,18 @@
"PE.Views.ParagraphSettingsAdvanced.textTabPosition": "Позиция",
"PE.Views.ParagraphSettingsAdvanced.textTabRight": "По правому краю",
"PE.Views.ParagraphSettingsAdvanced.textTitle": "Абзац - дополнительные параметры",
+ "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Перед",
+ "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "После",
+ "PE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Междустрочный интервал",
+ "PE.Views.ParagraphSettingsAdvanced.textAuto": "Множитель",
+ "PE.Views.ParagraphSettingsAdvanced.textExact": "Точно",
+ "PE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Первая строка",
+ "PE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(нет)",
+ "PE.Views.ParagraphSettingsAdvanced.textFirstLine": "Отступ",
+ "PE.Views.ParagraphSettingsAdvanced.textHanging": "Выступ",
+ "PE.Views.ParagraphSettingsAdvanced.textJustified": "По ширине",
+ "PE.Views.ParagraphSettingsAdvanced.strIndent": "Отступы",
+ "PE.Views.ParagraphSettingsAdvanced.strSpacing": "Интервал между абзацами",
"PE.Views.RightMenu.txtChartSettings": "Параметры диаграммы",
"PE.Views.RightMenu.txtImageSettings": "Параметры изображения",
"PE.Views.RightMenu.txtParagraphSettings": "Параметры текста",
diff --git a/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template
index 88d2cb31cc..622c720517 100644
--- a/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template
+++ b/apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template
@@ -2,7 +2,7 @@
-
+
diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
index cd4b61c8bc..228de3e9c6 100644
--- a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -91,9 +91,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.CurLineRuleIdx = this._arrLineRule.indexOf(curItem);
this._arrTextAlignment = [
- {displayValue: this.textLeft, value: c_paragraphTextAlignment.LEFT},
- {displayValue: this.textCentered, value: c_paragraphTextAlignment.CENTERED},
- {displayValue: this.textRight, value: c_paragraphTextAlignment.RIGHT},
+ {displayValue: this.textTabLeft, value: c_paragraphTextAlignment.LEFT},
+ {displayValue: this.textTabCenter, value: c_paragraphTextAlignment.CENTERED},
+ {displayValue: this.textTabRight, value: c_paragraphTextAlignment.RIGHT},
{displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED}
];
@@ -801,16 +801,11 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
textTabPosition: 'Tab Position',
textDefault: 'Default Tab',
noTabs: 'The specified tabs will appear in this field',
- strIndentsTextAlignment: 'Text Alignment',
- textLeft: 'Left',
- textCentered: 'Centered',
textJustified: 'Justified',
- textRight: 'Right',
strIndentsSpecial: 'Special',
textNoneSpecial: '(none)',
textFirstLine: 'First line',
textHanging: 'Hanging',
- strIndentsSpecialBy: 'By',
strIndentsSpacingBefore: 'Before',
strIndentsSpacingAfter: 'After',
strIndentsLineSpacing: 'Line Spacing',
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index ba924f6487..fb5d413898 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1826,11 +1826,7 @@
"SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab Position",
"SSE.Views.ParagraphSettingsAdvanced.textTabRight": "Right",
"SSE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced Settings",
- "SSE.Views.ParagraphSettingsAdvanced.strIndentsTextAlignment": "Text Alignment",
- "SSE.Views.ParagraphSettingsAdvanced.textLeft": "Left",
- "SSE.Views.ParagraphSettingsAdvanced.textCentered": "Centered",
"SSE.Views.ParagraphSettingsAdvanced.textJustified": "Justified",
- "SSE.Views.ParagraphSettingsAdvanced.textRight": "Right",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Special",
"SSE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
"SSE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json
index 7511369893..f17354befa 100644
--- a/apps/spreadsheeteditor/main/locale/ru.json
+++ b/apps/spreadsheeteditor/main/locale/ru.json
@@ -1803,7 +1803,7 @@
"SSE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Слева",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Справа",
"SSE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт",
- "SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и положение",
+ "SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и интервалы",
"SSE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малые прописные",
"SSE.Views.ParagraphSettingsAdvanced.strStrike": "Зачёркивание",
"SSE.Views.ParagraphSettingsAdvanced.strSubscript": "Подстрочные",
@@ -1821,6 +1821,18 @@
"SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "Позиция",
"SSE.Views.ParagraphSettingsAdvanced.textTabRight": "По правому краю",
"SSE.Views.ParagraphSettingsAdvanced.textTitle": "Абзац - дополнительные параметры",
+ "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Перед",
+ "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "После",
+ "SSE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Междустрочный интервал",
+ "SSE.Views.ParagraphSettingsAdvanced.textAuto": "Множитель",
+ "SSE.Views.ParagraphSettingsAdvanced.textExact": "Точно",
+ "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Первая строка",
+ "SSE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(нет)",
+ "SSE.Views.ParagraphSettingsAdvanced.textFirstLine": "Отступ",
+ "SSE.Views.ParagraphSettingsAdvanced.textHanging": "Выступ",
+ "SSE.Views.ParagraphSettingsAdvanced.textJustified": "По ширине",
+ "SSE.Views.ParagraphSettingsAdvanced.strIndent": "Отступы",
+ "SSE.Views.ParagraphSettingsAdvanced.strSpacing": "Интервал между абзацами",
"SSE.Views.PivotSettings.notcriticalErrorTitle": "Внимание",
"SSE.Views.PivotSettings.textAdvanced": "Дополнительные параметры",
"SSE.Views.PivotSettings.textCancel": "Отмена",