diff --git a/CHANGELOG.md b/CHANGELOG.md index 8413fdd6..71da3ce6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 7.3.2 +## Changed +- Nextcloud v20 is no longer supported +- fixed link in mention notifications +- title for new file +- fix editing after desktop sync + ## 7.3.0 ## Added - support docxf and oform formats diff --git a/appinfo/application.php b/appinfo/application.php index 8088c0f7..c5c1ec89 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -1,7 +1,7 @@ getAllMappings(); $detector->registerType("docxf", "application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf"); $detector->registerType("oform", "application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform"); + + Hooks::connectHooks(); } public function boot(IBootContext $context): void { @@ -254,7 +256,7 @@ function (FileCreatedFromTemplateEvent $event) { && $this->appConfig->isUserAllowedToUse()) { $templateManager->registerTemplateFileCreator(function () use ($appName, $trans) { - $wordTemplate = new TemplateFileCreator($appName, $trans->t("Document"), ".docx"); + $wordTemplate = new TemplateFileCreator($appName, $trans->t("New document"), ".docx"); $wordTemplate->addMimetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); $wordTemplate->setIconClass("icon-onlyoffice-new-docx"); $wordTemplate->setRatio(21/29.7); @@ -262,7 +264,7 @@ function (FileCreatedFromTemplateEvent $event) { }); $templateManager->registerTemplateFileCreator(function () use ($appName, $trans) { - $cellTemplate = new TemplateFileCreator($appName, $trans->t("Spreadsheet"), ".xlsx"); + $cellTemplate = new TemplateFileCreator($appName, $trans->t("New spreadsheet"), ".xlsx"); $cellTemplate->addMimetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); $cellTemplate->setIconClass("icon-onlyoffice-new-xlsx"); $cellTemplate->setRatio(21/29.7); @@ -270,7 +272,7 @@ function (FileCreatedFromTemplateEvent $event) { }); $templateManager->registerTemplateFileCreator(function () use ($appName, $trans) { - $slideTemplate = new TemplateFileCreator($appName, $trans->t("Presentation"), ".pptx"); + $slideTemplate = new TemplateFileCreator($appName, $trans->t("New presentation"), ".pptx"); $slideTemplate->addMimetype("application/vnd.openxmlformats-officedocument.presentationml.presentation"); $slideTemplate->setIconClass("icon-onlyoffice-new-pptx"); $slideTemplate->setRatio(16/9); @@ -279,7 +281,5 @@ function (FileCreatedFromTemplateEvent $event) { } }); } - - Hooks::connectHooks(); } } \ No newline at end of file diff --git a/appinfo/info.xml b/appinfo/info.xml index 95534f21..469e879c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,7 +6,7 @@ ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage. apache Ascensio System SIA - 7.3.0 + 7.3.2 Onlyoffice @@ -29,7 +29,7 @@ https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/new.png https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png - + OCA\Onlyoffice\AdminSettings diff --git a/appinfo/routes.php b/appinfo/routes.php index 5a8030ba..958be888 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -1,7 +1,7 @@ getContent(), $file->getName(), $file->getMimeType()); + $response = new StreamResponse($file->fopen('rb')); + $response->addHeader('Content-Disposition', 'attachment; filename="' . rawurldecode($file->getName()) . '"'); + $response->addHeader('Content-Type', $file->getMimeType()); + return $response; } catch (NotPermittedException $e) { $this->logger->logException($e, ["message" => "Download Not permitted: $fileId ($version)", "app" => $this->appName]); return new JSONResponse(["message" => $this->trans->t("Not permitted")], Http::STATUS_FORBIDDEN); diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php index 21378c71..7ed5323d 100644 --- a/controller/editorapicontroller.php +++ b/controller/editorapicontroller.php @@ -1,7 +1,7 @@ $format["type"], "editorConfig" => [ - "lang" => str_replace("_", "-", \OC::$server->getL10NFactory("")->get("")->getLanguageCode()), - "region" => str_replace("_", "-", \OC::$server->getL10NFactory("")->findLocale()) + "lang" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("onlyoffice")->getLanguageCode()), + "region" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("onlyoffice")->getLocaleCode()) ] ]; @@ -396,13 +396,13 @@ public function config($fileId, $filePath = null, $shareToken = null, $directTok switch ($params["documentType"]) { case "word": - $createName = $this->trans->t("Document") . ".docx"; + $createName = $this->trans->t("New document") . ".docx"; break; case "cell": - $createName = $this->trans->t("Spreadsheet") . ".xlsx"; + $createName = $this->trans->t("New spreadsheet") . ".xlsx"; break; case "slide": - $createName = $this->trans->t("Presentation") . ".pptx"; + $createName = $this->trans->t("New presentation") . ".pptx"; break; } @@ -814,4 +814,4 @@ private function isFavorite($fileId, $userId = null) { return false; } -} \ No newline at end of file +} diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index d85e0251..cf73f36f 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -1,7 +1,7 @@ getUrl($targetFile, $user, $shareToken); $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION)); + $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get($this->appName)->getLocaleCode()); $documentService = new DocumentService($this->trans, $this->config); try { - $newFileUri = $documentService->GetConvertedUri($fileUrl, $targetExt, $ext, $targetKey); + $newFileUri = $documentService->GetConvertedUri($fileUrl, $targetExt, $ext, $targetKey, $region); } catch (\Exception $e) { $this->logger->logException($e, ["message" => "GetConvertedUri: " . $targetFile->getId(), "app" => $this->appName]); return ["error" => $e->getMessage()]; @@ -591,8 +592,9 @@ public function convert($fileId, $shareToken = null) { $documentService = new DocumentService($this->trans, $this->config); $key = $this->fileUtility->getKey($file); $fileUrl = $this->getUrl($file, $user, $shareToken); + $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get($this->appName)->getLocaleCode()); try { - $newFileUri = $documentService->GetConvertedUri($fileUrl, $ext, $internalExtension, $key); + $newFileUri = $documentService->GetConvertedUri($fileUrl, $ext, $internalExtension, $key, $region); } catch (\Exception $e) { $this->logger->logException($e, ["message" => "GetConvertedUri: " . $file->getId(), "app" => $this->appName]); return ["error" => $e->getMessage()]; @@ -691,16 +693,15 @@ public function save($name, $dir, $url) { * Get versions history for file * * @param integer $fileId - file identifier - * @param string $shareToken - access token * * @return array * * @NoAdminRequired */ - public function history($fileId, $shareToken = null) { + public function history($fileId) { $this->logger->debug("Request history for: $fileId", ["app" => $this->appName]); - if (empty($shareToken) && !$this->config->isUserAllowedToUse()) { + if (!$this->config->isUserAllowedToUse()) { return ["error" => $this->trans->t("Not permitted")]; } @@ -712,7 +713,7 @@ public function history($fileId, $shareToken = null) { $userId = $user->getUID(); } - list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken); + list ($file, $error, $share) = $this->getFile($userId, $fileId); if (isset($error)) { $this->logger->error("History: $fileId $error", ["app" => $this->appName]); @@ -811,16 +812,15 @@ public function history($fileId, $shareToken = null) { * * @param integer $fileId - file identifier * @param integer $version - file version - * @param string $shareToken - access token * * @return array * * @NoAdminRequired */ - public function version($fileId, $version, $shareToken = null) { + public function version($fileId, $version) { $this->logger->debug("Request version for: $fileId ($version)", ["app" => $this->appName]); - if (empty($shareToken) && !$this->config->isUserAllowedToUse()) { + if (!$this->config->isUserAllowedToUse()) { return ["error" => $this->trans->t("Not permitted")]; } @@ -832,7 +832,7 @@ public function version($fileId, $version, $shareToken = null) { $userId = $user->getUID(); } - list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken); + list ($file, $error, $share) = $this->getFile($userId, $fileId); if (isset($error)) { $this->logger->error("History: $fileId $error", ["app" => $this->appName]); @@ -861,14 +861,14 @@ public function version($fileId, $version, $shareToken = null) { $key = $this->fileUtility->getKey($file, true); $versionId = $file->getFileInfo()->getMtime(); - $fileUrl = $this->getUrl($file, $user, $shareToken); + $fileUrl = $this->getUrl($file, $user); } else { $fileVersion = array_values($versions)[$version - 1]; $key = $this->fileUtility->getVersionKey($fileVersion); $versionId = $fileVersion->getRevisionId(); - $fileUrl = $this->getUrl($file, $user, $shareToken, $version); + $fileUrl = $this->getUrl($file, $user, null, $version); } $key = DocumentService::GenerateRevisionId($key); @@ -882,14 +882,14 @@ public function version($fileId, $version, $shareToken = null) { && count($versions) >= $version - 1 && FileVersions::hasChanges($ownerId, $fileId, $versionId)) { - $changesUrl = $this->getUrl($file, $user, $shareToken, $version, true); + $changesUrl = $this->getUrl($file, $user, null, $version, true); $result["changesUrl"] = $changesUrl; $prevVersion = array_values($versions)[$version - 2]; $prevVersionKey = $this->fileUtility->getVersionKey($prevVersion); $prevVersionKey = DocumentService::GenerateRevisionId($prevVersionKey); - $prevVersionUrl = $this->getUrl($file, $user, $shareToken, $version - 1); + $prevVersionUrl = $this->getUrl($file, $user, null, $version - 1); $result["previous"] = [ "key" => $prevVersionKey, @@ -910,17 +910,15 @@ public function version($fileId, $version, $shareToken = null) { * * @param integer $fileId - file identifier * @param integer $version - file version - * @param string $shareToken - access token * * @return array * * @NoAdminRequired - * @PublicPage */ - public function restore($fileId, $version, $shareToken = null) { + public function restore($fileId, $version) { $this->logger->debug("Request restore version for: $fileId ($version)", ["app" => $this->appName]); - if (empty($shareToken) && !$this->config->isUserAllowedToUse()) { + if (!$this->config->isUserAllowedToUse()) { return ["error" => $this->trans->t("Not permitted")]; } @@ -932,7 +930,7 @@ public function restore($fileId, $version, $shareToken = null) { $userId = $user->getUID(); } - list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken); + list ($file, $error, $share) = $this->getFile($userId, $fileId); if (isset($error)) { $this->logger->error("Restore: $fileId $error", ["app" => $this->appName]); @@ -957,7 +955,7 @@ public function restore($fileId, $version, $shareToken = null) { } } - return $this->history($fileId, $shareToken); + return $this->history($fileId); } /** diff --git a/controller/federationcontroller.php b/controller/federationcontroller.php index ed05b41b..8d68dafc 100644 --- a/controller/federationcontroller.php +++ b/controller/federationcontroller.php @@ -1,7 +1,7 @@ =2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/bg.json b/l10n/bg.json index 74e3b815..8466fa42 100644 --- a/l10n/bg.json +++ b/l10n/bg.json @@ -22,9 +22,9 @@ "File created" : "Файлът е създаден", "Open in ONLYOFFICE" : "Отвори в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертирай с ONLYOFFICE", - "Document" : "Документ", - "Spreadsheet" : "Електронна таблица", - "Presentation" : "Презентация", + "New document" : "Нов документ", + "New spreadsheet" : "Нова електронна таблица", + "New presentation" : "Нова презентация", "Error when trying to connect" : "Грешка при опит за свързване", "Settings have been successfully updated" : "Настройките са успешно обновени", "Server can't read xml" : "Невъзможно прочитане на xml файла на сървъра", @@ -108,12 +108,12 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s, споменат във %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier}, споменат във {file}: \"%1$s\".", "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}", - "Form template": "Шаблон на формуляр", + "New form template": "Нов шаблон на формуляр", "Blank": "Празно", "From text document": "От текстов документ", "Create new Form template": "Създайте нов шаблон на формуляр", "Create form": "Създайте формуляр", "Fill in form in ONLYOFFICE": "Попълнете формуляр в ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Молим да актуализирате ONLYOFFICE Docs към версия 7.0, за да работи с онлайн формуляри за попълване" -},"pluralForm": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +},"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/de.js b/l10n/de.js index 66dfe98b..98aa873c 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de.json b/l10n/de.json index 9cbcf6d8..d1285a84 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -22,9 +22,9 @@ "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -108,7 +108,7 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index fd9b0702..e3e68ee6 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index eb36d008..a22b9cc6 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -22,9 +22,9 @@ "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -108,7 +108,7 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/es.js b/l10n/es.js index 0dacb5bb..d983027f 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Archivo creado", "Open in ONLYOFFICE" : "Abrir en ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Hoja de cálculo", - "Presentation" : "Presentación", + "New document" : "Nuevo documento", + "New spreadsheet" : "Nueva hoja de cálculo", + "New presentation" : "Nueva presentación", "Error when trying to connect" : "Error al intentar establecer la conexión", "Settings have been successfully updated" : "Ajustes han sido actualizados con éxito", "Server can't read xml" : "Servidor no puede leer xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha mencionado en %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha mencionado en {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}", - "Form template": "Plantilla de formulario", + "New form template": "Nueva plantilla de formulario", "Blank": "En blanco", "From text document": "Desde documento de texto", "Create new Form template": "Crear nueva plantilla de formulario", diff --git a/l10n/es.json b/l10n/es.json index 8541b386..04ae274b 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -22,9 +22,9 @@ "File created" : "Archivo creado", "Open in ONLYOFFICE" : "Abrir en ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Hoja de cálculo", - "Presentation" : "Presentación", + "New document" : "Nuevo documento", + "New spreadsheet" : "Nueva hoja de cálculo", + "New presentation" : "Nueva presentación", "Error when trying to connect" : "Error al intentar establecer la conexión", "Settings have been successfully updated" : "Ajustes han sido actualizados con éxito", "Server can't read xml" : "Servidor no puede leer xml", @@ -108,7 +108,7 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha mencionado en %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha mencionado en {file}: \"%1$s\".", "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}", - "Form template": "Plantilla de formulario", + "New form template": "Nueva plantilla de formulario", "Blank": "En blanco", "From text document": "Desde documento de texto", "Create new Form template": "Crear nueva plantilla de formulario", diff --git a/l10n/fr.js b/l10n/fr.js index ec034d15..3108e33a 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Fichier créé", "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", - "Document" : "Document", - "Spreadsheet" : "Feuille de calcul", - "Presentation" : "Présentation", + "New document" : "Nouveau document", + "New spreadsheet" : "Nouvelle feuille de calcul", + "New presentation" : "Nouvelle présentation", "Error when trying to connect" : "Erreur durant la tentative de connexion", "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", "Server can't read xml" : "Le serveur ne peut pas lire le XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s a mentionné dans %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} a mentionné dans {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}", - "Form template": "Modèle de formulaire", + "New form template": "Nouveau modèle de formulaire", "Blank": "Vide", "From text document": "À partir d'un fichier texte", "Create new Form template": "Créer un nouveau modèle de formulaire", @@ -118,4 +118,4 @@ OC.L10N.register( "Fill in form in ONLYOFFICE": "Remplir le formulaire dans ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Veuillez mettre à jour ONLYOFFICE Docs vers la version 7.0 pour travailler sur les formulaires à remplir en ligne" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=2; plural=(n > 1);"); diff --git a/l10n/fr.json b/l10n/fr.json index 78874369..d4a1293d 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -22,9 +22,9 @@ "File created" : "Fichier créé", "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", - "Document" : "Document", - "Spreadsheet" : "Feuille de calcul", - "Presentation" : "Présentation", + "New document" : "Nouveau document", + "New spreadsheet" : "Nouvelle feuille de calcul", + "New presentation" : "Nouvelle présentation", "Error when trying to connect" : "Erreur durant la tentative de connexion", "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", "Server can't read xml" : "Le serveur ne peut pas lire le XML", @@ -108,12 +108,12 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s a mentionné dans %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} a mentionné dans {file}: \"%1$s\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}", - "Form template": "Modèle de formulaire", + "New form template": "Nouveau modèle de formulaire", "Blank": "Vide", "From text document": "À partir d'un fichier texte", "Create new Form template": "Créer un nouveau modèle de formulaire", "Create form": "Créer un formulaire", "Fill in form in ONLYOFFICE": "Remplir le formulaire dans ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Veuillez mettre à jour ONLYOFFICE Docs vers la version 7.0 pour travailler sur les formulaires à remplir en ligne" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=2; plural=(n > 1);" } diff --git a/l10n/it.js b/l10n/it.js index bc0bb3de..34724e61 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "File creato", "Open in ONLYOFFICE" : "Apri in ONLYOFFICE", "Convert with ONLYOFFICE" : "Converti con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Foglio di calcolo", - "Presentation" : "Presentazione", + "New document" : "Nuovo documento", + "New spreadsheet" : "Nuovo foglio di calcolo", + "New presentation" : "Nuova presentazione", "Error when trying to connect" : "Errore durante il tentativo di connessione", "Settings have been successfully updated" : "Le impostazioni sono state aggiornate con successo", "Server can't read xml" : "Il server non può leggere xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha menzionato in %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha menzionato nel {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}", - "Form template": "Modello di modulo", + "New form template": "Nuovo modello di modulo", "Blank": "Vuoto", "From text document": "Dal documento di testo", "Create new Form template": "Creare un nuovo modello di modulo", diff --git a/l10n/it.json b/l10n/it.json index 0c23b26f..31f47e22 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -22,9 +22,9 @@ "File created" : "File creato", "Open in ONLYOFFICE" : "Apri in ONLYOFFICE", "Convert with ONLYOFFICE" : "Converti con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Foglio di calcolo", - "Presentation" : "Presentazione", + "New document" : "Nuovo documento", + "New spreadsheet" : "Nuovo foglio di calcolo", + "New presentation" : "Nuova presentazione", "Error when trying to connect" : "Errore durante il tentativo di connessione", "Settings have been successfully updated" : "Le impostazioni sono state aggiornate con successo", "Server can't read xml" : "Il server non può leggere xml", @@ -108,7 +108,7 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha menzionato in %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha menzionato nel {file}: \"%1$s\".", "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}", - "Form template": "Modello di modulo", + "New form template": "Nuovo modello di modulo", "Blank": "Vuoto", "From text document": "Dal documento di testo", "Create new Form template": "Creare un nuovo modello di modulo", diff --git a/l10n/ja.js b/l10n/ja.js index 4d842114..14349b1b 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "ファイル作成されました", "Open in ONLYOFFICE" : "ONLYOFFICEで開く", "Convert with ONLYOFFICE" : "ONLYOFFICEで変換", - "Document" : "ドキュメント", - "Spreadsheet" : "スプレッドシート", - "Presentation" : "プレゼンテーション", + "New document" : "新しいドキュメント", + "New spreadsheet" : "新しいスプレッドシート", + "New presentation" : "新しいプレゼンテーション", "Error when trying to connect" : "接続時にエラーが発生しました", "Settings have been successfully updated" : "設定が更新されました", "Server can't read xml" : "サーバーでxmlを読み込ませんでした", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s は %2\$s: \"%3\$s\"に記載されました。", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} は {file}: \"%1\$s\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください", - "Form template": "フォーム テンプレート", + "New form template": "新しいフォームテンプレート", "Blank": "空白", "From text document": "テキスト文書から作成する", "Create new Form template": "新しいフォームテンプレートの作成", @@ -118,4 +118,4 @@ OC.L10N.register( "Fill in form in ONLYOFFICE": "ONLYOFFICEでフォームを記入する", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "オンラインで入力可能なフォームを作成するには、ONLYOFFICE Docs 7.0版まで更新してください" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=1; plural=0;"); diff --git a/l10n/ja.json b/l10n/ja.json index d0248393..707a8b86 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -22,9 +22,9 @@ "File created" : "ファイル作成されました", "Open in ONLYOFFICE" : "ONLYOFFICEで開く", "Convert with ONLYOFFICE" : "ONLYOFFICEで変換", - "Document" : "ドキュメント", - "Spreadsheet" : "スプレッドシート", - "Presentation" : "プレゼンテーション", + "New document" : "新しいドキュメント", + "New spreadsheet" : "新しいスプレッドシート", + "New presentation" : "新しいプレゼンテーション", "Error when trying to connect" : "接続時にエラーが発生しました", "Settings have been successfully updated" : "設定が更新されました", "Server can't read xml" : "サーバーでxmlを読み込ませんでした", @@ -108,12 +108,12 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s は %2$s: \"%3$s\"に記載されました。", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} は {file}: \"%1$s\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください", - "Form template": "フォーム テンプレート", + "New form template": "新しいフォームテンプレート", "Blank": "空白", "From text document": "テキスト文書から作成する", "Create new Form template": "新しいフォームテンプレートの作成", "Create form": "フォームの作成", "Fill in form in ONLYOFFICE": "ONLYOFFICEでフォームを記入する", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "オンラインで入力可能なフォームを作成するには、ONLYOFFICE Docs 7.0版まで更新してください" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=1; plural=0;" } \ No newline at end of file diff --git a/l10n/pl.js b/l10n/pl.js index 4e4bf837..806ac5ed 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Plik utworzony", "Open in ONLYOFFICE" : "Otwórz w ONLYOFFICE", "Convert with ONLYOFFICE" : "Konwertuj", - "Document" : "Nowy dokument", - "Spreadsheet" : "Nowy skoroszyt", - "Presentation" : "Nowa prezentacja", + "New document" : "Nowy dokument", + "New spreadsheet" : "Nowy skoroszyt", + "New presentation" : "Nowa prezentacja", "Error when trying to connect" : "Błąd przy próbie połączenia", "Settings have been successfully updated" : "Ustawienia zaktualizowane pomyślnie", "Server can't read xml" : "Serwer nie może przeczytać xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s dodał(a) w %2\$s następujący komentarz: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1\$s\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}", - "Form template": "Szablon formularza", + "New form template": "Nowy szablon formularza", "Blank": "Pusty", "From text document": "Szablon formularza z pliku tekstowego", "Create new Form template": "Utwórz nowy szablon formularza", @@ -118,4 +118,4 @@ OC.L10N.register( "Fill in form in ONLYOFFICE": "Wypełnić formularz w ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Zaktualizuj ONLYOFFICE Docs do wersji 7.0, aby działały w formularzach do wypełniania online" }, -"nplurals=2; plural=(n != 1);"); \ No newline at end of file +"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); \ No newline at end of file diff --git a/l10n/pl.json b/l10n/pl.json index 8ae5c24b..5e534201 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -22,9 +22,9 @@ "File created" : "Plik utworzony", "Open in ONLYOFFICE" : "Otwórz w ONLYOFFICE", "Convert with ONLYOFFICE" : "Konwertuj", - "Document" : "Nowy dokument", - "Spreadsheet" : "Nowy skoroszyt", - "Presentation" : "Nowa prezentacja", + "New document" : "Nowy dokument", + "New spreadsheet" : "Nowy skoroszyt", + "New presentation" : "Nowa prezentacja", "Error when trying to connect" : "Błąd przy próbie połączenia", "Settings have been successfully updated" : "Ustawienia zaktualizowane pomyślnie", "Server can't read xml" : "Serwer nie może przeczytać xml", @@ -108,12 +108,12 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s dodał(a) w %2$s następujący komentarz: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1$s\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}", - "Form template": "Szablon formularza", + "New form template": "Nowy szablon formularza", "Blank": "Pusty", "From text document": "Szablon formularza z pliku tekstowego", "Create new Form template": "Utwórz nowy szablon formularza", "Create form": "Utwórz formularz", "Fill in form in ONLYOFFICE": "Wypełnić formularz w ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Zaktualizuj ONLYOFFICE Docs do wersji 7.0, aby działały w formularzach do wypełniania online" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" } \ No newline at end of file diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 143bc809..105ecf38 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Arquivo criado", "Open in ONLYOFFICE" : "Abrir no ONLYOFFICE", "Convert with ONLYOFFICE" : "Converta com ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Planilha", - "Presentation" : "Apresentação", + "New document" : "Novo documento", + "New spreadsheet" : "Nova planilha", + "New presentation" : "Nova apresentação", "Error when trying to connect" : "Erro ao tentar conectar", "Settings have been successfully updated" : "Configurações salvas com sucesso", "Server can't read xml" : "Servidor não pode ler xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s mencionado em %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} mencionado em {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}", - "Form template": "Modelo de formulário", + "New form template": "Novo modelo de formulário", "Blank": "Em branco", "From text document": "Do documento de texto", "Create new Form template": "Criar novo modelo de formulário", @@ -118,4 +118,4 @@ OC.L10N.register( "Fill in form in ONLYOFFICE": "Preencher formulário no ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Atualize o ONLYOFFICE Docs para a versão 7.0 para trabalhar em formulários preenchíveis online" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=2; plural=(n > 1);"); diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 5087e309..9e5efa52 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -22,9 +22,9 @@ "File created" : "Arquivo criado", "Open in ONLYOFFICE" : "Abrir no ONLYOFFICE", "Convert with ONLYOFFICE" : "Converta com ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Planilha", - "Presentation" : "Apresentação", + "New document" : "Novo documento", + "New spreadsheet" : "Nova planilha", + "New presentation" : "Nova apresentação", "Error when trying to connect" : "Erro ao tentar conectar", "Settings have been successfully updated" : "Configurações salvas com sucesso", "Server can't read xml" : "Servidor não pode ler xml", @@ -108,12 +108,12 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s mencionado em %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} mencionado em {file}: \"%1$s\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}", - "Form template": "Modelo de formulário", + "New form template": "Novo modelo de formulário", "Blank": "Em branco", "From text document": "Do documento de texto", "Create new Form template": "Criar novo modelo de formulário", "Create form": "Criar formulário", "Fill in form in ONLYOFFICE": "Preencher formulário no ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Atualize o ONLYOFFICE Docs para a versão 7.0 para trabalhar em formulários preenchíveis online" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=2; plural=(n > 1);" } diff --git a/l10n/ru.js b/l10n/ru.js index c67f9dc9..8c5a8c85 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Файл создан", "Open in ONLYOFFICE" : "Открыть в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертировать в ONLYOFFICE", - "Document" : "Документ", - "Spreadsheet" : "Электронная таблица", - "Presentation" : "Презентация", + "New document" : "Новый документ", + "New spreadsheet" : "Новая электронная таблица", + "New presentation" : "Новая презентация", "Error when trying to connect" : "При попытке соединения возникла ошибка", "Settings have been successfully updated" : "Настройки были успешно обновлены", "Server can't read xml" : "Невозможно прочитать xml файл на сервере", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s упомянул в %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упомянул в {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Выберите формат для {fileName}", - "Form template": "Шаблон формы", + "New form template": "Новый шаблон формы", "Blank": "Пустой", "From text document": "Из текстового документа", "Create new Form template": "Создать новый Шаблон формы", @@ -118,4 +118,4 @@ OC.L10N.register( "Fill in form in ONLYOFFICE": "Заполнить форму в ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн" }, -"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); +"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/l10n/ru.json b/l10n/ru.json index 718c593a..7478f0c3 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -22,9 +22,9 @@ "File created" : "Файл создан", "Open in ONLYOFFICE" : "Открыть в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертировать в ONLYOFFICE", - "Document" : "Документ", - "Spreadsheet" : "Электронная таблица", - "Presentation" : "Презентация", + "New document" : "Новый документ", + "New spreadsheet" : "Новая электронная таблица", + "New presentation" : "Новая презентация", "Error when trying to connect" : "При попытке соединения возникла ошибка", "Settings have been successfully updated" : "Настройки были успешно обновлены", "Server can't read xml" : "Невозможно прочитать xml файл на сервере", @@ -108,12 +108,12 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s упомянул в %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} упомянул в {file}: \"%1$s\".", "Choose a format to convert {fileName}": "Выберите формат для {fileName}", - "Form template": "Шаблон формы", + "New form template": "Новый шаблон формы", "Blank": "Пустой", "From text document": "Из текстового документа", "Create new Form template": "Создать новый Шаблон формы", "Create form": "Создать форму", "Fill in form in ONLYOFFICE": "Заполнить форму в ONLYOFFICE", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "Обновите сервер ONLYOFFICE Docs до версии 7.0 для работы с формами онлайн" -},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" } \ No newline at end of file diff --git a/l10n/sv.js b/l10n/sv.js index aa00b6da..02716e4f 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Filen skapad", "Open in ONLYOFFICE" : "Öppna i ONLYOFFICE", "Convert with ONLYOFFICE" : "Konvertera med ONLYOFFICE", - "Document" : "Dokument", - "Spreadsheet" : "Kalkylblad", - "Presentation" : "Presentation", + "New document" : "Nytt dokument", + "New spreadsheet" : "Nytt kalkylblad", + "New presentation" : "Ny presentation", "Error when trying to connect" : "Fel vid försök att ansluta", "Settings have been successfully updated" : "Inställningarna har uppdaterats", "Server can't read xml" : "Servern kan inte läsa XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s har nämnt i %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} har nämnt i {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.", - "Form template": "Formulärmall", + "New form template": "Ny formulärmall", "Blank": "Töm", "From text document": "Formulärmall från textfil", "Create new Form template": "Skapa ny formulärmall", diff --git a/l10n/sv.json b/l10n/sv.json index f78163f8..582b7c3d 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -22,9 +22,9 @@ "File created" : "Filen skapad", "Open in ONLYOFFICE" : "Öppna i ONLYOFFICE", "Convert with ONLYOFFICE" : "Konvertera med ONLYOFFICE", - "Document" : "Dokument", - "Spreadsheet" : "Kalkylblad", - "Presentation" : "Presentation", + "New document" : "Nytt dokument", + "New spreadsheet" : "Nytt kalkylblad", + "New presentation" : "Ny presentation", "Error when trying to connect" : "Fel vid försök att ansluta", "Settings have been successfully updated" : "Inställningarna har uppdaterats", "Server can't read xml" : "Servern kan inte läsa XML", @@ -108,7 +108,7 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s har nämnt i %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} har nämnt i {file}: \"%1$s\".", "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.", - "Form template": "Formulärmall", + "New form template": "Ny formulärmall", "Blank": "Töm", "From text document": "Formulärmall från textfil", "Create new Form template": "Skapa ny formulärmall", diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 9c89ff92..26b749ad 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "文件已创建", "Open in ONLYOFFICE" : "用 ONLYOFFICE 打开", "Convert with ONLYOFFICE" : "用 ONLYOFFICE 转换", - "Document" : "文档", - "Spreadsheet" : "电子表格", - "Presentation" : "演示文稿", + "New document" : "新建文档", + "New spreadsheet" : "新建表格", + "New presentation" : "新建幻灯片", "Error when trying to connect" : "连接是发生异常", "Settings have been successfully updated" : "设置已保存", "Server can't read xml" : "服务器无法读取XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s 提到 %2\$s: \"%3\$s\".", "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} 提到 {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式", - "Form template": "表单模板", + "New form template": "新表单模板", "Blank": "空白", "From text document": "从文本文件", "Create new Form template": "创建新的表单模板", @@ -118,4 +118,4 @@ OC.L10N.register( "Fill in form in ONLYOFFICE": "在ONLYOFFICE上填写表单", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "请将ONLYOFFICE Docs更新到7.0版本,以便在线编辑可填写的表单" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=1; plural=0;"); diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index e4e32299..733f3b4d 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -22,9 +22,9 @@ "File created" : "文件已创建", "Open in ONLYOFFICE" : "用 ONLYOFFICE 打开", "Convert with ONLYOFFICE" : "用 ONLYOFFICE 转换", - "Document" : "文档", - "Spreadsheet" : "电子表格", - "Presentation" : "演示文稿", + "New document" : "新建文档", + "New spreadsheet" : "新建表格", + "New presentation" : "新建幻灯片", "Error when trying to connect" : "连接是发生异常", "Settings have been successfully updated" : "设置已保存", "Server can't read xml" : "服务器无法读取XML", @@ -108,12 +108,12 @@ "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s 提到 %2$s: \"%3$s\".", "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} 提到 {file}: \"%1$s\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式", - "Form template": "表单模板", + "New form template": "新表单模板", "Blank": "空白", "From text document": "从文本文件", "Create new Form template": "创建新的表单模板", "Create form": "创建表单", "Fill in form in ONLYOFFICE": "在ONLYOFFICE上填写表单", "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online": "请将ONLYOFFICE Docs更新到7.0版本,以便在线编辑可填写的表单" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=1; plural=0;" } \ No newline at end of file diff --git a/lib/Migration/MimeRepair.php b/lib/Migration/MimeRepair.php index 46cfbef4..069baa9e 100644 --- a/lib/Migration/MimeRepair.php +++ b/lib/Migration/MimeRepair.php @@ -1,7 +1,7 @@ config->FormatsSetting(); $mimes = [ - $formats["docxf"]["mime"] => self::DOCUMENT_ALIAS, - $formats["oform"]["mime"] => self::DOCUMENT_ALIAS + "application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf" => self::DOCUMENT_ALIAS, + "application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform" => self::DOCUMENT_ALIAS ]; $customAlias = $mimes; diff --git a/lib/adminsection.php b/lib/adminsection.php index 4212fa30..7e04aa3a 100644 --- a/lib/adminsection.php +++ b/lib/adminsection.php @@ -1,7 +1,7 @@ SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, false); + function GetConvertedUri($document_uri, $from_extension, $to_extension, $document_revision_id, $region = null) { + $responceFromConvertService = $this->SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, false, $region); $errorElement = $responceFromConvertService->Error; if ($errorElement->count() > 0) { @@ -111,10 +112,11 @@ function GetConvertedUri($document_uri, $from_extension, $to_extension, $documen * @param string $to_extension - Extension to which to convert * @param string $document_revision_id - Key for caching on service * @param bool - $is_async - Perform conversions asynchronously + * @param string $region - Region * * @return array */ - function SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, $is_async) { + function SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, $is_async, $region = null) { $documentServerUrl = $this->config->GetDocumentServerInternalUrl(); if (empty($documentServerUrl)) { @@ -144,6 +146,10 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi "key" => $document_revision_id ]; + if (!is_null($region)) { + $data["region"] = $region; + } + if ($this->config->UseDemo()) { $data["tenant"] = $this->config->GetSystemValue("instanceid", true); } diff --git a/lib/filecreator.php b/lib/filecreator.php index 29104728..2786cd6c 100644 --- a/lib/filecreator.php +++ b/lib/filecreator.php @@ -1,7 +1,7 @@ format) { case "xlsx": - return $this->trans->t("Spreadsheet"); + return $this->trans->t("New spreadsheet"); case "pptx": - return $this->trans->t("Presentation"); + return $this->trans->t("New presentation"); } - return $this->trans->t("Document"); + return $this->trans->t("New document"); } /** diff --git a/lib/fileutility.php b/lib/fileutility.php index 7ddfd200..2d2a65fa 100644 --- a/lib/fileutility.php +++ b/lib/fileutility.php @@ -1,7 +1,7 @@ getDisplayName(); $trans = $this->l10nFactory->get($this->appName, $languageCode); + $editorLink = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".editor.index", [ + "fileId" => $fileId, + "anchor" => $anchor + ]); + $notification->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath($this->appName, "app-dark.svg"))) ->setParsedSubject($trans->t("%1\$s mentioned in the %2\$s: \"%3\$s\".", [$notifierName, $fileName, $notification->getObjectId()])) ->setRichSubject($trans->t("{notifier} mentioned in the {file}: \"%1\$s\".", [$notification->getObjectId()]), [ @@ -136,17 +141,11 @@ public function prepare(INotification $notification, string $languageCode): INot "file" => [ "type" => "highlight", "id" => $fileId, - "name" => $fileName + "name" => $fileName, + "link" => $editorLink ] ]); - $editorLink = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".editor.index", [ - "fileId" => $fileId, - "anchor" => $anchor - ]); - - $notification->setLink($editorLink); - return $notification; } } \ No newline at end of file diff --git a/lib/preview.php b/lib/preview.php index 561ed406..1cbd6089 100644 --- a/lib/preview.php +++ b/lib/preview.php @@ -1,7 +1,7 @@ t("Documentation")) ?>"> -

t("Server settings")) ?>

+

t("Server settings")) ?>

t("ONLYOFFICE Docs Location specifies the address of the server with the document services installed. Please change the '' for the server address in the below line.")) ?>

@@ -92,7 +92,7 @@
onlyoffice-hide"> -

t("Common settings")) ?>

+

t("Common settings")) ?>


-

+

t("Editor customization settings")) ?> "> -

+

onlyoffice-hide"> -

+

t("Common templates")) ?> -

+
  • class="onlyoffice-template-item" > @@ -251,7 +251,7 @@
onlyoffice-hide"> -

t("Secure view settings")) ?>

+

t("Secure view settings")) ?>

t("Secure view enables you to secure documents by embedding a watermark")) ?>

@@ -332,4 +332,4 @@

-
\ No newline at end of file +