Skip to content

Commit

Permalink
Merge pull request 'fix/bugfix' (#66) from fix/bugfix into release/v8…
Browse files Browse the repository at this point in the history
….2.0
  • Loading branch information
Julia Radzhabova committed Oct 7, 2024
2 parents b22a213 + 21b9e08 commit 9f0c6d5
Show file tree
Hide file tree
Showing 45 changed files with 200 additions and 91 deletions.
8 changes: 4 additions & 4 deletions apps/common/main/resources/less/colors-table-gray.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
--toolbar-header-presentation: #f7f7f7;
--toolbar-header-pdf: #f7f7f7;

--text-toolbar-header-on-background-document: #38567A;
--text-toolbar-header-on-background-spreadsheet: #336B49;
--text-toolbar-header-on-background-presentation: #854535;
--text-toolbar-header-on-background-pdf: #8D4444;
--text-toolbar-header-on-background-document: #FFFFFF;
--text-toolbar-header-on-background-spreadsheet: #FFFFFF;
--text-toolbar-header-on-background-presentation: #FFFFFF;
--text-toolbar-header-on-background-pdf: #FFFFFF;

--background-normal: #fff;
--background-toolbar: #f7f7f7;
Expand Down
13 changes: 10 additions & 3 deletions apps/common/main/resources/less/comments.less
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,11 @@
.btn-edit,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto {
width: 16px;
height: 16px;
margin: 0 0 0 5px;
margin: 1px 0 0 5px;
background-color: transparent;

.rtl & {
margin: 0 5px 0 0;
margin: 1px 5px 0 0;
}
}

Expand Down Expand Up @@ -432,7 +432,14 @@
}

.btn-resolve.comment-resolved, .icon-resolve.i-comment-resolved {
background-position: 0px -64px;
background-position: 0px -63px;
width: 17px;
height: 18px;
margin: 0 0 0 4px;

.rtl & {
margin: 0px 4px 0 0;
}
}

.btn-resolve:not(.comment-resolved), .btn-accept{
Expand Down
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "بدء وضع التحرير...",
"uploadImageTextText": "جار رفع الصورة...",
"uploadImageTitleText": "رفع الصورة...",
"waitText": "الرجاء الانتظار..."
"waitText": "الرجاء الانتظار...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "خطأ",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "موافق",
"textRenameFile": "إعادة تسمية الملف",
"textSwitchedMobileView": "تم التبديل إلى عرض المحمول",
"textSwitchedStandardView": "تم التبديل إلى العرض القياسي"
"textSwitchedStandardView": "تم التبديل إلى العرض القياسي",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/az.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"uploadImageTextText": "Təsvir yüklənir...",
"uploadImageTitleText": "Təsvir Yüklənir",
"waitText": "Lütfən, gözləyin...",
"confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost)."
"confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Xəta",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textEnterNewFileName": "Enter a new file name",
"textRenameFile": "Rename File",
"textSwitchedMobileView": "Switched to Mobile view",
"textSwitchedStandardView": "Switched to Standard view"
"textSwitchedStandardView": "Switched to Standard view",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Актывацыя рэжыму рэдагавання…",
"uploadImageTextText": "Запампоўванне выявы…",
"uploadImageTitleText": "Запампоўванне выявы",
"waitText": "Калі ласка, пачакайце..."
"waitText": "Калі ласка, пачакайце...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Памылка",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textEnterNewFileName": "Enter a new file name",
"textRenameFile": "Rename File",
"textSwitchedMobileView": "Switched to Mobile view",
"textSwitchedStandardView": "Switched to Standard view"
"textSwitchedStandardView": "Switched to Standard view",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Set editing mode...",
"uploadImageTextText": "Uploading image...",
"uploadImageTitleText": "Uploading Image",
"waitText": "Please, wait..."
"waitText": "Please, wait...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Error",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "OK",
"textRenameFile": "Rename File",
"textSwitchedMobileView": "Switched to Mobile view",
"textSwitchedStandardView": "Switched to Standard view"
"textSwitchedStandardView": "Switched to Standard view",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Establir el mode d'edició ...",
"uploadImageTextText": "S'està carregant la imatge...",
"uploadImageTitleText": "S'està carregant la imatge",
"waitText": "Espera..."
"waitText": "Espera...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Error",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "D'acord",
"textRenameFile": "Canvia el nom del fitxer",
"textSwitchedMobileView": "S'ha canviat a visualització mòbil",
"textSwitchedStandardView": "S'ha canviat a visualització estàndard"
"textSwitchedStandardView": "S'ha canviat a visualització estàndard",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Nastavit režim úprav…",
"uploadImageTextText": "Nahrávání obrázku...",
"uploadImageTitleText": "Nahrávání obrázku",
"waitText": "Čekejte prosím..."
"waitText": "Čekejte prosím...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Chyba",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "OK",
"textRenameFile": "Přejmenovat soubor",
"textSwitchedMobileView": "Přepnout na mobilní zobrazení",
"textSwitchedStandardView": "Přepnout na standartní zobrazení"
"textSwitchedStandardView": "Přepnout na standartní zobrazení",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Set editing mode...",
"uploadImageTextText": "Uploading image...",
"uploadImageTitleText": "Uploading Image",
"waitText": "Please, wait..."
"waitText": "Please, wait...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Error",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "OK",
"textRenameFile": "Rename File",
"textSwitchedMobileView": "Switched to Mobile view",
"textSwitchedStandardView": "Switched to Standard view"
"textSwitchedStandardView": "Switched to Standard view",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Bearbeitungsmodul wird festgelegt...",
"uploadImageTextText": "Bild wird hochgeladen...",
"uploadImageTitleText": "Bild wird hochgeladen",
"waitText": "Bitte warten..."
"waitText": "Bitte warten...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Fehler",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "OK",
"textRenameFile": "Datei umbenennen",
"textSwitchedMobileView": "Mobile Ansicht aktiviert",
"textSwitchedStandardView": "Standard-Ansicht aktiviert"
"textSwitchedStandardView": "Standard-Ansicht aktiviert",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Ορισμός κατάστασης επεξεργασίας...",
"uploadImageTextText": "Μεταφόρτωση εικόνας...",
"uploadImageTitleText": "Μεταφόρτωση Εικόνας",
"waitText": "Παρακαλούμε, περιμένετε..."
"waitText": "Παρακαλούμε, περιμένετε...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Σφάλμα",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "Εντάξει",
"textRenameFile": "Μετονομασία αρχείου",
"textSwitchedMobileView": "Μετάβαση σε προβολή κινητού",
"textSwitchedStandardView": "Εναλλαγή σε τυπική προβολή"
"textSwitchedStandardView": "Εναλλαγή σε τυπική προβολή",
"btnSend": "Send"
}
}
3 changes: 2 additions & 1 deletion apps/documenteditor/mobile/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Set editing mode...",
"uploadImageTextText": "Uploading image...",
"uploadImageTitleText": "Uploading Image",
"waitText": "Please, wait..."
"waitText": "Please, wait...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Error",
Expand Down
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Establecer el modo de edición...",
"uploadImageTextText": "Cargando imagen...",
"uploadImageTitleText": "Cargando imagen",
"waitText": "Por favor, espere..."
"waitText": "Por favor, espere...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Error",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "Aceptar",
"textRenameFile": "Renombrar archivo",
"textSwitchedMobileView": "Cambiado a vista móvil",
"textSwitchedStandardView": "Cambiado a vista estándar"
"textSwitchedStandardView": "Cambiado a vista estándar",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/eu.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Ezarri edizio modua...",
"uploadImageTextText": "Irudia kargatzen...",
"uploadImageTitleText": "Irudia kargatzen",
"waitText": "Mesedez, itxaron..."
"waitText": "Mesedez, itxaron...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Errorea",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "Ados",
"textRenameFile": "Berrizendatu fitxategia",
"textSwitchedMobileView": "Mugikorreko ikuspegira aldatu da",
"textSwitchedStandardView": "Ikuspegi estandarrera aldatu da"
"textSwitchedStandardView": "Ikuspegi estandarrera aldatu da",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,8 @@
"waitText": "Please, wait...",
"confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
"textUndo": "Undo",
"textContinue": "Continue"
"textContinue": "Continue",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Error",
Expand Down Expand Up @@ -841,6 +842,7 @@
"textSwitchedStandardView": "Switched to Standard view",
"textRenameFile": "Rename File",
"textEnterNewFileName": "Enter a new file name",
"textCloseHistory": "Close History"
"textCloseHistory": "Close History",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Réglage mode d'édition...",
"uploadImageTextText": "Chargement d'une image en cours...",
"uploadImageTitleText": "Chargement d'une image",
"waitText": "Veuillez patienter..."
"waitText": "Veuillez patienter...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Erreur",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "OK",
"textRenameFile": "Renommer le fichier",
"textSwitchedMobileView": "Passé à l'affichage mobile",
"textSwitchedStandardView": "Passé à l'affichage standard"
"textSwitchedStandardView": "Passé à l'affichage standard",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/gl.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"uploadImageTitleText": "Cargando imaxe",
"waitText": "Agarde...",
"confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
"textContinue": "Continue"
"textContinue": "Continue",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Erro",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textEnterNewFileName": "Enter a new file name",
"textRenameFile": "Rename File",
"textSwitchedMobileView": "Switched to Mobile view",
"textSwitchedStandardView": "Switched to Standard view"
"textSwitchedStandardView": "Switched to Standard view",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "הגדרת מצב עריכה...",
"uploadImageTextText": "העלאת תמונה...",
"uploadImageTitleText": "העלאת תמונה",
"waitText": "נא להמתין ..."
"waitText": "נא להמתין ...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "שגיאה",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "בסדר",
"textRenameFile": "שינוי שם קובץ",
"textSwitchedMobileView": "החלפה לתצוגה ניידת",
"textSwitchedStandardView": "החלפה לתצוגה רגילה"
"textSwitchedStandardView": "החלפה לתצוגה רגילה",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Szerkesztési mód beállítása...",
"uploadImageTextText": "Kép feltöltése...",
"uploadImageTitleText": "Kép feltöltése",
"waitText": "Kérjük, várjon..."
"waitText": "Kérjük, várjon...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Hiba",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "OK",
"textRenameFile": "Fájl Átnevezése",
"textSwitchedMobileView": "Váltás Mobil nézetre",
"textSwitchedStandardView": "Normál nézetre váltott"
"textSwitchedStandardView": "Normál nézetre váltott",
"btnSend": "Send"
}
}
6 changes: 4 additions & 2 deletions apps/documenteditor/mobile/locale/hy.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"txtEditingMode": "Սահմանել ցուցակի խմբագրում․․․",
"uploadImageTextText": "Նկարի վերբեռնում...",
"uploadImageTitleText": "Նկարի վերբեռնում",
"waitText": "Խնդրում ենք սպասել..."
"waitText": "Խնդրում ենք սպասել...",
"savingText": "Saving"
},
"Main": {
"criticalErrorTitle": "Սխալ",
Expand Down Expand Up @@ -810,6 +811,7 @@
"textOk": "Լավ",
"textRenameFile": "Վերանվանել ֆայլը",
"textSwitchedMobileView": " Փոխարկվել է բջջային տեսքի",
"textSwitchedStandardView": " Փոխարկվել է ստանդարտ տեսքի"
"textSwitchedStandardView": " Փոխարկվել է ստանդարտ տեսքի",
"btnSend": "Send"
}
}
Loading

0 comments on commit 9f0c6d5

Please sign in to comment.