',
@@ -417,8 +417,8 @@ define([
'',
'',
- '',
- '',
+ '
',
+ '
',
'
',
'
',
'',
@@ -430,7 +430,7 @@ define([
'
',
'
',
'
',
- '
',
+ '
',
'
'
].join('')),
diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index deac83858..e2a7deabf 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -229,8 +229,11 @@ define([
if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) )
for (var i of document.body.classList.entries()) {
if ( i[1].startsWith('theme-') && !i[1].startsWith('theme-type-') ) {
- theme_name = i[1];
- break;
+ if ( themes_map[i[1]] ) {
+ theme_name = i[1];
+ Common.localStorage.setItem('ui-theme-id', theme_name);
+ break;
+ }
}
}
}
diff --git a/apps/common/main/resources/less/dimension-picker.less b/apps/common/main/resources/less/dimension-picker.less
index 1098376c2..405565a1b 100644
--- a/apps/common/main/resources/less/dimension-picker.less
+++ b/apps/common/main/resources/less/dimension-picker.less
@@ -17,18 +17,20 @@
top: 0;
overflow: hidden;
position: absolute;
+
+ //background: transparent repeat scroll 0 0;
+ .background-ximage-all('dimension-picker/dimension-highlighted.png', 18px);
+ background-repeat: repeat;
}
.dimension-picker-unhighlighted {
//background: transparent repeat scroll 0 0;
.background-ximage-all('dimension-picker/dimension-unhighlighted.png', 18px);
background-repeat: repeat;
-}
-.dimension-picker div.dimension-picker-highlighted {
- //background: transparent repeat scroll 0 0;
- .background-ximage-all('dimension-picker/dimension-highlighted.png', 18px);
- background-repeat: repeat;
+ .pixel-ratio__1_25 &, .pixel-ratio__1_75 & {
+ image-rendering: pixelated;
+ }
}
.dimension-picker-status {
diff --git a/apps/common/main/resources/less/table-styler.less b/apps/common/main/resources/less/table-styler.less
index 304cf4f76..2c6525e54 100644
--- a/apps/common/main/resources/less/table-styler.less
+++ b/apps/common/main/resources/less/table-styler.less
@@ -26,15 +26,67 @@
.tablestyler-cell .cell-content .content-text {
display: block;
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAEAQMAAACeIXx6AAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA1JREFUeNpjOMDEAAIABVQAw/N8ALEAAAAASUVORK5CYII=') repeat 0 0 scroll;
- background-size: 2px auto;
+ background-size: 2px 4px;
height: 100%;
+ .pixel-ratio__1_25 & {
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAFAQMAAABVfa/fAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA1JREFUeNpjOMDEAAEABtoAw4z263sAAAAASUVORK5CYII=');
+ }
+
.pixel-ratio__1_5 & {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGAQMAAAA8K7ZPAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA5JREFUeNpjeMAAgmAAABesAqGy0C2BAAAAAElFTkSuQmCC');
}
+ .pixel-ratio__1_75 & {
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAHAQMAAAAYtQ7UAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA5JREFUeNpjOMAAglAAABjOAkF/wXxcAAAAAElFTkSuQmCC');
+ }
+
.pixel-ratio__2 & {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAIAQMAAADk/cxGAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA5JREFUeNpj+MAAgVAAAC0QA8HkpvUHAAAAAElFTkSuQmCC');
}
}
+
+ .ts-preview-box {
+ position: absolute;
+
+ &.ts-preview-box--lt {
+ border-bottom: 1px dotted gray;
+ border-bottom: @scaled-one-px-value dotted gray;
+ border-right: 1px dotted gray;
+ border-right: @scaled-one-px-value dotted gray;
+ }
+
+ &.ts-preview-box--mt {
+ }
+
+ &.ts-preview-box--rt {
+ border-bottom: 1px dotted gray;
+ border-bottom: @scaled-one-px-value dotted gray;
+ border-left: 1px dotted gray;
+ border-left: @scaled-one-px-value dotted gray;
+ }
+
+ &.ts-preview-box--rm {
+ }
+
+ &.ts-preview-box--lb {
+ border-top: 1px dotted gray;
+ border-top: @scaled-one-px-value dotted gray;
+ border-right: 1px dotted gray;
+ border-right: @scaled-one-px-value dotted gray;
+ }
+
+ &.ts-preview-box--lm {
+ }
+
+ &.ts-preview-box--rb {
+ border-top: 1px dotted gray;
+ border-top: @scaled-one-px-value dotted gray;
+ border-left: 1px dotted gray;
+ border-left: @scaled-one-px-value dotted gray;
+ }
+
+ &.ts-preview-box--mb {
+ }
+ }
}
\ No newline at end of file
diff --git a/apps/common/main/resources/less/theme-colorpalette.less b/apps/common/main/resources/less/theme-colorpalette.less
index b8728193f..f71b5653d 100644
--- a/apps/common/main/resources/less/theme-colorpalette.less
+++ b/apps/common/main/resources/less/theme-colorpalette.less
@@ -16,6 +16,7 @@
a {
padding: 0;
+ margin: calc(1px - 1px / @pixel-ratio-factor);
border: @scaled-one-px-value-ie solid @background-normal-ie;
border: @scaled-one-px-value solid @background-normal;
float: left;
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index d56509cd0..bce4c991f 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -265,7 +265,7 @@ define([
{
id: 'id-toolbar-menu-auto-fontcolor',
caption: this.textAutoColor,
- template: _.template('<%= caption %>')
+ template: _.template('<%= caption %>')
},
{caption: '--'},
{template: _.template('')},
diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
index cda542b93..7b4f0336b 100644
--- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
@@ -340,7 +340,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
{
id: 'watermark-auto-color',
caption: this.textAuto,
- template: _.template('<%= caption %>')
+ template: _.template('<%= caption %>')
},
{caption: '--'},
{ template: _.template('') },
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index f313f76af..06d66f127 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -381,9 +381,9 @@
"Common.Views.ReviewChanges.txtFinalCap": "Final",
"Common.Views.ReviewChanges.txtHistory": "Version History",
"Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)",
- "Common.Views.ReviewChanges.txtMarkupCap": "Markup",
- "Common.Views.ReviewChanges.txtMarkupSimple": "All changes (Editing)
Turn off balloons",
- "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Simple Markup",
+ "Common.Views.ReviewChanges.txtMarkupCap": "Markup and balloons",
+ "Common.Views.ReviewChanges.txtMarkupSimple": "All changes (Editing)
No balloons",
+ "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Only markup",
"Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtOff": "OFF for me",
"Common.Views.ReviewChanges.txtOffGlobal": "OFF for me and everyone",
diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json
index c8656096b..c53d7ecde 100644
--- a/apps/documenteditor/main/locale/es.json
+++ b/apps/documenteditor/main/locale/es.json
@@ -381,9 +381,9 @@
"Common.Views.ReviewChanges.txtFinalCap": "Final",
"Common.Views.ReviewChanges.txtHistory": "Historial de versiones",
"Common.Views.ReviewChanges.txtMarkup": "Todos los cambios (Edición)",
- "Common.Views.ReviewChanges.txtMarkupCap": "Margen",
- "Common.Views.ReviewChanges.txtMarkupSimple": "Todos los cambios (Edición)
Desactivar los globos",
- "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Revisiones simples",
+ "Common.Views.ReviewChanges.txtMarkupCap": "Revisiones y globos",
+ "Common.Views.ReviewChanges.txtMarkupSimple": "Todos los cambios (Edición)
Sin globos",
+ "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Sólo revisiones",
"Common.Views.ReviewChanges.txtNext": "Al siguiente cambio",
"Common.Views.ReviewChanges.txtOff": "Desactivar para mí",
"Common.Views.ReviewChanges.txtOffGlobal": "Desactivar para mí y para todos",
@@ -2650,7 +2650,7 @@
"DE.Views.Toolbar.textTabInsert": "Insertar",
"DE.Views.Toolbar.textTabLayout": "Diseño",
"DE.Views.Toolbar.textTabLinks": "Referencias",
- "DE.Views.Toolbar.textTabProtect": "Proteción",
+ "DE.Views.Toolbar.textTabProtect": "Protección",
"DE.Views.Toolbar.textTabReview": "Revisar",
"DE.Views.Toolbar.textTitleError": "Error",
"DE.Views.Toolbar.textToCurrent": "A la posición actual",
diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json
index 4feca73a0..eec1bfc4c 100644
--- a/apps/documenteditor/main/locale/fr.json
+++ b/apps/documenteditor/main/locale/fr.json
@@ -381,9 +381,9 @@
"Common.Views.ReviewChanges.txtFinalCap": "Final",
"Common.Views.ReviewChanges.txtHistory": "Historique des versions",
"Common.Views.ReviewChanges.txtMarkup": "Toutes les modifications (Édition)",
- "Common.Views.ReviewChanges.txtMarkupCap": "Balisage",
- "Common.Views.ReviewChanges.txtMarkupSimple": "Toutes les modifications(Éditions)
Désactiver les bulles",
- "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Marques simples",
+ "Common.Views.ReviewChanges.txtMarkupCap": "Balisage et ballons",
+ "Common.Views.ReviewChanges.txtMarkupSimple": "Tous les changements (Édition)
Désactiver les ballons",
+ "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Balisage uniquement",
"Common.Views.ReviewChanges.txtNext": "À la modification suivante",
"Common.Views.ReviewChanges.txtOff": "OFF pour moi ",
"Common.Views.ReviewChanges.txtOffGlobal": "OFF pour moi et tout le monde",
diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json
index e4bdcd4eb..5dee92438 100644
--- a/apps/documenteditor/main/locale/pl.json
+++ b/apps/documenteditor/main/locale/pl.json
@@ -1273,7 +1273,19 @@
"DE.Views.LeftMenu.tipSupport": "Opinie i wsparcie",
"DE.Views.LeftMenu.tipTitles": "Tytuły",
"DE.Views.LeftMenu.txtDeveloper": "TRYB DEWELOPERA",
- "DE.Views.LineNumbersDialog.textAddLineNumbering": "Dodaj numerowanie linii",
+ "DE.Views.LineNumbersDialog.textAddLineNumbering": "Dodaj numerację wierszy",
+ "DE.Views.LineNumbersDialog.textApplyTo": "Zastosuj do",
+ "DE.Views.LineNumbersDialog.textContinuous": "Ciągłe",
+ "DE.Views.LineNumbersDialog.textCountBy": "Numeruj co",
+ "DE.Views.LineNumbersDialog.textDocument": "Cały dokument",
+ "DE.Views.LineNumbersDialog.textForward": "Od bieżącego miejsca",
+ "DE.Views.LineNumbersDialog.textFromText": "Od tekstu",
+ "DE.Views.LineNumbersDialog.textNumbering": "Numerowanie",
+ "DE.Views.LineNumbersDialog.textRestartEachPage": "Rozpocznij nową stronę",
+ "DE.Views.LineNumbersDialog.textRestartEachSection": "Rozpocznij nową sekcję",
+ "DE.Views.LineNumbersDialog.textSection": "Ta sekcja",
+ "DE.Views.LineNumbersDialog.textStartAt": "Rozpocznij od",
+ "DE.Views.LineNumbersDialog.textTitle": "Numery wierszy",
"DE.Views.Links.capBtnBookmarks": "Zakładka",
"DE.Views.Links.capBtnContentsUpdate": "Odśwież",
"DE.Views.Links.capBtnInsContents": "Spis treści",
@@ -1373,6 +1385,10 @@
"DE.Views.PageSizeDialog.textTitle": "Rozmiar strony",
"DE.Views.PageSizeDialog.textWidth": "Szerokość",
"DE.Views.PageSizeDialog.txtCustom": "Niestandardowy",
+ "DE.Views.ParagraphSettings.strIndent": "Wcięcie",
+ "DE.Views.ParagraphSettings.strIndentsLeftText": "Z lewej",
+ "DE.Views.ParagraphSettings.strIndentsRightText": "Z prawej",
+ "DE.Views.ParagraphSettings.strIndentsSpecial": "Specjalne",
"DE.Views.ParagraphSettings.strLineHeight": "Rozstaw wierszy",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Odstępy akapitu",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Nie dodawaj odstępu między akapitami tego samego stylu",
@@ -1384,28 +1400,36 @@
"DE.Views.ParagraphSettings.textAuto": "Mnożnik",
"DE.Views.ParagraphSettings.textBackColor": "Kolor tła",
"DE.Views.ParagraphSettings.textExact": "Dokładnie",
+ "DE.Views.ParagraphSettings.textFirstLine": "Pierwszy wiersz",
+ "DE.Views.ParagraphSettings.textHanging": "Wysunięcie",
+ "DE.Views.ParagraphSettings.textNoneSpecial": "(brak)",
"DE.Views.ParagraphSettings.txtAutoText": "Automatyczny",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "W tym polu zostaną wyświetlone określone karty",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Wszystkie duże litery",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Obramowania i wypełnienie",
- "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Przerwanie strony przed",
+ "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Podział strony przed",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Podwójne przekreślenie",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Lewy",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Prawy",
+ "DE.Views.ParagraphSettingsAdvanced.strIndent": "Wcięcia",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Z lewej",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Z prawej",
"DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "po",
"DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Przed",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Specjalne",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Trzymaj wiersze razem",
"DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Trzymaj dalej",
"DE.Views.ParagraphSettingsAdvanced.strMargins": "Wewnętrzne pola",
"DE.Views.ParagraphSettingsAdvanced.strOrphan": "Zakaz bękartów",
"DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Czcionka",
"DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Wcięcia i miejsca docelowe",
+ "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Podział wierszy i stron",
"DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Umieszczenie",
"DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Małe litery",
"DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Nie dodawaj odstępu między akapitami tego samego stylu",
- "DE.Views.ParagraphSettingsAdvanced.strStrike": "Przekreślony",
- "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indeks",
+ "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Odstępy",
+ "DE.Views.ParagraphSettingsAdvanced.strStrike": "Przekreślenie",
+ "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indeks dolny",
"DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Indeks górny",
+ "DE.Views.ParagraphSettingsAdvanced.strSuppressLineNumbers": "Ukryj numerację wierszy",
"DE.Views.ParagraphSettingsAdvanced.strTabs": "Karta",
"DE.Views.ParagraphSettingsAdvanced.textAlign": "Wyrównanie",
"DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Co najmniej",
@@ -1418,15 +1442,17 @@
"DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Rozstaw znaków",
"DE.Views.ParagraphSettingsAdvanced.textDefault": "Domyślna zakładka",
"DE.Views.ParagraphSettingsAdvanced.textEffects": "Efekty",
+ "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Pierwszy wiersz",
+ "DE.Views.ParagraphSettingsAdvanced.textHanging": "Wysunięcie",
"DE.Views.ParagraphSettingsAdvanced.textLeft": "Lewy",
"DE.Views.ParagraphSettingsAdvanced.textNone": "Brak",
"DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(brak)",
- "DE.Views.ParagraphSettingsAdvanced.textPosition": "Pozycja",
+ "DE.Views.ParagraphSettingsAdvanced.textPosition": "Położenie",
"DE.Views.ParagraphSettingsAdvanced.textRemove": "Usuń",
"DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Usuń wszystko",
"DE.Views.ParagraphSettingsAdvanced.textRight": "Prawy",
"DE.Views.ParagraphSettingsAdvanced.textSet": "Określ",
- "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Rozstaw",
+ "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Odstępy",
"DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Środek",
"DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Lewy",
"DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Pozycja karty",
@@ -1683,6 +1709,7 @@
"DE.Views.Toolbar.capBtnInsTable": "Tabela",
"DE.Views.Toolbar.capBtnInsTextart": "Text Art",
"DE.Views.Toolbar.capBtnInsTextbox": "Tekst",
+ "DE.Views.Toolbar.capBtnLineNumbers": "Numery wierszy",
"DE.Views.Toolbar.capBtnMargins": "Marginesy",
"DE.Views.Toolbar.capBtnPageOrient": "Orientacja",
"DE.Views.Toolbar.capBtnPageSize": "Rozmiar",
@@ -1705,14 +1732,16 @@
"DE.Views.Toolbar.textBold": "Pogrubienie",
"DE.Views.Toolbar.textBottom": "Dół:",
"DE.Views.Toolbar.textColumnsCustom": "Niestandardowe kolumny",
- "DE.Views.Toolbar.textColumnsLeft": "Lewy",
- "DE.Views.Toolbar.textColumnsOne": "Jeden",
- "DE.Views.Toolbar.textColumnsRight": "Prawy",
+ "DE.Views.Toolbar.textColumnsLeft": "Z lewej",
+ "DE.Views.Toolbar.textColumnsOne": "Jedna",
+ "DE.Views.Toolbar.textColumnsRight": "Z prawej",
"DE.Views.Toolbar.textColumnsThree": "Trzy",
- "DE.Views.Toolbar.textColumnsTwo": "Dwa",
- "DE.Views.Toolbar.textContPage": "Ciągła strona",
+ "DE.Views.Toolbar.textColumnsTwo": "Dwie",
+ "DE.Views.Toolbar.textContinuous": "Ciągłe",
+ "DE.Views.Toolbar.textContPage": "Ciągły",
+ "DE.Views.Toolbar.textCustomLineNumbers": "Opcje numeracji wierszy",
"DE.Views.Toolbar.textEditWatermark": "Własny znak wodny",
- "DE.Views.Toolbar.textEvenPage": "Z parzystej strony",
+ "DE.Views.Toolbar.textEvenPage": "Parzysta strona",
"DE.Views.Toolbar.textInMargin": "W marginesie",
"DE.Views.Toolbar.textInsColumnBreak": "Wstaw podział kolumny",
"DE.Views.Toolbar.textInsertPageCount": "Wstaw liczbę stron",
@@ -1739,6 +1768,8 @@
"DE.Views.Toolbar.textPortrait": "Portret",
"DE.Views.Toolbar.textRemoveControl": "Usuń kontrolę treści",
"DE.Views.Toolbar.textRemWatermark": "Usuń znak wodny",
+ "DE.Views.Toolbar.textRestartEachPage": "Rozpocznij nową stronę",
+ "DE.Views.Toolbar.textRestartEachSection": "Rozpocznij nową sekcję",
"DE.Views.Toolbar.textRight": "Prawo:",
"DE.Views.Toolbar.textStrikeout": "Skreślenie",
"DE.Views.Toolbar.textStyleMenuDelete": "Usuń styl",
@@ -1747,7 +1778,7 @@
"DE.Views.Toolbar.textStyleMenuRestore": "Przywróć domyślne",
"DE.Views.Toolbar.textStyleMenuRestoreAll": "Przywróć wszystko do domyślnych stylów",
"DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizuj z wyboru",
- "DE.Views.Toolbar.textSubscript": "Indeks",
+ "DE.Views.Toolbar.textSubscript": "Indeks dolny",
"DE.Views.Toolbar.textSuperscript": "Indeks górny",
"DE.Views.Toolbar.textTabCollaboration": "Współpraca",
"DE.Views.Toolbar.textTabFile": "Plik",
@@ -1794,6 +1825,7 @@
"DE.Views.Toolbar.tipInsertTable": "Wstaw tabelę",
"DE.Views.Toolbar.tipInsertText": "Wstaw tekst",
"DE.Views.Toolbar.tipInsertTextArt": "Wstaw tekst",
+ "DE.Views.Toolbar.tipLineNumbers": "Pokaż numery wierszy",
"DE.Views.Toolbar.tipLineSpace": "Rozstaw wierszy akapitu",
"DE.Views.Toolbar.tipMailRecepients": "Korespondencja seryjna",
"DE.Views.Toolbar.tipMarkers": "Lista punktowa",
diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json
index 060753879..cd9b0e17b 100644
--- a/apps/documenteditor/main/locale/ro.json
+++ b/apps/documenteditor/main/locale/ro.json
@@ -381,7 +381,7 @@
"Common.Views.ReviewChanges.txtFinalCap": "Final",
"Common.Views.ReviewChanges.txtHistory": "Istoricul versiune",
"Common.Views.ReviewChanges.txtMarkup": "Toate modificările (Editare)",
- "Common.Views.ReviewChanges.txtMarkupCap": "Marcaj",
+ "Common.Views.ReviewChanges.txtMarkupCap": "Marcaj și baloane",
"Common.Views.ReviewChanges.txtMarkupSimple": "Toate modificările (Editare)
Dezactivare baloane",
"Common.Views.ReviewChanges.txtMarkupSimpleCap": "Marcare simplă",
"Common.Views.ReviewChanges.txtNext": "Următorul",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index f3d4a043f..fd4e10746 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -381,9 +381,9 @@
"Common.Views.ReviewChanges.txtFinalCap": "Измененный документ",
"Common.Views.ReviewChanges.txtHistory": "История версий",
"Common.Views.ReviewChanges.txtMarkup": "Все изменения (редактирование)",
- "Common.Views.ReviewChanges.txtMarkupCap": "Все исправления",
- "Common.Views.ReviewChanges.txtMarkupSimple": "Все изменения (редактирование)
Отключить выноски",
- "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Исправления",
+ "Common.Views.ReviewChanges.txtMarkupCap": "Исправления и выноски",
+ "Common.Views.ReviewChanges.txtMarkupSimple": "Все изменения (редактирование)
Выноски выключены",
+ "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Только исправления",
"Common.Views.ReviewChanges.txtNext": "К следующему",
"Common.Views.ReviewChanges.txtOff": "ОТКЛ. для меня",
"Common.Views.ReviewChanges.txtOffGlobal": "ОТКЛ. для меня и для всех",
@@ -482,7 +482,7 @@
"DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание",
"DE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...",
- "DE.Controllers.LeftMenu.textLoadHistory": "Загрузка журнала версий...",
+ "DE.Controllers.LeftMenu.textLoadHistory": "Загрузка истории версий...",
"DE.Controllers.LeftMenu.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.",
"DE.Controllers.LeftMenu.textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "Поиск выполнен. Заменено вхождений: {0}",
diff --git a/apps/documenteditor/main/resources/help/de/Contents.json b/apps/documenteditor/main/resources/help/de/Contents.json
index 0ea3240e3..6222f6bd2 100644
--- a/apps/documenteditor/main/resources/help/de/Contents.json
+++ b/apps/documenteditor/main/resources/help/de/Contents.json
@@ -71,6 +71,7 @@
{ "src": "HelpfulHints/Search.htm", "name": "Suchen und Ersetzen" },
{ "src": "HelpfulHints/SpellChecking.htm", "name": "Rechtschreibprüfung" },
{ "src": "UsageInstructions/MathAutoCorrect.htm", "name": "AutoKorrekturfunktionen" },
+ {"src": "HelpfulHints/Password.htm", "name": "Dokumente mit einem Kennwort schützen"},
{ "src": "HelpfulHints/About.htm", "name": "Über den Dokumenteneditor", "headername": "Nützliche Hinweise" },
{ "src": "HelpfulHints/SupportedFormats.htm", "name": "Unterstützte Formate von elektronischen Dokumenten" },
{ "src": "HelpfulHints/KeyboardShortcuts.htm", "name": "Tastaturkürzel" }
diff --git a/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm b/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm
index de520b18c..1bebb562b 100644
--- a/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm
+++ b/apps/documenteditor/main/resources/help/de/HelpfulHints/About.htm
@@ -15,8 +15,8 @@
Über den Dokumenteneditor
Der Dokumenteneditor ist eine Online-Anwendung, mit der Sie Ihre Dokumente direkt in Ihrem Browser betrachten und bearbeiten können.
- Mit dem Dokumenteneditor können Sie Editiervorgänge durchführen, wie bei einem beliebigen Desktopeditor, editierte Dokumente unter Beibehaltung aller Formatierungsdetails drucken oder sie auf der Festplatte Ihres Rechners als DOCX-, PDF-, TXT-, ODT-, DOXT, PDF/A, OTF, RTF-, HTML-, FB2, EPUB-Dateien speichern.
- Wenn Sie in der Online-Version mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, klicken Sie auf das Symbol
in der linken Seitenleiste. Wenn Sie in der Desktop-Version mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, wählen Sie das Menü Über in der linken Seitenleiste des Hauptfensters.
+ Mit dem Dokumenteneditor können Sie Editiervorgänge durchführen, wie bei einem beliebigen Desktopeditor, editierte Dokumente unter Beibehaltung aller Formatierungsdetails drucken oder sie auf der Festplatte Ihres Rechners als DOCX-, PDF-, TXT-, ODT-, DOXT, PDF/A, OTF, RTF-, HTML-, FB2, oder HTML-Dateien speichern.
+ Wenn Sie in der Online-Version mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, klicken Sie auf das Symbol
in der linken Seitenleiste. Wenn Sie in der Desktop-Version für Windows mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, wählen Sie das Menü Über in der linken Seitenleiste des Hauptfensters. Öffnen Sie in der Desktop-Version für Mac OS das Menü ONLYOFFICE oben auf dem Bildschirm und wählen Sie den Menüpunkt Über ONLYOFFICE.