Merge pull request #852 from ONLYOFFICE/fix/bugfix

Fix/bugfix

apps/common/main/resources/less/table-styler.less

@@ -1,4 +1,6 @@
 .table-styler {
+    background-color: @canvas-content-background;
+
     table {
         &.transparent {
             background-color: @canvas-content-background !important;

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -139,7 +139,9 @@ define([
                         'Days': this.txtDays,
                         'Months': this.txtMonths,
                         'Quarters': this.txtQuarters,
-                        'Years': this.txtYears
+                        'Years': this.txtYears,
+                        '%1 or %2': this.txtOr,
+                        'Qtr': this.txtQuarter
                     };
 
                 styleNames.forEach(function(item){
@@ -2837,7 +2839,9 @@ define([
             txtYears: 'Years',
             errorPivotGroup: 'Cannot group that selection.',
             errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.<br>Select a single range and try again.',
-            errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.<br>Use the \'Refresh\' button to update the report.'
+            errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.<br>Use the \'Refresh\' button to update the report.',
+            txtQuarter: 'Qtr',
+            txtOr: '%1 or %2'
         }
     })(), SSE.Controllers.Main || {}))
 });

apps/spreadsheeteditor/main/locale/en.json

@@ -704,6 +704,8 @@
   "SSE.Controllers.Main.txtPreparedBy": "Prepared by",
   "SSE.Controllers.Main.txtPrintArea": "Print_Area",
   "SSE.Controllers.Main.txtQuarters": "Quarters",
+  "SSE.Controllers.Main.txtQuarter": "Qtr",
+  "SSE.Controllers.Main.txtOr": "%1 or %2",
   "SSE.Controllers.Main.txtRectangles": "Rectangles",
   "SSE.Controllers.Main.txtRow": "Row",
   "SSE.Controllers.Main.txtRowLbls": "Row Labels",

apps/spreadsheeteditor/main/locale/ru.json

@@ -691,7 +691,9 @@
   "SSE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки",
   "SSE.Controllers.Main.txtFile": "Файл",
   "SSE.Controllers.Main.txtGrandTotal": "Общий итог",
-  "SSE.Controllers.Main.txtGroup": "Сгруппировать",
+  "SSE.Controllers.Main.txtGroup": "Группа",
+  "SSE.Controllers.Main.txtQuarter": "Кв-л",
+  "SSE.Controllers.Main.txtOr": "%1 или %2",
   "SSE.Controllers.Main.txtHours": "Часы",
   "SSE.Controllers.Main.txtLines": "Линии",
   "SSE.Controllers.Main.txtMath": "Математические знаки",