Skip to content

Commit

Permalink
Merge branch 'feature/docs-cloud-banner' into develop-test
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
aleksandrfedorov97 committed Mar 26, 2024
2 parents fd60ee2 + 47ae3b1 commit 6dcdeaf
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- document server v6.4 and earlier is no longer supported
- setting authorization header on settings page
- filling pdf
- docs cloud banner on settings page

## Changed
- Alfresco v6.* and earlier is no longer supported
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ onlyoffice.server.common.error.mixed-content=Mixed Active Content is not allowed

onlyoffice.service.convert.check.error-prefix=Error when trying to check ConvertService ($).
onlyoffice.service.command.check.error-prefix=Error when trying to check CommandService ($).

onlyoffice-config.banner.title=ONLYOFFICE Docs Cloud
onlyoffice-config.banner.message=Easily launch the editors in the cloud without downloading and installation
onlyoffice-config.banner.button=Get Now
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ onlyoffice.server.common.error.mixed-content=Mixed Active Content ist nicht m\u0

onlyoffice.service.convert.check.error-prefix=Fehler beim Versuch, ConvertService zu überprüfen ($).
onlyoffice.service.command.check.error-prefix=Fehler beim Versuch, CommandService zu überprüfen ($).

onlyoffice-config.banner.title=ONLYOFFICE Docs Cloud
onlyoffice-config.banner.message=\u00d6ffnen Sie die Editoren in der Cloud einfach ohne Herunterladen und Installation
onlyoffice-config.banner.button=Jetzt erhalten
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ onlyoffice.server.common.error.mixed-content=Contenido Mixto Activo no est\u00E1

onlyoffice.service.convert.check.error-prefix= ($).
onlyoffice.service.command.check.error-prefix= ($).

onlyoffice-config.banner.title=ONLYOFFICE Docs Cloud
onlyoffice-config.banner.message=Inicie f\u00e1cilmente los editores en la nube sin tener que descargarlos ni instalarlos
onlyoffice-config.banner.button=Obtener ahora
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@ onlyoffice.server.common.error.mixed-content=Le contenu mixte actif n\u2019est p
onlyoffice.service.convert.check.error-prefix=Erreur lors de la vérification de ConvertService ($).
onlyoffice.service.command.check.error-prefix=Erreur lors de la vérification de CommandService ($).
onlyoffice-config.banner.title=ONLYOFFICE Docs Cloud
onlyoffice-config.banner.message=Lancez facilement les \u00e9diteurs dans le cloud sans t\u00e9l\u00e9chargement ni installation
onlyoffice-config.banner.button=Obtenir maintenant
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ onlyoffice.server.common.error.mixed-content=Il contenuto attivo misto non \u00E

onlyoffice.service.convert.check.error-prefix=
onlyoffice.service.command.check.error-prefix=Errore durante il tentativo di controllare CommandService ($).

onlyoffice-config.banner.title=ONLYOFFICE Docs nel Cloud
onlyoffice-config.banner.message=Avvia facilmente gli editor nel cloud senza scaricarli e installarli
onlyoffice-config.banner.button=Ottieni ora
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ onlyoffice.server.common.error.mixed-content=

onlyoffice.service.convert.check.error-prefix=
onlyoffice.service.command.check.error-prefix=

onlyoffice-config.banner.title=ONLYOFFICE Docs Cloud
onlyoffice-config.banner.message=Inicie facilmente os editores na nuvem sem download e instala\u00e7\u00e3o
onlyoffice-config.banner.button=Obter agora
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ onlyoffice.server.common.error.mixed-content=\u0421\u043C\u0435\u0448\u0430\u043

onlyoffice.service.convert.check.error-prefix=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 ConvertService ($).
onlyoffice.service.command.check.error-prefix=\u041e\u0448\u0438\u0431\u043a\u0430\u0020\u0432\u043e\u0020\u0432\u0440\u0435\u043c\u044f\u0020\u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438\u0020\u0043\u006f\u006d\u006d\u0061\u006e\u0064\u0053\u0065\u0072\u0076\u0069\u0063\u0065\u0020\u0028\u0024\u0029\u002e

onlyoffice-config.banner.title=ONLYOFFICE Docs Cloud
onlyoffice-config.banner.message=\u041b\u0435\u0433\u043a\u043e \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0439\u0442\u0435 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u044b \u0432 \u043e\u0431\u043b\u0430\u043a\u0435 \u0431\u0435\u0437 \u0441\u043a\u0430\u0447\u0438\u0432\u0430\u043d\u0438\u044f \u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438
onlyoffice-config.banner.button=\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0441\u0435\u0439\u0447\u0430\u0441
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ onlyoffice.server.common.error.mixed-content=
onlyoffice.service.convert.check.error-prefix=
onlyoffice.service.command.check.error-prefix=
onlyoffice-config.banner.title=ONLYOFFICE Docs Cloud
onlyoffice-config.banner.message=\u041b\u0435\u0433\u043a\u043e \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0439\u0442\u0435 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u0438 \u0443 \u0445\u043c\u0430\u0440\u0456 \u0431\u0435\u0437 \u0437\u0432\u0430\u043d\u0442\u0430\u0436\u0435\u043d\u044c \u0442\u0430 \u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u044c
onlyoffice-config.banner.button=\u041e\u0442\u0440\u0438\u043c\u0430\u0442\u0438 \u0437\u0430\u0440\u0430\u0437

0 comments on commit 6dcdeaf

Please sign in to comment.