From a8925458bf9851391ae71bdb94bd6e5303e61bd4 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 9 Sep 2017 00:21:14 +0000 Subject: [PATCH 01/26] [tx-robot] updated from transifex --- l10n/fa.js | 2 +- l10n/fa.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n/fa.js b/l10n/fa.js index bd84363c..cdf712c6 100644 --- a/l10n/fa.js +++ b/l10n/fa.js @@ -9,7 +9,7 @@ OC.L10N.register( "Apply" : "اعمال", "Wrong password. Please retry." : "رمز اشتباه. لطفاً مجددا تکرار فرمایید.", "Password" : "گذرواژه", - "OK" : "باشه", + "OK" : "تایید", "Guest %s" : "میهمان %s", "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "این لینک منقضی شده یا اینکه هرگز وجود نداشته است. لطفاً از کسی که آن را با شما به اشتراک گذاشته جزئیات را جویا شوید." }, diff --git a/l10n/fa.json b/l10n/fa.json index 6b7f891a..9f7f3080 100644 --- a/l10n/fa.json +++ b/l10n/fa.json @@ -7,7 +7,7 @@ "Apply" : "اعمال", "Wrong password. Please retry." : "رمز اشتباه. لطفاً مجددا تکرار فرمایید.", "Password" : "گذرواژه", - "OK" : "باشه", + "OK" : "تایید", "Guest %s" : "میهمان %s", "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "این لینک منقضی شده یا اینکه هرگز وجود نداشته است. لطفاً از کسی که آن را با شما به اشتراک گذاشته جزئیات را جویا شوید." },"pluralForm" :"nplurals=1; plural=0;" From 26b3b73aeae08f01a6da284e452759b7d6f5631b Mon Sep 17 00:00:00 2001 From: Melroy van den Berg Date: Thu, 14 Sep 2017 15:10:38 +0200 Subject: [PATCH 02/26] Create a link back to the Apps pag (#119) * Update README.md Add a link to the Apps page, so people can find the info faster & easier if people for some reason (like me) entering the github page first. * Update README.md some rephrasing. * Update README.md new line --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 58c0a4ec..7ffa9f79 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,12 @@ Find out more about Nextcloud and Collabora Online, and how to setup an server h In your Nextcloud, simply navigate to »Apps«, choose the category »Office & text«, find the Collabora Online app and enable it. Then open the administrator settings, navigate to the »Collabora Online« tab and specify your Collabora Online server. +### Nextcloud/Collabora Online relation + +For the latest information about the Collabora Online and Nextcloud releases, please visit the: + +[Apps page of Collabora](https://apps.nextcloud.com/apps/richdocuments). + ### Scripted installation (Ubuntu), Server + Nextcloud app The developers of the [Nextcloud VM](https://github.com/nextcloud/vm) has made a [script](https://raw.githubusercontent.com/nextcloud/vm/master/apps/collabora.sh) that you can use. Please remember to check the the variables in the script to suit your config before you run it, though it should work out of the box on all Ubuntu servers from 16.04 an upwards. From 4d55ab420f4662393d870d64786c805df078f5b7 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 19 Sep 2017 00:22:13 +0000 Subject: [PATCH 03/26] [tx-robot] updated from transifex --- l10n/lt_LT.js | 3 +++ l10n/lt_LT.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/l10n/lt_LT.js b/l10n/lt_LT.js index 629c3ef9..1d4f01be 100644 --- a/l10n/lt_LT.js +++ b/l10n/lt_LT.js @@ -23,6 +23,9 @@ OC.L10N.register( "New Presentation.pptx" : "Nauja pateiktis.pptx", "Can't create document" : "Nepavyksta sukurti dokumento", "Saved" : "Įrašyta", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Įrašyta su klaida: Collabora Online turėtų naudoti tokį patį protokolą kaip ir serverio diegimas.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Collabora Online serveris", "Apply" : "Taikyti", "Wrong password. Please retry." : "Neteisingas slaptažodis. Bandykite dar kartą.", "Password" : "Slaptažodis", diff --git a/l10n/lt_LT.json b/l10n/lt_LT.json index abb0f68e..ab5b2178 100644 --- a/l10n/lt_LT.json +++ b/l10n/lt_LT.json @@ -21,6 +21,9 @@ "New Presentation.pptx" : "Nauja pateiktis.pptx", "Can't create document" : "Nepavyksta sukurti dokumento", "Saved" : "Įrašyta", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Įrašyta su klaida: Collabora Online turėtų naudoti tokį patį protokolą kaip ir serverio diegimas.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Collabora Online serveris", "Apply" : "Taikyti", "Wrong password. Please retry." : "Neteisingas slaptažodis. Bandykite dar kartą.", "Password" : "Slaptažodis", From d80a97af3a6e0d009eeadfed75ee8a64cc3a1920 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 22 Sep 2017 00:21:45 +0000 Subject: [PATCH 04/26] [tx-robot] updated from transifex --- l10n/et_EE.js | 1 + l10n/et_EE.json | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/et_EE.js b/l10n/et_EE.js index f492848b..5080171e 100644 --- a/l10n/et_EE.js +++ b/l10n/et_EE.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Saving…" : "Salvestamine...", "All" : "Kõik", + "More versions…" : "Rohkem versioone...", "Just now" : "Kohe", "Save" : "Salvesta", "Edit" : "Muuda", diff --git a/l10n/et_EE.json b/l10n/et_EE.json index cba29786..ff6474f1 100644 --- a/l10n/et_EE.json +++ b/l10n/et_EE.json @@ -1,6 +1,7 @@ { "translations": { "Saving…" : "Salvestamine...", "All" : "Kõik", + "More versions…" : "Rohkem versioone...", "Just now" : "Kohe", "Save" : "Salvesta", "Edit" : "Muuda", From 21504eb5a895c1c80f937e1b5eeb5ecdf89c8711 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Wed, 27 Sep 2017 06:53:06 +0000 Subject: [PATCH 05/26] support for external apps (#124) --- appinfo/info.xml | 2 +- appinfo/routes.php | 3 + js/admin.js | 128 ++++++++++++++++++++++++++ lib/Controller/DocumentController.php | 60 ++++++++++++ lib/Controller/SettingsController.php | 7 +- lib/Settings/Admin.php | 1 + templates/admin.php | 12 +++ 7 files changed, 211 insertions(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index d1017b1a..42052817 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Collabora Online allows you to to work with all kinds of office documents directly in your browser. This application requires Collabora Cloudsuite to be installed on one of your servers, please read the documentation to learn more about that. Edit office documents directly in your browser. AGPL - 1.12.34 + 1.12.35 Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk https://github.com/nextcloud/richdocuments/issues https://github.com/nextcloud/richdocuments.git diff --git a/appinfo/routes.php b/appinfo/routes.php index 67dfc3fa..a92dc45d 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -18,6 +18,9 @@ return [ ['name' => 'document#publicPage', 'url' => '/public', 'verb' => 'GET'], ['name' => 'document#create', 'url' => 'ajax/documents/create', 'verb' => 'POST'], + // external api access + ['name' => 'document#extAppGetData', 'url' => '/ajax/extapp/data/{fileId}', 'verb' => 'POST'], + // WOPI access ['name' => 'wopi#checkFileInfo', 'url' => 'wopi/files/{fileId}', 'verb' => 'GET'], ['name' => 'wopi#getFile', 'url' => 'wopi/files/{fileId}/contents', 'verb' => 'GET'], diff --git a/js/admin.js b/js/admin.js index 81e1c0cd..58162f69 100644 --- a/js/admin.js +++ b/js/admin.js @@ -1,6 +1,31 @@ /*global OC, $ */ var documentsSettings = { + _createExtApp: function() { + var app1 = document.createElement('div'); + app1.setAttribute('class', 'external-app'); + + var appname1 = document.createElement('input'); + appname1.setAttribute('class', 'external-apps-name'); + $(app1).append(appname1); + + var apptoken1 = document.createElement('input'); + apptoken1.setAttribute('class', 'external-apps-token'); + $(app1).append(apptoken1); + + var apptokenbutton = document.createElement('button'); + apptokenbutton.setAttribute('class', 'external-apps-gen-token-button'); + apptokenbutton.innerHTML = 'Generate Token'; + $(app1).append(apptokenbutton); + + var appremovebutton = document.createElement('button'); + appremovebutton.setAttribute('class', 'external-apps-remove-button'); + appremovebutton.innerHTML = 'Remove'; + $(app1).append(appremovebutton); + + return app1; + }, + save : function() { $('#wopi_apply').attr('disabled', true); var data = { @@ -38,6 +63,23 @@ var documentsSettings = { OC.msg.finishedAction('#documents-admin-msg', response); }, + saveExternalApps: function(externalAppsData) { + var data = { + 'external_apps': externalAppsData + }; + + OC.msg.startAction('#enable-external-apps-section-msg', t('richdocuments', 'Saving...')); + $.post( + OC.filePath('richdocuments', 'ajax', 'admin.php'), + data, + documentsSettings.afterSaveExternalApps + ); + }, + + afterSaveExternalApps: function(response) { + OC.msg.finishedAction('#enable-external-apps-section-msg', response); + }, + initEditGroups: function() { var groups = $('#edit_group_select').val(); if (groups !== '') { @@ -48,11 +90,97 @@ var documentsSettings = { } }, + initExternalApps: function() { + var externalAppsRaw = $(document).find('#external-apps-raw').val(); + var apps = externalAppsRaw.split(','); + for (var i = 0; i < apps.length; ++i) { + if (apps[i] !== '') { + var app = apps[i].split(':'); + var app1 = this._createExtApp(); + // create a placeholder for adding new app + $('#external-apps-section').append(app1); + $(app1).find('.external-apps-name').val(app[0]); + $(app1).find('.external-apps-token').val(app[1]); + } + } + }, + initialize: function() { documentsSettings.initEditGroups(); + documentsSettings.initExternalApps(); $('#wopi_apply').on('click', documentsSettings.save); + // destroy or create app name and token fields depending on whether the checkbox is on or off + $(document).on('change', '#enable_external_apps_cb-richdocuments', function() { + var page = $(this).parent(); + + page.find('#enable-external-apps-section').toggleClass('hidden', !this.checked); + if (this.checked) { + var app1 = documentsSettings._createExtApp(); + $('#external-apps-section').append(app1); + } else { + page.find('.external-app').remove(); + page.find('#external-apps-raw').val(''); + documentsSettings.saveExternalApps(''); + } + }); + + $(document).on('click', '.external-apps-gen-token-button', function() { + var appSection = $(this).parent(); + var appToken = appSection.find('.external-apps-token'); + + // generate a random string + var len = 3; + var array = new Uint32Array(len); + window.crypto.getRandomValues(array); + var random = ''; + for (var i = 0; i < len; ++i) { + random += array[i].toString(36); + } + + // set the token in the field + appToken.val(random); + }); + + $(document).on('click', '.external-apps-remove-button', function() { + $(this).parent().remove(); + }); + + $(document).on('click', '#external-apps-save-button', function() { + // read all the data in input fields, save the data in input-raw and send to backedn + var extAppsSection = $(this).parent(); + var apps = extAppsSection.find('.external-app'); + // convert all values into one single string and store it in raw input field + // as well as send the data to server + var raw = ''; + for (var i = 0; i < apps.length; ++i) { + var appname = $(apps[i]).find('.external-apps-name'); + var apptoken = $(apps[i]).find('.external-apps-token'); + raw += appname.val() + ':' + apptoken.val() + ','; + } + + extAppsSection.find('#external-apps-raw').val(raw); + documentsSettings.saveExternalApps(raw); + }); + + $(document).on('click', '#external-apps-add-button', function() { + // create a placeholder for adding new app + var app1 = documentsSettings._createExtApp(); + $('#external-apps-section').append(app1); + }); + + $(document).on('click', '#test_wopi_apply', function() { + var groups = $(this).parent().find('#test_server_group_select').val(); + var testserver = $(this).parent().find('#test_wopi_url').val(); + + if (groups !== '' && testserver !== '') { + documentsSettings.saveTestWopi(groups, testserver); + } else { + OC.msg.finishedError('#test-documents-admin-msg', 'Both fields required'); + } + }); + $(document).on('change', '.doc-format-ooxml', function() { var ooxml = this.checked; documentsSettings.saveDocFormat(ooxml ? 'ooxml' : 'odf'); diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index ccbc46ee..ba316498 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -92,6 +92,66 @@ class DocumentController extends Controller { $this->logger = $logger; } + /** + * @PublicPage + * @NoCSRFRequired + * + * Returns the access_token and urlsrc for WOPI access for given $fileId + * Requests is accepted only when a secret_token is provided set by admin in + * settings page + * + * @param string $fileId + * @return access_token, urlsrc + */ + public function extAppGetData($fileId) { + $secretToken = $this->request->getParam('secret_token'); + $apps = array_filter(explode(',', $this->appConfig->getAppValue('external_apps'))); + foreach($apps as $app) { + if ($app !== '') { + if ($secretToken === $app) { + $appName = explode(':', $app); + \OC::$server->getLogger()->debug('External app "{extApp}" authenticated; issuing access token for fileId {fileId}', [ + 'app' => $this->appName, + 'extApp' => $appName[0], + 'fileId' => $fileId + ]); + try { + $folder = $this->rootFolder->getUserFolder($this->uid); + $item = $folder->getById($fileId)[0]; + if(!($item instanceof Node)) { + throw new \Exception(); + } + list($urlSrc, $token) = $this->tokenManager->getToken($item->getId()); + return array( + 'status' => 'success', + 'urlsrc' => $urlSrc, + 'token' => $token + ); + } catch (\Exception $e) { + $this->logger->logException($e, ['app'=>'richdocuments']); + $params = [ + 'remoteAddr' => $this->request->getRemoteAddress(), + 'requestID' => $this->request->getId(), + 'debugMode' => $this->settings->getSystemValue('debug'), + 'errorClass' => get_class($e), + 'errorCode' => $e->getCode(), + 'errorMsg' => $e->getMessage(), + 'file' => $e->getFile(), + 'line' => $e->getLine(), + 'trace' => $e->getTraceAsString() + ]; + return new TemplateResponse('core', 'exception', $params, 'guest'); + } + } + } + + return array( + 'status' => 'error', + 'message' => 'Permission denied' + ); + } + } + /** * @NoAdminRequired * diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 8d609c02..850b28d1 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -66,7 +66,8 @@ class SettingsController extends Controller{ */ public function setSettings($wopi_url, $edit_groups, - $doc_format){ + $doc_format, + $external_apps){ $message = $this->l10n->t('Saved'); if ($wopi_url !== null){ @@ -86,6 +87,10 @@ class SettingsController extends Controller{ $this->appConfig->setAppValue('doc_format', $doc_format); } + if ($external_apps !== null) { + $this->appConfig->setAppValue('external_apps', $external_apps); + } + $this->discoveryManager->refretch(); $response = [ diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 2a837065..e4faa02f 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -49,6 +49,7 @@ class Admin implements ISettings { 'wopi_url' => $this->config->getAppValue('richdocuments', 'wopi_url'), 'edit_groups' => $this->config->getAppValue('richdocuments', 'edit_groups'), 'doc_format' => $this->config->getAppValue('richdocuments', 'doc_format'), + 'external_apps' => $this->config->getAppValue('richdocuments', 'external_apps'), ], 'blank' ); diff --git a/templates/admin.php b/templates/admin.php index bbcdcb9f..6dc8aa81 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -15,4 +15,16 @@ script('richdocuments', 'admin');
/> +
+ /> + +
+
+ +
+ + + + +
From fe7d0a003f1570c44a6f9245b04eed6f4d82f8ff Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 29 Sep 2017 00:22:31 +0000 Subject: [PATCH 06/26] [tx-robot] updated from transifex --- l10n/ca.js | 18 ++++++++++++++++++ l10n/ca.json | 18 ++++++++++++++++++ l10n/da.js | 3 +++ l10n/da.json | 3 +++ l10n/de.js | 3 +++ l10n/de.json | 3 +++ l10n/de_DE.js | 3 +++ l10n/de_DE.json | 3 +++ l10n/en_GB.js | 3 +++ l10n/en_GB.json | 3 +++ l10n/es_MX.js | 3 +++ l10n/es_MX.json | 3 +++ l10n/fr.js | 2 ++ l10n/fr.json | 2 ++ l10n/it.js | 3 +++ l10n/it.json | 3 +++ l10n/nb.js | 3 +++ l10n/nb.json | 3 +++ l10n/pt_BR.js | 3 +++ l10n/pt_BR.json | 3 +++ l10n/tr.js | 3 +++ l10n/tr.json | 3 +++ 22 files changed, 94 insertions(+) diff --git a/l10n/ca.js b/l10n/ca.js index 782836a3..f22b210f 100644 --- a/l10n/ca.js +++ b/l10n/ca.js @@ -1,21 +1,39 @@ OC.L10N.register( "richdocuments", { + "Saving…" : "S'està desant ...", + "Saving..." : "Desant...", + "All" : "Tots", "Download this revision" : "Baixa aquesta revisió", "Restore this revision" : "Restaura aquesta revisió", "Latest revision" : "Última revisió", + "More versions…" : "Més versións ...", "Just now" : "Ara mateix", + "Failed to revert the document to older version" : "No s'ha pogut tornar el document a la versió anterior", "Save" : "Desar", + "Loading documents…" : "S'estan carregant els documents...", "Edit" : "Editar", + "New Document" : "Nou document", + "New Spreadsheet" : "Nou full de càlcul", + "New Presentation" : "Nova presentació", "Could not create file" : "No s'ha pogut crear el fitxer", "New Document.odt" : "Nou Document.odt", + "New Spreadsheet.ods" : "Nou full de càlcul.ods", "New Presentation.odp" : "Nova Presentació.odp", "New Document.docx" : "Nou Document.docx", + "New Spreadsheet.xlsx" : "Nou full de càlcul.xlsx", "New Presentation.pptx" : "Nova Presentació.pptx", "Can't create document" : "El document no es pot crear", "Saved" : "Desat", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "S'ha desat amb error: hauria d'utilitzar el mateix protocol que la instal·lació del servidor.", "Collabora Online" : "Col·labora Online", + "Collabora Online server" : "servidor en línia", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Servidor URL (i port) que proporciona la funcionalitat d'edició com a client WOPI.", "Apply" : "Aplica", + "Enable edit for specific groups" : "Habilita l'edició per a grups específics", + "Use OOXML by default for new files" : "Utilitzeu XML per defecte per a fitxers nous", + "Enable access for external apps" : "Activa l'accés a les aplicacions externes", + "Add" : "Add", "Wrong password. Please retry." : "Contrasenya incorrecta. Intenteu-ho de nou.", "Password" : "Contrasenya", "OK" : "D'acord", diff --git a/l10n/ca.json b/l10n/ca.json index c7117880..9ce4ca27 100644 --- a/l10n/ca.json +++ b/l10n/ca.json @@ -1,19 +1,37 @@ { "translations": { + "Saving…" : "S'està desant ...", + "Saving..." : "Desant...", + "All" : "Tots", "Download this revision" : "Baixa aquesta revisió", "Restore this revision" : "Restaura aquesta revisió", "Latest revision" : "Última revisió", + "More versions…" : "Més versións ...", "Just now" : "Ara mateix", + "Failed to revert the document to older version" : "No s'ha pogut tornar el document a la versió anterior", "Save" : "Desar", + "Loading documents…" : "S'estan carregant els documents...", "Edit" : "Editar", + "New Document" : "Nou document", + "New Spreadsheet" : "Nou full de càlcul", + "New Presentation" : "Nova presentació", "Could not create file" : "No s'ha pogut crear el fitxer", "New Document.odt" : "Nou Document.odt", + "New Spreadsheet.ods" : "Nou full de càlcul.ods", "New Presentation.odp" : "Nova Presentació.odp", "New Document.docx" : "Nou Document.docx", + "New Spreadsheet.xlsx" : "Nou full de càlcul.xlsx", "New Presentation.pptx" : "Nova Presentació.pptx", "Can't create document" : "El document no es pot crear", "Saved" : "Desat", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "S'ha desat amb error: hauria d'utilitzar el mateix protocol que la instal·lació del servidor.", "Collabora Online" : "Col·labora Online", + "Collabora Online server" : "servidor en línia", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Servidor URL (i port) que proporciona la funcionalitat d'edició com a client WOPI.", "Apply" : "Aplica", + "Enable edit for specific groups" : "Habilita l'edició per a grups específics", + "Use OOXML by default for new files" : "Utilitzeu XML per defecte per a fitxers nous", + "Enable access for external apps" : "Activa l'accés a les aplicacions externes", + "Add" : "Add", "Wrong password. Please retry." : "Contrasenya incorrecta. Intenteu-ho de nou.", "Password" : "Contrasenya", "OK" : "D'acord", diff --git a/l10n/da.js b/l10n/da.js index f96ccc59..77009446 100644 --- a/l10n/da.js +++ b/l10n/da.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Gemmer...", + "Saving..." : "Gemmer...", "All" : "Alle", "Download this revision" : "Hent denne revision", "Restore this revision" : "Gendan denne revision", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Anvend", "Enable edit for specific groups" : "Aktivér ret for specifikke grupper", "Use OOXML by default for new files" : "Brug OOXML for standard for nye filer.", + "Enable access for external apps" : "Tillad tilgang fra eksterne apps", + "Add" : "Tilføj", "Wrong password. Please retry." : "Forkert kodeord. Prøv igen.", "Password" : "Kodeord", "OK" : "OK", diff --git a/l10n/da.json b/l10n/da.json index c2731e9f..eb703525 100644 --- a/l10n/da.json +++ b/l10n/da.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Gemmer...", + "Saving..." : "Gemmer...", "All" : "Alle", "Download this revision" : "Hent denne revision", "Restore this revision" : "Gendan denne revision", @@ -29,6 +30,8 @@ "Apply" : "Anvend", "Enable edit for specific groups" : "Aktivér ret for specifikke grupper", "Use OOXML by default for new files" : "Brug OOXML for standard for nye filer.", + "Enable access for external apps" : "Tillad tilgang fra eksterne apps", + "Add" : "Tilføj", "Wrong password. Please retry." : "Forkert kodeord. Prøv igen.", "Password" : "Kodeord", "OK" : "OK", diff --git a/l10n/de.js b/l10n/de.js index 236b03ea..19ec4e2d 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Speichere…", + "Saving..." : "Speichere…", "All" : "Alle", "Download this revision" : "Diese Revision herunterladen", "Restore this revision" : "Diese Revision wiederherstellen", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Anwenden", "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", + "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", + "Add" : "Hinzufügen", "Wrong password. Please retry." : "Falsches Passwort. Bitte versuche es noch einmal.", "Password" : "Passwort", "OK" : "OK", diff --git a/l10n/de.json b/l10n/de.json index 041b2d74..0ae45be8 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Speichere…", + "Saving..." : "Speichere…", "All" : "Alle", "Download this revision" : "Diese Revision herunterladen", "Restore this revision" : "Diese Revision wiederherstellen", @@ -29,6 +30,8 @@ "Apply" : "Anwenden", "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", + "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", + "Add" : "Hinzufügen", "Wrong password. Please retry." : "Falsches Passwort. Bitte versuche es noch einmal.", "Password" : "Passwort", "OK" : "OK", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index faf98f4d..af6b0299 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Speichere…", + "Saving..." : "Speichere…", "All" : "Alle", "Download this revision" : "Diese Revision herunterladen", "Restore this revision" : "Diese Revision wiederherstellen", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Anwenden", "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", + "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", + "Add" : "Hinzufügen", "Wrong password. Please retry." : "Falsches Passwort. Bitte versuchen Sie es noch einmal.", "Password" : "Passwort", "OK" : "OK", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index ff71388c..e66e3ec4 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Speichere…", + "Saving..." : "Speichere…", "All" : "Alle", "Download this revision" : "Diese Revision herunterladen", "Restore this revision" : "Diese Revision wiederherstellen", @@ -29,6 +30,8 @@ "Apply" : "Anwenden", "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", + "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", + "Add" : "Hinzufügen", "Wrong password. Please retry." : "Falsches Passwort. Bitte versuchen Sie es noch einmal.", "Password" : "Passwort", "OK" : "OK", diff --git a/l10n/en_GB.js b/l10n/en_GB.js index a5e6072c..28846592 100644 --- a/l10n/en_GB.js +++ b/l10n/en_GB.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Saving…", + "Saving..." : "Saving...", "All" : "All", "Download this revision" : "Download this revision", "Restore this revision" : "Restore this revision", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Apply", "Enable edit for specific groups" : "Enable edit for specific groups", "Use OOXML by default for new files" : "Use OOXML by default for new files", + "Enable access for external apps" : "Enable access for external apps", + "Add" : "Add", "Wrong password. Please retry." : "Incorrect password. Please try again.", "Password" : "Password", "OK" : "OK", diff --git a/l10n/en_GB.json b/l10n/en_GB.json index d6d14079..a82faefd 100644 --- a/l10n/en_GB.json +++ b/l10n/en_GB.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Saving…", + "Saving..." : "Saving...", "All" : "All", "Download this revision" : "Download this revision", "Restore this revision" : "Restore this revision", @@ -29,6 +30,8 @@ "Apply" : "Apply", "Enable edit for specific groups" : "Enable edit for specific groups", "Use OOXML by default for new files" : "Use OOXML by default for new files", + "Enable access for external apps" : "Enable access for external apps", + "Add" : "Add", "Wrong password. Please retry." : "Incorrect password. Please try again.", "Password" : "Password", "OK" : "OK", diff --git a/l10n/es_MX.js b/l10n/es_MX.js index 1c062458..5e79bcd1 100644 --- a/l10n/es_MX.js +++ b/l10n/es_MX.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Guardando...", + "Saving..." : "Guardando...", "All" : "Todos", "Download this revision" : "Descargar esta revisión", "Restore this revision" : "Restaurar esta revisión", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Aplicar", "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", "Password" : "Contraseña", "OK" : "OK", diff --git a/l10n/es_MX.json b/l10n/es_MX.json index ef089f77..664b3a90 100644 --- a/l10n/es_MX.json +++ b/l10n/es_MX.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Guardando...", + "Saving..." : "Guardando...", "All" : "Todos", "Download this revision" : "Descargar esta revisión", "Restore this revision" : "Restaurar esta revisión", @@ -29,6 +30,8 @@ "Apply" : "Aplicar", "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", "Password" : "Contraseña", "OK" : "OK", diff --git a/l10n/fr.js b/l10n/fr.js index 4e09f22e..32bb0c58 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Enregistrement…", + "Saving..." : "Enregistrement en cours…", "All" : "Tout", "Download this revision" : "Télécharger cette révision", "Restore this revision" : "Restaurer cette révision", @@ -31,6 +32,7 @@ OC.L10N.register( "Apply" : "Appliquer", "Enable edit for specific groups" : "Activer les modifications pour certains groupes", "Use OOXML by default for new files" : "Utiliser le format OOXML par défaut pour les nouveaux fichiers", + "Add" : "Ajouter", "Wrong password. Please retry." : "Mot de passe erroné. Merci de réessayer.", "Password" : "Mot de passe", "OK" : "OK", diff --git a/l10n/fr.json b/l10n/fr.json index 4ffa8ff6..eaaecd72 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Enregistrement…", + "Saving..." : "Enregistrement en cours…", "All" : "Tout", "Download this revision" : "Télécharger cette révision", "Restore this revision" : "Restaurer cette révision", @@ -29,6 +30,7 @@ "Apply" : "Appliquer", "Enable edit for specific groups" : "Activer les modifications pour certains groupes", "Use OOXML by default for new files" : "Utiliser le format OOXML par défaut pour les nouveaux fichiers", + "Add" : "Ajouter", "Wrong password. Please retry." : "Mot de passe erroné. Merci de réessayer.", "Password" : "Mot de passe", "OK" : "OK", diff --git a/l10n/it.js b/l10n/it.js index b671e545..fa0840b4 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Salvataggio in corso...", + "Saving..." : "Salvataggio in corso...", "All" : "Tutti", "Download this revision" : "Scarica questa revisione", "Restore this revision" : "Ripristina questa revisione", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Applica", "Enable edit for specific groups" : "Abilita la modifica per gruppi specifici", "Use OOXML by default for new files" : "Utilizza OOXML in modo predefinito per i nuovi file", + "Enable access for external apps" : "Abilita l'accesso per le applicazioni esterne", + "Add" : "Aggiungi", "Wrong password. Please retry." : "Password errata. Riprova.", "Password" : "Password", "OK" : "OK", diff --git a/l10n/it.json b/l10n/it.json index 3823c061..a308b9e7 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Salvataggio in corso...", + "Saving..." : "Salvataggio in corso...", "All" : "Tutti", "Download this revision" : "Scarica questa revisione", "Restore this revision" : "Ripristina questa revisione", @@ -29,6 +30,8 @@ "Apply" : "Applica", "Enable edit for specific groups" : "Abilita la modifica per gruppi specifici", "Use OOXML by default for new files" : "Utilizza OOXML in modo predefinito per i nuovi file", + "Enable access for external apps" : "Abilita l'accesso per le applicazioni esterne", + "Add" : "Aggiungi", "Wrong password. Please retry." : "Password errata. Riprova.", "Password" : "Password", "OK" : "OK", diff --git a/l10n/nb.js b/l10n/nb.js index 0d84cc33..c9978e4b 100644 --- a/l10n/nb.js +++ b/l10n/nb.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Lagrer...", + "Saving..." : "Lagrer", "All" : "Alle", "Download this revision" : "Last ned denne versjonen", "Restore this revision" : "Gjenopprett denne versjonen", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Bruk", "Enable edit for specific groups" : "Skru på redigering for gitte grupper", "Use OOXML by default for new files" : "Bruk OOXML som forvalg for nye filer", + "Enable access for external apps" : "Aktiver tilgang for eksterne programmer", + "Add" : "Legg til", "Wrong password. Please retry." : "Feil passord. Prøv igjen.", "Password" : "Passord", "OK" : "OK", diff --git a/l10n/nb.json b/l10n/nb.json index f4b1c45c..3714641e 100644 --- a/l10n/nb.json +++ b/l10n/nb.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Lagrer...", + "Saving..." : "Lagrer", "All" : "Alle", "Download this revision" : "Last ned denne versjonen", "Restore this revision" : "Gjenopprett denne versjonen", @@ -29,6 +30,8 @@ "Apply" : "Bruk", "Enable edit for specific groups" : "Skru på redigering for gitte grupper", "Use OOXML by default for new files" : "Bruk OOXML som forvalg for nye filer", + "Enable access for external apps" : "Aktiver tilgang for eksterne programmer", + "Add" : "Legg til", "Wrong password. Please retry." : "Feil passord. Prøv igjen.", "Password" : "Passord", "OK" : "OK", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 68d792e1..1bf61041 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Salvando...", + "Saving..." : "Salvando...", "All" : "Tudo", "Download this revision" : "Baixar esta revisão", "Restore this revision" : "Restaurar esta revisão", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Aplicar", "Enable edit for specific groups" : "habilitar edição para grupos específicos", "Use OOXML by default for new files" : "Use OOXML por padrão para novos arquivos", + "Enable access for external apps" : "Habilitar acesso a aplicativos externos", + "Add" : "Adicionar", "Wrong password. Please retry." : "Senha errada. Por favor tente novamente.", "Password" : "Senha", "OK" : "OK", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 8f23d927..92c3c82f 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Salvando...", + "Saving..." : "Salvando...", "All" : "Tudo", "Download this revision" : "Baixar esta revisão", "Restore this revision" : "Restaurar esta revisão", @@ -29,6 +30,8 @@ "Apply" : "Aplicar", "Enable edit for specific groups" : "habilitar edição para grupos específicos", "Use OOXML by default for new files" : "Use OOXML por padrão para novos arquivos", + "Enable access for external apps" : "Habilitar acesso a aplicativos externos", + "Add" : "Adicionar", "Wrong password. Please retry." : "Senha errada. Por favor tente novamente.", "Password" : "Senha", "OK" : "OK", diff --git a/l10n/tr.js b/l10n/tr.js index 04171ada..94aa5c0e 100644 --- a/l10n/tr.js +++ b/l10n/tr.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Kaydediliyor...", + "Saving..." : "Kaydediliyor...", "All" : "Tümü", "Download this revision" : "Bu sürümü indir", "Restore this revision" : "Bu sürümü geri yükle", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Uygula", "Enable edit for specific groups" : "Düzenlemeyi yalnız belirli gruplar için etkinleştir", "Use OOXML by default for new files" : "Yeni dosyalar için varsayılan olarak OOXML kullanılsın", + "Enable access for external apps" : "Dış uygulamalara erişilebilsin", + "Add" : "Ekle", "Wrong password. Please retry." : "Parola yanlış. Lütfen yeniden deneyin.", "Password" : "Parola", "OK" : "Tamam", diff --git a/l10n/tr.json b/l10n/tr.json index 02d216db..6c809e5c 100644 --- a/l10n/tr.json +++ b/l10n/tr.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Kaydediliyor...", + "Saving..." : "Kaydediliyor...", "All" : "Tümü", "Download this revision" : "Bu sürümü indir", "Restore this revision" : "Bu sürümü geri yükle", @@ -29,6 +30,8 @@ "Apply" : "Uygula", "Enable edit for specific groups" : "Düzenlemeyi yalnız belirli gruplar için etkinleştir", "Use OOXML by default for new files" : "Yeni dosyalar için varsayılan olarak OOXML kullanılsın", + "Enable access for external apps" : "Dış uygulamalara erişilebilsin", + "Add" : "Ekle", "Wrong password. Please retry." : "Parola yanlış. Lütfen yeniden deneyin.", "Password" : "Parola", "OK" : "Tamam", From 9b4e62e89e07ad7734324bac3ac5dcbb1a76e1cc Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 30 Sep 2017 00:21:50 +0000 Subject: [PATCH 07/26] [tx-robot] updated from transifex --- l10n/el.js | 1 + l10n/el.json | 1 + l10n/fr.js | 1 + l10n/fr.json | 1 + l10n/pl.js | 3 +++ l10n/pl.json | 3 +++ 6 files changed, 10 insertions(+) diff --git a/l10n/el.js b/l10n/el.js index 15e8af62..92512a09 100644 --- a/l10n/el.js +++ b/l10n/el.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Γίνεται αποθήκευση...", + "Saving..." : "Γίνεται αποθήκευση...", "All" : "'Ολα", "Download this revision" : "Λήψη αυτής της αναθεώρησης", "Restore this revision" : "Επαναφορά αυτή της αναθεώρησης", diff --git a/l10n/el.json b/l10n/el.json index 6834ce8d..a5e257c2 100644 --- a/l10n/el.json +++ b/l10n/el.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Γίνεται αποθήκευση...", + "Saving..." : "Γίνεται αποθήκευση...", "All" : "'Ολα", "Download this revision" : "Λήψη αυτής της αναθεώρησης", "Restore this revision" : "Επαναφορά αυτή της αναθεώρησης", diff --git a/l10n/fr.js b/l10n/fr.js index 32bb0c58..c5b02f27 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -32,6 +32,7 @@ OC.L10N.register( "Apply" : "Appliquer", "Enable edit for specific groups" : "Activer les modifications pour certains groupes", "Use OOXML by default for new files" : "Utiliser le format OOXML par défaut pour les nouveaux fichiers", + "Enable access for external apps" : "Activer l'accès depuis des applications externes", "Add" : "Ajouter", "Wrong password. Please retry." : "Mot de passe erroné. Merci de réessayer.", "Password" : "Mot de passe", diff --git a/l10n/fr.json b/l10n/fr.json index eaaecd72..0eb88fc4 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -30,6 +30,7 @@ "Apply" : "Appliquer", "Enable edit for specific groups" : "Activer les modifications pour certains groupes", "Use OOXML by default for new files" : "Utiliser le format OOXML par défaut pour les nouveaux fichiers", + "Enable access for external apps" : "Activer l'accès depuis des applications externes", "Add" : "Ajouter", "Wrong password. Please retry." : "Mot de passe erroné. Merci de réessayer.", "Password" : "Mot de passe", diff --git a/l10n/pl.js b/l10n/pl.js index 7a1c2e68..d9ea05c8 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Zapisywanie...", + "Saving..." : "Zapisywanie...", "All" : "Wszystko", "Download this revision" : "Ściągnij tę rewizję", "Restore this revision" : "Przywróć tę rewizję", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Zastosuj", "Enable edit for specific groups" : "Włącz edycję tylko dla określonych grup", "Use OOXML by default for new files" : "Użyj domyślnie dla nowych plików OOXML", + "Enable access for external apps" : "Aktywuj dostęp dla zewnętrznych aplikacji", + "Add" : "Dodaj", "Wrong password. Please retry." : "Złe hasło. Spróbuj ponownie.", "Password" : "Hasło", "OK" : "OK", diff --git a/l10n/pl.json b/l10n/pl.json index 323e96d7..91667cdd 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Zapisywanie...", + "Saving..." : "Zapisywanie...", "All" : "Wszystko", "Download this revision" : "Ściągnij tę rewizję", "Restore this revision" : "Przywróć tę rewizję", @@ -29,6 +30,8 @@ "Apply" : "Zastosuj", "Enable edit for specific groups" : "Włącz edycję tylko dla określonych grup", "Use OOXML by default for new files" : "Użyj domyślnie dla nowych plików OOXML", + "Enable access for external apps" : "Aktywuj dostęp dla zewnętrznych aplikacji", + "Add" : "Dodaj", "Wrong password. Please retry." : "Złe hasło. Spróbuj ponownie.", "Password" : "Hasło", "OK" : "OK", From f182f3044d8ec318a30c8d5d8b20a412d9941244 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 1 Oct 2017 00:21:35 +0000 Subject: [PATCH 08/26] [tx-robot] updated from transifex --- l10n/nl.js | 3 +++ l10n/nl.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/l10n/nl.js b/l10n/nl.js index 07c6e7cf..0189f99c 100644 --- a/l10n/nl.js +++ b/l10n/nl.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Opslaan...", + "Saving..." : "Opslaan…", "All" : "Alle", "Download this revision" : "Download deze revisie", "Restore this revision" : "Herstel deze revisie", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Toepassen", "Enable edit for specific groups" : "Schakel bewerken in voor bepaalde groepen", "Use OOXML by default for new files" : "Gebruik standaard OOXML voor nieuwe bestanden", + "Enable access for external apps" : "Toegang vanuit externe apps toestaan", + "Add" : "Toevoegen", "Wrong password. Please retry." : "Onjuist wachtwoord. Probeer opnieuw.", "Password" : "Wachtwoord", "OK" : "OK", diff --git a/l10n/nl.json b/l10n/nl.json index 68380d22..2bf4f621 100644 --- a/l10n/nl.json +++ b/l10n/nl.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Opslaan...", + "Saving..." : "Opslaan…", "All" : "Alle", "Download this revision" : "Download deze revisie", "Restore this revision" : "Herstel deze revisie", @@ -29,6 +30,8 @@ "Apply" : "Toepassen", "Enable edit for specific groups" : "Schakel bewerken in voor bepaalde groepen", "Use OOXML by default for new files" : "Gebruik standaard OOXML voor nieuwe bestanden", + "Enable access for external apps" : "Toegang vanuit externe apps toestaan", + "Add" : "Toevoegen", "Wrong password. Please retry." : "Onjuist wachtwoord. Probeer opnieuw.", "Password" : "Wachtwoord", "OK" : "OK", From 39becf6546c2387d55e80f66a1e090862643fe5f Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 3 Oct 2017 00:21:41 +0000 Subject: [PATCH 09/26] [tx-robot] updated from transifex --- l10n/fi.js | 2 ++ l10n/fi.json | 2 ++ l10n/sv.js | 3 +++ l10n/sv.json | 3 +++ 4 files changed, 10 insertions(+) diff --git a/l10n/fi.js b/l10n/fi.js index f95f9d1b..1ffc3485 100644 --- a/l10n/fi.js +++ b/l10n/fi.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Tallennetaan...", + "Saving..." : "Tallennetaan...", "All" : "Kaikki", "Download this revision" : "Lataa tämä versio", "Restore this revision" : "Palauta tähän versioon", @@ -31,6 +32,7 @@ OC.L10N.register( "Apply" : "Toteuta", "Enable edit for specific groups" : "Salli muokkaus tietyille ryhmille", "Use OOXML by default for new files" : "Käytä OOXML:ää oletuksena uusille tiedostoille", + "Add" : "Lisää", "Wrong password. Please retry." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", "OK" : "OK", diff --git a/l10n/fi.json b/l10n/fi.json index 06beea96..6a62b28a 100644 --- a/l10n/fi.json +++ b/l10n/fi.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Tallennetaan...", + "Saving..." : "Tallennetaan...", "All" : "Kaikki", "Download this revision" : "Lataa tämä versio", "Restore this revision" : "Palauta tähän versioon", @@ -29,6 +30,7 @@ "Apply" : "Toteuta", "Enable edit for specific groups" : "Salli muokkaus tietyille ryhmille", "Use OOXML by default for new files" : "Käytä OOXML:ää oletuksena uusille tiedostoille", + "Add" : "Lisää", "Wrong password. Please retry." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", "OK" : "OK", diff --git a/l10n/sv.js b/l10n/sv.js index 47f9b8b9..0ab3ccbc 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Sparar...", + "Saving..." : "Sparar...", "All" : "Alla", "Download this revision" : "Ladda ned denna granskning", "Restore this revision" : "Återställ denna granskning", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Tillämpa", "Enable edit for specific groups" : "Aktivera ändring för specifika grupper", "Use OOXML by default for new files" : "Använd OOXML som standard för nya filer", + "Enable access for external apps" : "Aktivera åtkomst för externa appar", + "Add" : "Lägg till", "Wrong password. Please retry." : "Fel lösenord. Försök igen.", "Password" : "Lösenord", "OK" : "OK", diff --git a/l10n/sv.json b/l10n/sv.json index 4eee4e8c..1e135f9e 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Sparar...", + "Saving..." : "Sparar...", "All" : "Alla", "Download this revision" : "Ladda ned denna granskning", "Restore this revision" : "Återställ denna granskning", @@ -29,6 +30,8 @@ "Apply" : "Tillämpa", "Enable edit for specific groups" : "Aktivera ändring för specifika grupper", "Use OOXML by default for new files" : "Använd OOXML som standard för nya filer", + "Enable access for external apps" : "Aktivera åtkomst för externa appar", + "Add" : "Lägg till", "Wrong password. Please retry." : "Fel lösenord. Försök igen.", "Password" : "Lösenord", "OK" : "OK", From 653c4d9ae04f9406b9c1a3076eb88d660911d585 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 6 Oct 2017 00:22:24 +0000 Subject: [PATCH 10/26] [tx-robot] updated from transifex --- l10n/ru.js | 15 +++++++++------ l10n/ru.json | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/l10n/ru.js b/l10n/ru.js index a63e6f7d..0edaa255 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Сохранение…", + "Saving..." : "Сохранение...", "All" : "Все", "Download this revision" : "Скачать эту ревизию", "Restore this revision" : "Восстановить эту ревизию", @@ -16,12 +17,12 @@ OC.L10N.register( "New Spreadsheet" : "Новая таблица", "New Presentation" : "Новая презентация", "Could not create file" : "Не удалось создать файл", - "New Document.odt" : "Новый Документ.odt", - "New Spreadsheet.ods" : "Новая Таблица.ods", - "New Presentation.odp" : "Новая Презентация.odp", - "New Document.docx" : "Новый Документ.docx", - "New Spreadsheet.xlsx" : "Новая Таблица.xlsx", - "New Presentation.pptx" : "Новая Презентация.pptx", + "New Document.odt" : "Новый документ.odt", + "New Spreadsheet.ods" : "Новая таблица.ods", + "New Presentation.odp" : "Новая презентация.odp", + "New Document.docx" : "Новый документ.docx", + "New Spreadsheet.xlsx" : "Новая таблица.xlsx", + "New Presentation.pptx" : "Новая презентация.pptx", "Can't create document" : "Невозможно создать документ", "Saved" : "Сохранено", "Saved with error: Collabora Online should use the same protocol as the server installation." : "Сохранено с ошибкой: В Collabra Online должен использоваться тот же протокол, что в установке сервера.", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Применить", "Enable edit for specific groups" : "Включить редактирование только для указанных групп", "Use OOXML by default for new files" : "Для новых файлов по умолчанию использовать OOXML", + "Enable access for external apps" : "Разрешить доступ внешним приложениям", + "Add" : "Добавить", "Wrong password. Please retry." : "Неправильный пароль. Повторите попытку.", "Password" : "Пароль", "OK" : "ОК", diff --git a/l10n/ru.json b/l10n/ru.json index 9c10ddfa..66132b8b 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Сохранение…", + "Saving..." : "Сохранение...", "All" : "Все", "Download this revision" : "Скачать эту ревизию", "Restore this revision" : "Восстановить эту ревизию", @@ -14,12 +15,12 @@ "New Spreadsheet" : "Новая таблица", "New Presentation" : "Новая презентация", "Could not create file" : "Не удалось создать файл", - "New Document.odt" : "Новый Документ.odt", - "New Spreadsheet.ods" : "Новая Таблица.ods", - "New Presentation.odp" : "Новая Презентация.odp", - "New Document.docx" : "Новый Документ.docx", - "New Spreadsheet.xlsx" : "Новая Таблица.xlsx", - "New Presentation.pptx" : "Новая Презентация.pptx", + "New Document.odt" : "Новый документ.odt", + "New Spreadsheet.ods" : "Новая таблица.ods", + "New Presentation.odp" : "Новая презентация.odp", + "New Document.docx" : "Новый документ.docx", + "New Spreadsheet.xlsx" : "Новая таблица.xlsx", + "New Presentation.pptx" : "Новая презентация.pptx", "Can't create document" : "Невозможно создать документ", "Saved" : "Сохранено", "Saved with error: Collabora Online should use the same protocol as the server installation." : "Сохранено с ошибкой: В Collabra Online должен использоваться тот же протокол, что в установке сервера.", @@ -29,6 +30,8 @@ "Apply" : "Применить", "Enable edit for specific groups" : "Включить редактирование только для указанных групп", "Use OOXML by default for new files" : "Для новых файлов по умолчанию использовать OOXML", + "Enable access for external apps" : "Разрешить доступ внешним приложениям", + "Add" : "Добавить", "Wrong password. Please retry." : "Неправильный пароль. Повторите попытку.", "Password" : "Пароль", "OK" : "ОК", From 938e7b7c5596be011a31eb4acba092aacf488f18 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 7 Oct 2017 00:22:01 +0000 Subject: [PATCH 11/26] [tx-robot] updated from transifex --- l10n/es.js | 3 +++ l10n/es.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/l10n/es.js b/l10n/es.js index 9f4a4e9e..b9ad3009 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Guardando…", + "Saving..." : "Guardando...", "All" : "Todo", "Download this revision" : "Descargar esta revisión", "Restore this revision" : "Restaurar esta revisión", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Aplicar", "Enable edit for specific groups" : "Activar la edición para grupos específicos", "Use OOXML by default for new files" : "Usar OOXML de forma predeterminada para nuevos archivos", + "Enable access for external apps" : "Permitir acceso a apps externas", + "Add" : "Añadir", "Wrong password. Please retry." : "Contraseña incorrecta. Inténtelo de nuevo.", "Password" : "Contraseña", "OK" : "OK", diff --git a/l10n/es.json b/l10n/es.json index 81d6e7f5..e0624069 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Guardando…", + "Saving..." : "Guardando...", "All" : "Todo", "Download this revision" : "Descargar esta revisión", "Restore this revision" : "Restaurar esta revisión", @@ -29,6 +30,8 @@ "Apply" : "Aplicar", "Enable edit for specific groups" : "Activar la edición para grupos específicos", "Use OOXML by default for new files" : "Usar OOXML de forma predeterminada para nuevos archivos", + "Enable access for external apps" : "Permitir acceso a apps externas", + "Add" : "Añadir", "Wrong password. Please retry." : "Contraseña incorrecta. Inténtelo de nuevo.", "Password" : "Contraseña", "OK" : "OK", From 060219db8da3b9b16d004399ae3cc402152aaea6 Mon Sep 17 00:00:00 2001 From: Jonas Cosandey Date: Thu, 12 Oct 2017 09:48:53 +0200 Subject: [PATCH 12/26] fix typo in readme (#128) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ffa9f79..a26cf109 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ For the latest information about the Collabora Online and Nextcloud releases, pl ### Scripted installation (Ubuntu), Server + Nextcloud app The developers of the [Nextcloud VM](https://github.com/nextcloud/vm) has made a [script](https://raw.githubusercontent.com/nextcloud/vm/master/apps/collabora.sh) that you can use. -Please remember to check the the variables in the script to suit your config before you run it, though it should work out of the box on all Ubuntu servers from 16.04 an upwards. +Please remember to check the variables in the script to suit your config before you run it, though it should work out of the box on all Ubuntu servers from 16.04 an upwards. The only thing you must have prepared before you run the script is to have SSL (https://) on your Nextcloud domain and to setup a DNS record to a new domain that you will host Collabora on (office.domain.com for example) and point that your server. SSL is set up with Let's Encrypt. From 56cd7241ff7aa49575509c50733b7a1788b8e114 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 13 Oct 2017 00:22:36 +0000 Subject: [PATCH 13/26] [tx-robot] updated from transifex --- l10n/sl.js | 1 + l10n/sl.json | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/sl.js b/l10n/sl.js index 0774e367..80478ff3 100644 --- a/l10n/sl.js +++ b/l10n/sl.js @@ -1,6 +1,7 @@ OC.L10N.register( "richdocuments", { + "Saving…" : "Shranjevanje...", "Download this revision" : "Prejmi predelavo", "Restore this revision" : "Obnovi predelavo", "Latest revision" : "Najnovejša predelava", diff --git a/l10n/sl.json b/l10n/sl.json index eaa97980..ee67a6af 100644 --- a/l10n/sl.json +++ b/l10n/sl.json @@ -1,4 +1,5 @@ { "translations": { + "Saving…" : "Shranjevanje...", "Download this revision" : "Prejmi predelavo", "Restore this revision" : "Obnovi predelavo", "Latest revision" : "Najnovejša predelava", From bf8126e07a433d1f30b504d1a280e4e68f752066 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sat, 14 Oct 2017 02:42:50 +0000 Subject: [PATCH 14/26] [tx-robot] updated from transifex --- l10n/sr.js | 29 ++++++++++++++++++++++++++++- l10n/sr.json | 29 ++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/l10n/sr.js b/l10n/sr.js index 7aaf698d..0ff85fdd 100644 --- a/l10n/sr.js +++ b/l10n/sr.js @@ -1,12 +1,39 @@ OC.L10N.register( "richdocuments", { + "Saving…" : "Снимам…", + "Saving..." : "Снимам...", + "All" : "Све", + "Download this revision" : "Скини ову ревизију", + "Restore this revision" : "Поврати ову ревизију", + "Latest revision" : "Последња ревизија", + "More versions…" : "Још верзија…", + "Just now" : "Управо сад", + "Failed to revert the document to older version" : "Грешка у враћању документа на старију верзију", "Save" : "Сачувај", + "Loading documents…" : "Учитавање докумената…", "Edit" : "Уреди", - "Could not create file" : "Не могу да створим фајл", + "New Document" : "Нови документ", + "New Spreadsheet" : "Нова табела", + "New Presentation" : "Нова презентација", + "Could not create file" : "Не могу да креирам фајл", + "New Document.odt" : "New Document.odt", + "New Spreadsheet.ods" : "New Spreadsheet.ods", + "New Presentation.odp" : "New Presentation.odp", + "New Document.docx" : "New Document.docx", + "New Spreadsheet.xlsx" : "New Spreadsheet.xlsx", + "New Presentation.pptx" : "New Presentation.pptx", "Can't create document" : "Не могу да направим документ", "Saved" : "Сачувано", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Сачувану уз грешку: Collabora Online би требало да користи исти протокол као и серверска инсталација.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Collabora Online сервер", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Адреса (и порт) Collabora Online сервера који омогућава функционалност измене као WOPI клијент.", "Apply" : "Примени", + "Enable edit for specific groups" : "Дозволи измењивање за одређене групе", + "Use OOXML by default for new files" : "Користи OOXML као подразумевани за нове фајлове", + "Enable access for external apps" : "Дозволи приступ за спољне апликације", + "Add" : "Додај", "Wrong password. Please retry." : "Погрешна лозинка. Покушајте поново.", "Password" : "Лозинка", "OK" : "У реду", diff --git a/l10n/sr.json b/l10n/sr.json index ef7245c9..7aea7834 100644 --- a/l10n/sr.json +++ b/l10n/sr.json @@ -1,10 +1,37 @@ { "translations": { + "Saving…" : "Снимам…", + "Saving..." : "Снимам...", + "All" : "Све", + "Download this revision" : "Скини ову ревизију", + "Restore this revision" : "Поврати ову ревизију", + "Latest revision" : "Последња ревизија", + "More versions…" : "Још верзија…", + "Just now" : "Управо сад", + "Failed to revert the document to older version" : "Грешка у враћању документа на старију верзију", "Save" : "Сачувај", + "Loading documents…" : "Учитавање докумената…", "Edit" : "Уреди", - "Could not create file" : "Не могу да створим фајл", + "New Document" : "Нови документ", + "New Spreadsheet" : "Нова табела", + "New Presentation" : "Нова презентација", + "Could not create file" : "Не могу да креирам фајл", + "New Document.odt" : "New Document.odt", + "New Spreadsheet.ods" : "New Spreadsheet.ods", + "New Presentation.odp" : "New Presentation.odp", + "New Document.docx" : "New Document.docx", + "New Spreadsheet.xlsx" : "New Spreadsheet.xlsx", + "New Presentation.pptx" : "New Presentation.pptx", "Can't create document" : "Не могу да направим документ", "Saved" : "Сачувано", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Сачувану уз грешку: Collabora Online би требало да користи исти протокол као и серверска инсталација.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Collabora Online сервер", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Адреса (и порт) Collabora Online сервера који омогућава функционалност измене као WOPI клијент.", "Apply" : "Примени", + "Enable edit for specific groups" : "Дозволи измењивање за одређене групе", + "Use OOXML by default for new files" : "Користи OOXML као подразумевани за нове фајлове", + "Enable access for external apps" : "Дозволи приступ за спољне апликације", + "Add" : "Додај", "Wrong password. Please retry." : "Погрешна лозинка. Покушајте поново.", "Password" : "Лозинка", "OK" : "У реду", From 12bb8c055bc52e0f8ac81db09ce5b4747d8aa97f Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 19 Oct 2017 15:36:10 +0200 Subject: [PATCH 15/26] Add avatar to UserExtraInfo (#130) * Add avatar to UserExtraInfo Signed-off-by: Lukas Reschke * Only add UserExtraInfo is version higher than 13 Signed-off-by: Lukas Reschke --- appinfo/info.xml | 2 +- lib/Controller/WopiController.php | 64 ++++++++++++++++++++++--------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 42052817..8b631a3e 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -12,7 +12,7 @@ office integration - + https://nextcloud.com/collaboraonline/ diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php index 51425ea2..69a216ef 100644 --- a/lib/Controller/WopiController.php +++ b/lib/Controller/WopiController.php @@ -1,6 +1,6 @@ + * @copyright Copyright (c) 2016-2017 Lukas Reschke * * @license GNU AGPL version 3 or any later version * @@ -24,35 +24,51 @@ namespace OCA\Richdocuments\Controller; use OC\Files\View; use OCA\Richdocuments\Db\Wopi; use OCA\Richdocuments\Helper; -use OCA\Richdocuments\WOPI\Parser; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; use OCP\Files\File; use OCP\Files\IRootFolder; +use OCP\IConfig; use OCP\IRequest; -use OCP\IUserManager; +use OCP\IURLGenerator; use OCP\AppFramework\Http\StreamResponse; +use OCP\IUserManager; class WopiController extends Controller { /** @var IRootFolder */ private $rootFolder; + /** @var IURLGenerator */ + private $urlGenerator; + /** @var IConfig */ + private $config; + /** @var IUserManager */ + private $userManager; // Signifies LOOL that document has been changed externally in this storage const LOOL_STATUS_DOC_CHANGED = 1010; /** * @param string $appName + * @param string $UserId * @param IRequest $request * @param IRootFolder $rootFolder - * @param string $UserId + * @param IURLGenerator $urlGenerator + * @param IConfig $config + * @param IUserManager $userManager */ public function __construct($appName, $UserId, IRequest $request, - IRootFolder $rootFolder) { + IRootFolder $rootFolder, + IURLGenerator $urlGenerator, + IConfig $config, + IUserManager $userManager) { parent::__construct($appName, $request); $this->rootFolder = $rootFolder; + $this->urlGenerator = $urlGenerator; + $this->config = $config; + $this->userManager = $userManager; } /** @@ -88,19 +104,31 @@ class WopiController extends Controller { return new JSONResponse([], Http::STATUS_FORBIDDEN); } - return new JSONResponse( - [ - 'BaseFileName' => $file->getName(), - 'Size' => $file->getSize(), - 'Version' => $version, - 'UserId' => $res['editor'] !== '' ? $res['editor'] : 'Guest user', - 'OwnerId' => $res['owner'], - 'UserFriendlyName' => $res['editor'] !== '' ? \OC_User::getDisplayName($res['editor']) : 'Guest user', - 'UserCanWrite' => $res['canwrite'] ? true : false, - 'PostMessageOrigin' => $res['server_host'], - 'LastModifiedTime' => Helper::toISO8601($file->getMtime()) - ] - ); + $response = [ + 'BaseFileName' => $file->getName(), + 'Size' => $file->getSize(), + 'Version' => $version, + 'UserId' => $res['editor'] !== '' ? $res['editor'] : 'Guest user', + 'OwnerId' => $res['owner'], + 'UserFriendlyName' => $res['editor'] !== '' ? \OC_User::getDisplayName($res['editor']) : 'Guest user', + 'UserExtraInfo' => [ + ], + 'UserCanWrite' => $res['canwrite'] ? true : false, + 'PostMessageOrigin' => $res['server_host'], + 'LastModifiedTime' => Helper::toISO8601($file->getMtime()) + ]; + + $serverVersion = $this->config->getSystemValue('version'); + if (version_compare($serverVersion, '13', '>=')) { + $user = $this->userManager->get($res['editor']); + if($user !== null) { + if($user->getAvatarImage(32) !== null) { + $response['UserExtraInfo']['avatar'] = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $res['editor'], 'size' => 32]); + } + } + } + + return new JSONResponse($response); } /** From 0434e383ba104b9b983e565a4093b2f48688ba26 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 20 Oct 2017 00:22:34 +0000 Subject: [PATCH 16/26] [tx-robot] updated from transifex --- l10n/ja.js | 1 + l10n/ja.json | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/ja.js b/l10n/ja.js index f7052e18..c7b3a3ad 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "保存中...", + "Saving..." : "保存中...", "All" : "すべて", "Download this revision" : "このリビジョンをダウンロード", "Restore this revision" : "このリビジョンを復元", diff --git a/l10n/ja.json b/l10n/ja.json index 38211820..2ec26351 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "保存中...", + "Saving..." : "保存中...", "All" : "すべて", "Download this revision" : "このリビジョンをダウンロード", "Restore this revision" : "このリビジョンを復元", From 72cb1956b0e5f58d6ab0511d26298458352a75a6 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Fri, 20 Oct 2017 11:26:26 +0200 Subject: [PATCH 17/26] Start listening for standard post messages and ignore deprecated ones (#126) New online versions emits both the post messages (the older one with a deprecated flag and newer one without). Ignore if the deprecated flag is mentioned because it means that we would get another post message without deprecated flag. --- js/documents.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/js/documents.js b/js/documents.js index 8d10fd23..709c6b45 100644 --- a/js/documents.js +++ b/js/documents.js @@ -353,13 +353,25 @@ var documentsMain = { } try { - var msg = JSON.parse(e.data).MessageId; + var msg = JSON.parse(e.data); + var msgId = msg.MessageId; + var args = msg.Values; + var deprecated = !!args.Deprecated; } catch(exc) { - msg = e.data; + msgId = e.data; } - if (msg === 'UI_Close' || msg === 'close') { + + if (msgId === 'UI_Close' || msgId === 'close' /* deprecated */) { + // If a postmesage API is deprecated, we must ignore it and wait for the standard postmessage + // (or it might already have been fired) + if (deprecated) + return; + documentsMain.onClose(); - } else if (msg === 'rev-history') { + } else if (msgId === 'UI_FileVersions' || msgId === 'rev-history' /* deprecated */) { + if (deprecated) + return; + documentsMain.UI.showRevHistory(documentsMain.fullPath); } }); From 1b3a16d8e6cbe284334570dcfe517df08b0b100e Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 24 Oct 2017 00:24:12 +0000 Subject: [PATCH 18/26] [tx-robot] updated from transifex --- l10n/es_CO.js | 43 +++++++++++++++++++++++++++++++++++++++++++ l10n/es_CO.json | 41 +++++++++++++++++++++++++++++++++++++++++ l10n/hu.js | 1 + l10n/hu.json | 1 + 4 files changed, 86 insertions(+) create mode 100644 l10n/es_CO.js create mode 100644 l10n/es_CO.json diff --git a/l10n/es_CO.js b/l10n/es_CO.js new file mode 100644 index 00000000..5e79bcd1 --- /dev/null +++ b/l10n/es_CO.js @@ -0,0 +1,43 @@ +OC.L10N.register( + "richdocuments", + { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Enable edit for specific groups" : "Permitir editar a grupos específicos", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +}, +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es_CO.json b/l10n/es_CO.json new file mode 100644 index 00000000..664b3a90 --- /dev/null +++ b/l10n/es_CO.json @@ -0,0 +1,41 @@ +{ "translations": { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Enable edit for specific groups" : "Permitir editar a grupos específicos", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +},"pluralForm" :"nplurals=2; plural=(n != 1);" +} \ No newline at end of file diff --git a/l10n/hu.js b/l10n/hu.js index 00e7ce99..3ede2210 100644 --- a/l10n/hu.js +++ b/l10n/hu.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Mentés...", + "Saving..." : "Mentés...", "All" : "Mind", "Download this revision" : "Jelen verzió letöltése", "Restore this revision" : "Jelen verzió visszaállítása", diff --git a/l10n/hu.json b/l10n/hu.json index fca90326..219cc49e 100644 --- a/l10n/hu.json +++ b/l10n/hu.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Mentés...", + "Saving..." : "Mentés...", "All" : "Mind", "Download this revision" : "Jelen verzió letöltése", "Restore this revision" : "Jelen verzió visszaállítása", From eb9154f822528b7ba36adb184d84429776f146d8 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 25 Oct 2017 00:23:29 +0000 Subject: [PATCH 19/26] [tx-robot] updated from transifex --- l10n/fi.js | 1 + l10n/fi.json | 1 + l10n/hu.js | 3 +++ l10n/hu.json | 3 +++ 4 files changed, 8 insertions(+) diff --git a/l10n/fi.js b/l10n/fi.js index 1ffc3485..b300514b 100644 --- a/l10n/fi.js +++ b/l10n/fi.js @@ -32,6 +32,7 @@ OC.L10N.register( "Apply" : "Toteuta", "Enable edit for specific groups" : "Salli muokkaus tietyille ryhmille", "Use OOXML by default for new files" : "Käytä OOXML:ää oletuksena uusille tiedostoille", + "Enable access for external apps" : "Salli pääsy ulkoisten sovellusten osalta", "Add" : "Lisää", "Wrong password. Please retry." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", diff --git a/l10n/fi.json b/l10n/fi.json index 6a62b28a..39bce1d9 100644 --- a/l10n/fi.json +++ b/l10n/fi.json @@ -30,6 +30,7 @@ "Apply" : "Toteuta", "Enable edit for specific groups" : "Salli muokkaus tietyille ryhmille", "Use OOXML by default for new files" : "Käytä OOXML:ää oletuksena uusille tiedostoille", + "Enable access for external apps" : "Salli pääsy ulkoisten sovellusten osalta", "Add" : "Lisää", "Wrong password. Please retry." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", diff --git a/l10n/hu.js b/l10n/hu.js index 3ede2210..49cdb56a 100644 --- a/l10n/hu.js +++ b/l10n/hu.js @@ -30,7 +30,10 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online kiszolgáló", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "A Collabora Online kiszolgáló URL-je (és portja), amely WOPI-ügyfélként lehetővé teszi a szerkesztés funkciót.", "Apply" : "Alkalmaz", + "Enable edit for specific groups" : "Szerkesztés engedélyezése egyes csoportok számára ", "Use OOXML by default for new files" : "OOXML használata alapértelmezettként az új fájlokhoz", + "Enable access for external apps" : "Külső alkalmazások hozzáférésének engedélyezése", + "Add" : "Hozzáadás", "Wrong password. Please retry." : "Hibás jelszó. Próbálkozzon újra!", "Password" : "Jelszó", "OK" : "OK", diff --git a/l10n/hu.json b/l10n/hu.json index 219cc49e..acff6512 100644 --- a/l10n/hu.json +++ b/l10n/hu.json @@ -28,7 +28,10 @@ "Collabora Online server" : "Collabora Online kiszolgáló", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "A Collabora Online kiszolgáló URL-je (és portja), amely WOPI-ügyfélként lehetővé teszi a szerkesztés funkciót.", "Apply" : "Alkalmaz", + "Enable edit for specific groups" : "Szerkesztés engedélyezése egyes csoportok számára ", "Use OOXML by default for new files" : "OOXML használata alapértelmezettként az új fájlokhoz", + "Enable access for external apps" : "Külső alkalmazások hozzáférésének engedélyezése", + "Add" : "Hozzáadás", "Wrong password. Please retry." : "Hibás jelszó. Próbálkozzon újra!", "Password" : "Jelszó", "OK" : "OK", From a275e4e1757672843d116350289973bf58002bdc Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 27 Oct 2017 00:22:24 +0000 Subject: [PATCH 20/26] [tx-robot] updated from transifex --- l10n/is.js | 3 +++ l10n/is.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/l10n/is.js b/l10n/is.js index 8dbd4d64..8f941cf6 100644 --- a/l10n/is.js +++ b/l10n/is.js @@ -2,6 +2,7 @@ OC.L10N.register( "richdocuments", { "Saving…" : "Er að vista ...", + "Saving..." : "Er að vista ...", "All" : "Allt", "Download this revision" : "Sækja þessa útgáfu", "Restore this revision" : "Endurheimta þessa útgáfu", @@ -31,6 +32,8 @@ OC.L10N.register( "Apply" : "Virkja", "Enable edit for specific groups" : "Leyfa breytingar fyrir sérstaka hópa", "Use OOXML by default for new files" : "Nota OOXML sjálfgefið fyrir nýjar skrár", + "Enable access for external apps" : "Virkja fyrir utanaðkomandi forrit", + "Add" : "Bæta við", "Wrong password. Please retry." : "Rangt lykilorð. Reyndu aftur.", "Password" : "Lykilorð", "OK" : "Í lagi", diff --git a/l10n/is.json b/l10n/is.json index c2a59a9d..96b2accd 100644 --- a/l10n/is.json +++ b/l10n/is.json @@ -1,5 +1,6 @@ { "translations": { "Saving…" : "Er að vista ...", + "Saving..." : "Er að vista ...", "All" : "Allt", "Download this revision" : "Sækja þessa útgáfu", "Restore this revision" : "Endurheimta þessa útgáfu", @@ -29,6 +30,8 @@ "Apply" : "Virkja", "Enable edit for specific groups" : "Leyfa breytingar fyrir sérstaka hópa", "Use OOXML by default for new files" : "Nota OOXML sjálfgefið fyrir nýjar skrár", + "Enable access for external apps" : "Virkja fyrir utanaðkomandi forrit", + "Add" : "Bæta við", "Wrong password. Please retry." : "Rangt lykilorð. Reyndu aftur.", "Password" : "Lykilorð", "OK" : "Í lagi", From 418b5aceaf7eb7b161976525b55d18482242de98 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 3 Nov 2017 01:26:56 +0000 Subject: [PATCH 21/26] [tx-robot] updated from transifex --- l10n/es_CR.js | 43 +++++++++++++++++++++++++++++++++++++++++++ l10n/es_CR.json | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 l10n/es_CR.js create mode 100644 l10n/es_CR.json diff --git a/l10n/es_CR.js b/l10n/es_CR.js new file mode 100644 index 00000000..5e79bcd1 --- /dev/null +++ b/l10n/es_CR.js @@ -0,0 +1,43 @@ +OC.L10N.register( + "richdocuments", + { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Enable edit for specific groups" : "Permitir editar a grupos específicos", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +}, +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es_CR.json b/l10n/es_CR.json new file mode 100644 index 00000000..664b3a90 --- /dev/null +++ b/l10n/es_CR.json @@ -0,0 +1,41 @@ +{ "translations": { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Enable edit for specific groups" : "Permitir editar a grupos específicos", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +},"pluralForm" :"nplurals=2; plural=(n != 1);" +} \ No newline at end of file From 9bf62db3aaf332b867f69c368bc366358a908ebd Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 6 Nov 2017 13:54:56 +0100 Subject: [PATCH 22/26] Add option to enable the app only for users in a specific group (#135) Signed-off-by: Lukas Reschke --- appinfo/app.php | 10 +++ js/admin.js | 52 +++++++++--- lib/Controller/SettingsController.php | 7 ++ lib/PermissionManager.php | 65 ++++++++++++++ lib/Settings/Admin.php | 1 + templates/admin.php | 7 +- tests/lib/PermissionManagerTest.php | 118 ++++++++++++++++++++++++++ 7 files changed, 246 insertions(+), 14 deletions(-) create mode 100644 lib/PermissionManager.php create mode 100644 tests/lib/PermissionManagerTest.php diff --git a/appinfo/app.php b/appinfo/app.php index bafc3467..d99c18d4 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -23,6 +23,16 @@ namespace OCA\Richdocuments\AppInfo; use OC\Security\CSP\ContentSecurityPolicy; +use OCA\Richdocuments\PermissionManager; + +$currentUser = \OC::$server->getUserSession()->getUser(); +if($currentUser !== null) { + /** @var PermissionManager $permissionManager */ + $permissionManager = \OC::$server->query(PermissionManager::class); + if(!$permissionManager->isEnabledForUser($currentUser)) { + return; + } +} $eventDispatcher = \OC::$server->getEventDispatcher(); $eventDispatcher->addListener( diff --git a/js/admin.js b/js/admin.js index 58162f69..58ddbd06 100644 --- a/js/admin.js +++ b/js/admin.js @@ -40,15 +40,11 @@ var documentsSettings = { ); }, - saveGroups: function(groups) { - var data = { - 'edit_groups': groups - }; - + saveGroups: function(data) { $.post( OC.filePath('richdocuments', 'ajax', 'admin.php'), data - ); + ); }, saveDocFormat: function(format) { @@ -80,14 +76,23 @@ var documentsSettings = { OC.msg.finishedAction('#enable-external-apps-section-msg', response); }, - initEditGroups: function() { - var groups = $('#edit_group_select').val(); + initGroups: function() { + var selectorPrefixes = [ + 'edit', + 'use' + ]; + + for (i = 0; i < selectorPrefixes.length; i++) { + var selectorPrefix = selectorPrefixes[i]; + + var groups = $('#' + selectorPrefix + '_group_select').val(); if (groups !== '') { - OC.Settings.setupGroupsSelect($('#edit_group_select')); - $('.edit-groups-enable').attr('checked', 'checked'); + OC.Settings.setupGroupsSelect($('#' + selectorPrefix + '_group_select')); + $('.' + selectorPrefix + '-groups-enable').attr('checked', 'checked'); } else { - $('.edit-groups-enable').attr('checked', null); + $('.' + selectorPrefix + '-groups-enable').attr('checked', null); } + } }, initExternalApps: function() { @@ -106,7 +111,7 @@ var documentsSettings = { }, initialize: function() { - documentsSettings.initEditGroups(); + documentsSettings.initGroups(); documentsSettings.initExternalApps(); $('#wopi_apply').on('click', documentsSettings.save); @@ -189,7 +194,7 @@ var documentsSettings = { $(document).on('change', '#edit_group_select', function() { var element = $(this).parent().find('input.edit-groups-enable'); var groups = $(this).val(); - documentsSettings.saveGroups(groups); + documentsSettings.saveGroups({edit_groups: groups}); }); $(document).on('change', '.edit-groups-enable', function() { @@ -207,6 +212,27 @@ var documentsSettings = { $select.change(); }); + $(document).on('change', '#use_group_select', function() { + var element = $(this).parent().find('input.use-groups-enable'); + var groups = $(this).val(); + documentsSettings.saveGroups({use_groups: groups}); + }); + + $(document).on('change', '.use-groups-enable', function() { + var $select = $(this).parent().find('#use_group_select'); + $select.val(''); + + if (this.checked) { + OC.Settings.setupGroupsSelect($select, { + placeholder: t('core', 'All') + }); + } else { + $select.select2('destroy'); + } + + $select.change(); + }); + } }; diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index 850b28d1..60a4c10b 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -53,6 +53,7 @@ class SettingsController extends Controller{ public function getSettings() { return new JSONResponse([ 'wopi_url' => $this->appConfig->getAppValue('wopi_url'), + 'use_groups' => $this->appConfig->getAppValue('use_groups'), 'edit_groups' => $this->appConfig->getAppValue('edit_groups'), 'doc_format' => $this->appConfig->getAppValue('doc_format'), ]); @@ -61,11 +62,13 @@ class SettingsController extends Controller{ /** * @param string $wopi_url * @param string $edit_groups + * @param string $use_groups * @param string $doc_format * @return JSONResponse */ public function setSettings($wopi_url, $edit_groups, + $use_groups, $doc_format, $external_apps){ $message = $this->l10n->t('Saved'); @@ -83,6 +86,10 @@ class SettingsController extends Controller{ $this->appConfig->setAppValue('edit_groups', $edit_groups); } + if ($use_groups !== null){ + $this->appConfig->setAppValue('use_groups', $use_groups); + } + if ($doc_format !== null) { $this->appConfig->setAppValue('doc_format', $doc_format); } diff --git a/lib/PermissionManager.php b/lib/PermissionManager.php new file mode 100644 index 00000000..d956c50c --- /dev/null +++ b/lib/PermissionManager.php @@ -0,0 +1,65 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\Richdocuments; + +use OCP\IConfig; +use OCP\IGroupManager; +use OCP\IUser; + +class PermissionManager { + const APP_ID = 'richdocuments'; + /** @var IConfig */ + private $config; + /** @var IGroupManager */ + private $groupManager; + + public function __construct(IConfig $config, + IGroupManager $groupManager) { + $this->config = $config; + $this->groupManager = $groupManager; + } + + /** + * @param string $groupString + * @return array + */ + private function splitGroups($groupString) { + return explode('|', $groupString); + } + + public function isEnabledForUser(IUser $user) { + $enabledForGroups = $this->config->getAppValue(self::APP_ID, 'use_groups', ''); + if($enabledForGroups === '') { + return true; + } + + $groups = $this->splitGroups($enabledForGroups); + $uid = $user->getUID(); + foreach($groups as $group) { + if($this->groupManager->isInGroup($uid, $group)) { + return true; + } + } + + return false; + } +} diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index e4faa02f..7fffc285 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -48,6 +48,7 @@ class Admin implements ISettings { [ 'wopi_url' => $this->config->getAppValue('richdocuments', 'wopi_url'), 'edit_groups' => $this->config->getAppValue('richdocuments', 'edit_groups'), + 'use_groups' => $this->config->getAppValue('richdocuments', 'use_groups'), 'doc_format' => $this->config->getAppValue('richdocuments', 'doc_format'), 'external_apps' => $this->config->getAppValue('richdocuments', 'external_apps'), ], diff --git a/templates/admin.php b/templates/admin.php index 6dc8aa81..52c973ac 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -1,5 +1,6 @@

t('Collabora Online')) ?>

@@ -9,8 +10,12 @@ script('richdocuments', 'admin');

+ + + +
- +
/> diff --git a/tests/lib/PermissionManagerTest.php b/tests/lib/PermissionManagerTest.php new file mode 100644 index 00000000..ed498e63 --- /dev/null +++ b/tests/lib/PermissionManagerTest.php @@ -0,0 +1,118 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace Tests\Richdocuments; + +use OCA\Richdocuments\PermissionManager; +use OCP\IConfig; +use OCP\IGroupManager; +use OCP\IUser; +use Test\TestCase; + +class PermissionManagerTest extends TestCase { + /** @var IConfig|\PHPUnit_Framework_MockObject_MockBuilder */ + private $config; + /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockBuilder */ + private $groupManager; + /** @var PermissionManager */ + private $permissionManager; + + public function setUp() { + parent::setUp(); + $this->config = $this->createMock(IConfig::class); + $this->groupManager = $this->createMock(IGroupManager::class); + $this->permissionManager = new PermissionManager($this->config, $this->groupManager); + } + + public function testIsEnabledForUserEnabledNoRestrictions() { + /** @var IUser|\PHPUnit_Framework_MockObject_MockBuilder $user */ + $user = $this->createMock(IUser::class); + + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->with('richdocuments', 'use_groups', '') + ->willReturn(''); + + $this->assertTrue($this->permissionManager->isEnabledForUser($user)); + } + + public function testIsEnabledForUserEnabledNotInGroup() { + /** @var IUser|\PHPUnit_Framework_MockObject_MockBuilder $user */ + $user = $this->createMock(IUser::class); + $user + ->expects($this->once()) + ->method('getUID') + ->willReturn('TestUser'); + + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->with('richdocuments', 'use_groups', '') + ->willReturn('Enabled1|Enabled2|Enabled3'); + + $this->groupManager + ->expects($this->at(0)) + ->method('isInGroup') + ->with('TestUser', 'Enabled1') + ->willReturn(false); + $this->groupManager + ->expects($this->at(1)) + ->method('isInGroup') + ->with('TestUser', 'Enabled2') + ->willReturn(false); + $this->groupManager + ->expects($this->at(2)) + ->method('isInGroup') + ->with('TestUser', 'Enabled3') + ->willReturn(false); + + $this->assertFalse($this->permissionManager->isEnabledForUser($user)); + } + + public function testIsEnabledForUserEnabledInGroup() { + /** @var IUser|\PHPUnit_Framework_MockObject_MockBuilder $user */ + $user = $this->createMock(IUser::class); + $user + ->expects($this->once()) + ->method('getUID') + ->willReturn('TestUser'); + + $this->config + ->expects($this->once()) + ->method('getAppValue') + ->with('richdocuments', 'use_groups', '') + ->willReturn('Enabled1|Enabled2|Enabled3'); + + $this->groupManager + ->expects($this->at(0)) + ->method('isInGroup') + ->with('TestUser', 'Enabled1') + ->willReturn(false); + $this->groupManager + ->expects($this->at(1)) + ->method('isInGroup') + ->with('TestUser', 'Enabled2') + ->willReturn(true); + + $this->assertTrue($this->permissionManager->isEnabledForUser($user)); + } +} From f54d330d55ac5483ba070540c4dfbeceb6967b29 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 7 Nov 2017 01:24:54 +0000 Subject: [PATCH 23/26] [tx-robot] updated from transifex --- l10n/ast.js | 1 - l10n/ast.json | 1 - l10n/ca.js | 1 - l10n/ca.json | 1 - l10n/cs.js | 1 - l10n/cs.json | 1 - l10n/da.js | 1 - l10n/da.json | 1 - l10n/de.js | 1 - l10n/de.json | 1 - l10n/de_DE.js | 1 - l10n/de_DE.json | 1 - l10n/el.js | 1 - l10n/el.json | 1 - l10n/en_GB.js | 1 - l10n/en_GB.json | 1 - l10n/es.js | 1 - l10n/es.json | 1 - l10n/es_CO.js | 1 - l10n/es_CO.json | 1 - l10n/es_CR.js | 1 - l10n/es_CR.json | 1 - l10n/es_DO.js | 42 ++++++++++++++++++++++++++++++++++++++++++ l10n/es_DO.json | 40 ++++++++++++++++++++++++++++++++++++++++ l10n/es_EC.js | 42 ++++++++++++++++++++++++++++++++++++++++++ l10n/es_EC.json | 40 ++++++++++++++++++++++++++++++++++++++++ l10n/es_MX.js | 1 - l10n/es_MX.json | 1 - l10n/fi.js | 1 - l10n/fi.json | 1 - l10n/fr.js | 1 - l10n/fr.json | 1 - l10n/hu.js | 1 - l10n/hu.json | 1 - l10n/is.js | 1 - l10n/is.json | 1 - l10n/it.js | 1 - l10n/it.json | 1 - l10n/ja.js | 1 - l10n/ja.json | 1 - l10n/nb.js | 1 - l10n/nb.json | 1 - l10n/nl.js | 1 - l10n/nl.json | 1 - l10n/pl.js | 1 - l10n/pl.json | 1 - l10n/pt_BR.js | 1 - l10n/pt_BR.json | 1 - l10n/ru.js | 1 - l10n/ru.json | 1 - l10n/sq.js | 1 - l10n/sq.json | 1 - l10n/sr.js | 1 - l10n/sr.json | 1 - l10n/sv.js | 1 - l10n/sv.json | 1 - l10n/tr.js | 1 - l10n/tr.json | 1 - l10n/zh_CN.js | 1 - l10n/zh_CN.json | 1 - 60 files changed, 164 insertions(+), 56 deletions(-) create mode 100644 l10n/es_DO.js create mode 100644 l10n/es_DO.json create mode 100644 l10n/es_EC.js create mode 100644 l10n/es_EC.json diff --git a/l10n/ast.js b/l10n/ast.js index e5f90e9d..d3809406 100644 --- a/l10n/ast.js +++ b/l10n/ast.js @@ -29,7 +29,6 @@ OC.L10N.register( "Collabora Online server" : "Sirvidor de Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puertu) del sirvidor Collabora Online que forne la funcionalidá d'edición como un veceru WOPI.", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Activar la edición pa grupos específicos", "Use OOXML by default for new files" : "Usar OOXML por defeutu pa ficheros nuevos", "Wrong password. Please retry." : "Contraseña incorreuta. Volvi tentalo, por favor.", "Password" : "Contraseña", diff --git a/l10n/ast.json b/l10n/ast.json index 96bd6dd8..3b2d7843 100644 --- a/l10n/ast.json +++ b/l10n/ast.json @@ -27,7 +27,6 @@ "Collabora Online server" : "Sirvidor de Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puertu) del sirvidor Collabora Online que forne la funcionalidá d'edición como un veceru WOPI.", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Activar la edición pa grupos específicos", "Use OOXML by default for new files" : "Usar OOXML por defeutu pa ficheros nuevos", "Wrong password. Please retry." : "Contraseña incorreuta. Volvi tentalo, por favor.", "Password" : "Contraseña", diff --git a/l10n/ca.js b/l10n/ca.js index f22b210f..492f85a6 100644 --- a/l10n/ca.js +++ b/l10n/ca.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "servidor en línia", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Servidor URL (i port) que proporciona la funcionalitat d'edició com a client WOPI.", "Apply" : "Aplica", - "Enable edit for specific groups" : "Habilita l'edició per a grups específics", "Use OOXML by default for new files" : "Utilitzeu XML per defecte per a fitxers nous", "Enable access for external apps" : "Activa l'accés a les aplicacions externes", "Add" : "Add", diff --git a/l10n/ca.json b/l10n/ca.json index 9ce4ca27..305961eb 100644 --- a/l10n/ca.json +++ b/l10n/ca.json @@ -28,7 +28,6 @@ "Collabora Online server" : "servidor en línia", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Servidor URL (i port) que proporciona la funcionalitat d'edició com a client WOPI.", "Apply" : "Aplica", - "Enable edit for specific groups" : "Habilita l'edició per a grups específics", "Use OOXML by default for new files" : "Utilitzeu XML per defecte per a fitxers nous", "Enable access for external apps" : "Activa l'accés a les aplicacions externes", "Add" : "Add", diff --git a/l10n/cs.js b/l10n/cs.js index 1115f84d..3053d297 100644 --- a/l10n/cs.js +++ b/l10n/cs.js @@ -29,7 +29,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (a port) Collabora Online serveru, který poskytuje funkce úprav jako WOPI klient.", "Apply" : "Použít", - "Enable edit for specific groups" : "Povolit úpravy pouze vybraným skupinám", "Use OOXML by default for new files" : "Použít OOXML jako výchozí pro nové soubory", "Wrong password. Please retry." : "Nesprávné heslo. Zkuste to znovu.", "Password" : "Heslo", diff --git a/l10n/cs.json b/l10n/cs.json index 0e411c54..d72f6efa 100644 --- a/l10n/cs.json +++ b/l10n/cs.json @@ -27,7 +27,6 @@ "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (a port) Collabora Online serveru, který poskytuje funkce úprav jako WOPI klient.", "Apply" : "Použít", - "Enable edit for specific groups" : "Povolit úpravy pouze vybraným skupinám", "Use OOXML by default for new files" : "Použít OOXML jako výchozí pro nové soubory", "Wrong password. Please retry." : "Nesprávné heslo. Zkuste to znovu.", "Password" : "Heslo", diff --git a/l10n/da.js b/l10n/da.js index 77009446..5d88d587 100644 --- a/l10n/da.js +++ b/l10n/da.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (og port) i Collabora Online serveren, der giver redigeringsfunktionalitet som en WOPI klient.", "Apply" : "Anvend", - "Enable edit for specific groups" : "Aktivér ret for specifikke grupper", "Use OOXML by default for new files" : "Brug OOXML for standard for nye filer.", "Enable access for external apps" : "Tillad tilgang fra eksterne apps", "Add" : "Tilføj", diff --git a/l10n/da.json b/l10n/da.json index eb703525..a1775503 100644 --- a/l10n/da.json +++ b/l10n/da.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (og port) i Collabora Online serveren, der giver redigeringsfunktionalitet som en WOPI klient.", "Apply" : "Anvend", - "Enable edit for specific groups" : "Aktivér ret for specifikke grupper", "Use OOXML by default for new files" : "Brug OOXML for standard for nye filer.", "Enable access for external apps" : "Tillad tilgang fra eksterne apps", "Add" : "Tilføj", diff --git a/l10n/de.js b/l10n/de.js index 19ec4e2d..4dbb5621 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", - "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/de.json b/l10n/de.json index 0ae45be8..604747ee 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", - "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index af6b0299..c202b2c5 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", - "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index e66e3ec4..b0ee395c 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", - "Enable edit for specific groups" : "Bearbeitung für bestimmte Gruppen aktivieren", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/el.js b/l10n/el.js index 92512a09..7b9db3ab 100644 --- a/l10n/el.js +++ b/l10n/el.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Διακομιστής Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Η URL (και η θύρα) του διακομιστή Collabora Online που παρέχει την δυνατότητα επεξεργασίας ως πελάτης WOPI.", "Apply" : "Εφαρμογή", - "Enable edit for specific groups" : "Ενεργοποίηση επεξεργασίας για καθορισμένες ομάδες", "Use OOXML by default for new files" : "Χρήση OOXML από προεπιλογή για τα νέα αρχεία", "Wrong password. Please retry." : "Εσφαλμένο συνθηματικό. Παρακαλώ προσπαθήστε ξανά.", "Password" : "Συνθηματικό", diff --git a/l10n/el.json b/l10n/el.json index a5e257c2..ed847f5c 100644 --- a/l10n/el.json +++ b/l10n/el.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Διακομιστής Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Η URL (και η θύρα) του διακομιστή Collabora Online που παρέχει την δυνατότητα επεξεργασίας ως πελάτης WOPI.", "Apply" : "Εφαρμογή", - "Enable edit for specific groups" : "Ενεργοποίηση επεξεργασίας για καθορισμένες ομάδες", "Use OOXML by default for new files" : "Χρήση OOXML από προεπιλογή για τα νέα αρχεία", "Wrong password. Please retry." : "Εσφαλμένο συνθηματικό. Παρακαλώ προσπαθήστε ξανά.", "Password" : "Συνθηματικό", diff --git a/l10n/en_GB.js b/l10n/en_GB.js index 28846592..357edec3 100644 --- a/l10n/en_GB.js +++ b/l10n/en_GB.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.", "Apply" : "Apply", - "Enable edit for specific groups" : "Enable edit for specific groups", "Use OOXML by default for new files" : "Use OOXML by default for new files", "Enable access for external apps" : "Enable access for external apps", "Add" : "Add", diff --git a/l10n/en_GB.json b/l10n/en_GB.json index a82faefd..de2c3dea 100644 --- a/l10n/en_GB.json +++ b/l10n/en_GB.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.", "Apply" : "Apply", - "Enable edit for specific groups" : "Enable edit for specific groups", "Use OOXML by default for new files" : "Use OOXML by default for new files", "Enable access for external apps" : "Enable access for external apps", "Add" : "Add", diff --git a/l10n/es.js b/l10n/es.js index b9ad3009..7f7c65cf 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "La dirección URL (y puerto) del servidor Collabora Online que proporciona la funcionalidad de edición es un cliente WOPI.", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Activar la edición para grupos específicos", "Use OOXML by default for new files" : "Usar OOXML de forma predeterminada para nuevos archivos", "Enable access for external apps" : "Permitir acceso a apps externas", "Add" : "Añadir", diff --git a/l10n/es.json b/l10n/es.json index e0624069..4c3da753 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "La dirección URL (y puerto) del servidor Collabora Online que proporciona la funcionalidad de edición es un cliente WOPI.", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Activar la edición para grupos específicos", "Use OOXML by default for new files" : "Usar OOXML de forma predeterminada para nuevos archivos", "Enable access for external apps" : "Permitir acceso a apps externas", "Add" : "Añadir", diff --git a/l10n/es_CO.js b/l10n/es_CO.js index 5e79bcd1..5ef81c65 100644 --- a/l10n/es_CO.js +++ b/l10n/es_CO.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", "Add" : "Guardar", diff --git a/l10n/es_CO.json b/l10n/es_CO.json index 664b3a90..625baa29 100644 --- a/l10n/es_CO.json +++ b/l10n/es_CO.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", "Add" : "Guardar", diff --git a/l10n/es_CR.js b/l10n/es_CR.js index 5e79bcd1..5ef81c65 100644 --- a/l10n/es_CR.js +++ b/l10n/es_CR.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", "Add" : "Guardar", diff --git a/l10n/es_CR.json b/l10n/es_CR.json index 664b3a90..625baa29 100644 --- a/l10n/es_CR.json +++ b/l10n/es_CR.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", "Add" : "Guardar", diff --git a/l10n/es_DO.js b/l10n/es_DO.js new file mode 100644 index 00000000..5ef81c65 --- /dev/null +++ b/l10n/es_DO.js @@ -0,0 +1,42 @@ +OC.L10N.register( + "richdocuments", + { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +}, +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es_DO.json b/l10n/es_DO.json new file mode 100644 index 00000000..625baa29 --- /dev/null +++ b/l10n/es_DO.json @@ -0,0 +1,40 @@ +{ "translations": { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +},"pluralForm" :"nplurals=2; plural=(n != 1);" +} \ No newline at end of file diff --git a/l10n/es_EC.js b/l10n/es_EC.js new file mode 100644 index 00000000..5ef81c65 --- /dev/null +++ b/l10n/es_EC.js @@ -0,0 +1,42 @@ +OC.L10N.register( + "richdocuments", + { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +}, +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es_EC.json b/l10n/es_EC.json new file mode 100644 index 00000000..625baa29 --- /dev/null +++ b/l10n/es_EC.json @@ -0,0 +1,40 @@ +{ "translations": { + "Saving…" : "Guardando...", + "Saving..." : "Guardando...", + "All" : "Todos", + "Download this revision" : "Descargar esta revisión", + "Restore this revision" : "Restaurar esta revisión", + "Latest revision" : "Última revisión", + "More versions…" : "Más versiones...", + "Just now" : "Justo ahora", + "Failed to revert the document to older version" : "Se presentó una falla al revertir el documento a la versión anterior", + "Save" : "Guardar", + "Loading documents…" : "Cargando documentos...", + "Edit" : "Editar", + "New Document" : "Nuevo Documento", + "New Spreadsheet" : "Nueva Hoja de cálculo", + "New Presentation" : "Nueva Presentación", + "Could not create file" : "No fue posible crear el archivo", + "New Document.odt" : "Nuevo Documento.odt", + "New Spreadsheet.ods" : "Nueva HojaDeCálculo.ods", + "New Presentation.odp" : "Nueva Presentación.odp", + "New Document.docx" : "Nuevo Documento.docx", + "New Spreadsheet.xlsx" : "Nueva HojaDeCálculo.xlsx", + "New Presentation.pptx" : "Nueva Presentación.pptx", + "Can't create document" : "No es posible crear el documento", + "Saved" : "Guardado", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardado con error: Collabora Online debería usar el mismo protocolo que la instalación del servidor.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Servidor Collabora Online", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", + "Apply" : "Aplicar", + "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", + "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", + "Add" : "Guardar", + "Wrong password. Please retry." : "Contraseña incorrecta. Por favor intentalo de nuevo.", + "Password" : "Contraseña", + "OK" : "OK", + "Guest %s" : "Invitado %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "Esta liga ha expirado o nunca existió. Por favor de contacta a la persona que lo compartió contigo para más detalles." +},"pluralForm" :"nplurals=2; plural=(n != 1);" +} \ No newline at end of file diff --git a/l10n/es_MX.js b/l10n/es_MX.js index 5e79bcd1..5ef81c65 100644 --- a/l10n/es_MX.js +++ b/l10n/es_MX.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", "Add" : "Guardar", diff --git a/l10n/es_MX.json b/l10n/es_MX.json index 664b3a90..625baa29 100644 --- a/l10n/es_MX.json +++ b/l10n/es_MX.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (y puerto) del servidor de Collabora Online que provee la funcionalidad de edición como un cliente WOPI. ", "Apply" : "Aplicar", - "Enable edit for specific groups" : "Permitir editar a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML como predeterminado para nuevos archivos", "Enable access for external apps" : "Habilitar acceso para aplicaciones externas", "Add" : "Guardar", diff --git a/l10n/fi.js b/l10n/fi.js index b300514b..cff95fbb 100644 --- a/l10n/fi.js +++ b/l10n/fi.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online -palvelin", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL-osoite (ja portti) Collabora Online -palvelimelle, joka tarjoaa mukkaustoiminnot WOPI-asiakkaana.", "Apply" : "Toteuta", - "Enable edit for specific groups" : "Salli muokkaus tietyille ryhmille", "Use OOXML by default for new files" : "Käytä OOXML:ää oletuksena uusille tiedostoille", "Enable access for external apps" : "Salli pääsy ulkoisten sovellusten osalta", "Add" : "Lisää", diff --git a/l10n/fi.json b/l10n/fi.json index 39bce1d9..473523b8 100644 --- a/l10n/fi.json +++ b/l10n/fi.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online -palvelin", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL-osoite (ja portti) Collabora Online -palvelimelle, joka tarjoaa mukkaustoiminnot WOPI-asiakkaana.", "Apply" : "Toteuta", - "Enable edit for specific groups" : "Salli muokkaus tietyille ryhmille", "Use OOXML by default for new files" : "Käytä OOXML:ää oletuksena uusille tiedostoille", "Enable access for external apps" : "Salli pääsy ulkoisten sovellusten osalta", "Add" : "Lisää", diff --git a/l10n/fr.js b/l10n/fr.js index c5b02f27..abefdc8e 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Serveur Collabora en ligne", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Adresse (et port) du serveur Collabora en ligne qui fourni la fonctionnalité d'édition comme un client WOPI.", "Apply" : "Appliquer", - "Enable edit for specific groups" : "Activer les modifications pour certains groupes", "Use OOXML by default for new files" : "Utiliser le format OOXML par défaut pour les nouveaux fichiers", "Enable access for external apps" : "Activer l'accès depuis des applications externes", "Add" : "Ajouter", diff --git a/l10n/fr.json b/l10n/fr.json index 0eb88fc4..5a0c4208 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Serveur Collabora en ligne", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Adresse (et port) du serveur Collabora en ligne qui fourni la fonctionnalité d'édition comme un client WOPI.", "Apply" : "Appliquer", - "Enable edit for specific groups" : "Activer les modifications pour certains groupes", "Use OOXML by default for new files" : "Utiliser le format OOXML par défaut pour les nouveaux fichiers", "Enable access for external apps" : "Activer l'accès depuis des applications externes", "Add" : "Ajouter", diff --git a/l10n/hu.js b/l10n/hu.js index 49cdb56a..671b8673 100644 --- a/l10n/hu.js +++ b/l10n/hu.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online kiszolgáló", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "A Collabora Online kiszolgáló URL-je (és portja), amely WOPI-ügyfélként lehetővé teszi a szerkesztés funkciót.", "Apply" : "Alkalmaz", - "Enable edit for specific groups" : "Szerkesztés engedélyezése egyes csoportok számára ", "Use OOXML by default for new files" : "OOXML használata alapértelmezettként az új fájlokhoz", "Enable access for external apps" : "Külső alkalmazások hozzáférésének engedélyezése", "Add" : "Hozzáadás", diff --git a/l10n/hu.json b/l10n/hu.json index acff6512..4dd7e78c 100644 --- a/l10n/hu.json +++ b/l10n/hu.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online kiszolgáló", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "A Collabora Online kiszolgáló URL-je (és portja), amely WOPI-ügyfélként lehetővé teszi a szerkesztés funkciót.", "Apply" : "Alkalmaz", - "Enable edit for specific groups" : "Szerkesztés engedélyezése egyes csoportok számára ", "Use OOXML by default for new files" : "OOXML használata alapértelmezettként az új fájlokhoz", "Enable access for external apps" : "Külső alkalmazások hozzáférésének engedélyezése", "Add" : "Hozzáadás", diff --git a/l10n/is.js b/l10n/is.js index 8f941cf6..d602e522 100644 --- a/l10n/is.js +++ b/l10n/is.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online þjónn", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL-slóð (og gátt) Collabora Online þjónsins sem gefur út breytingaeigindi sem WOPI-biðlari.", "Apply" : "Virkja", - "Enable edit for specific groups" : "Leyfa breytingar fyrir sérstaka hópa", "Use OOXML by default for new files" : "Nota OOXML sjálfgefið fyrir nýjar skrár", "Enable access for external apps" : "Virkja fyrir utanaðkomandi forrit", "Add" : "Bæta við", diff --git a/l10n/is.json b/l10n/is.json index 96b2accd..50f2c0d0 100644 --- a/l10n/is.json +++ b/l10n/is.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online þjónn", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL-slóð (og gátt) Collabora Online þjónsins sem gefur út breytingaeigindi sem WOPI-biðlari.", "Apply" : "Virkja", - "Enable edit for specific groups" : "Leyfa breytingar fyrir sérstaka hópa", "Use OOXML by default for new files" : "Nota OOXML sjálfgefið fyrir nýjar skrár", "Enable access for external apps" : "Virkja fyrir utanaðkomandi forrit", "Add" : "Bæta við", diff --git a/l10n/it.js b/l10n/it.js index fa0840b4..00dfe451 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Server Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "L'URL (e la porta) del server Collabora Online che fornisce la funzionalità di modifica come un client WOPI.", "Apply" : "Applica", - "Enable edit for specific groups" : "Abilita la modifica per gruppi specifici", "Use OOXML by default for new files" : "Utilizza OOXML in modo predefinito per i nuovi file", "Enable access for external apps" : "Abilita l'accesso per le applicazioni esterne", "Add" : "Aggiungi", diff --git a/l10n/it.json b/l10n/it.json index a308b9e7..d89ddf11 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Server Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "L'URL (e la porta) del server Collabora Online che fornisce la funzionalità di modifica come un client WOPI.", "Apply" : "Applica", - "Enable edit for specific groups" : "Abilita la modifica per gruppi specifici", "Use OOXML by default for new files" : "Utilizza OOXML in modo predefinito per i nuovi file", "Enable access for external apps" : "Abilita l'accesso per le applicazioni esterne", "Add" : "Aggiungi", diff --git a/l10n/ja.js b/l10n/ja.js index c7b3a3ad..65a831ec 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "コラボラ オンライン サーバー", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "WOPI クライアントで編集できる機能を提供するコラボラ オンライン サーバーのURL(とポート)", "Apply" : "適用", - "Enable edit for specific groups" : "特定のグループの編集を有効にする", "Use OOXML by default for new files" : "新しいファイルでは、デフォルトでOOXMLを使用する", "Wrong password. Please retry." : "パスワードが間違っています。もう一度入力してください。", "Password" : "パスワード", diff --git a/l10n/ja.json b/l10n/ja.json index 2ec26351..ea6d452e 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -28,7 +28,6 @@ "Collabora Online server" : "コラボラ オンライン サーバー", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "WOPI クライアントで編集できる機能を提供するコラボラ オンライン サーバーのURL(とポート)", "Apply" : "適用", - "Enable edit for specific groups" : "特定のグループの編集を有効にする", "Use OOXML by default for new files" : "新しいファイルでは、デフォルトでOOXMLを使用する", "Wrong password. Please retry." : "パスワードが間違っています。もう一度入力してください。", "Password" : "パスワード", diff --git a/l10n/nb.js b/l10n/nb.js index c9978e4b..095c098c 100644 --- a/l10n/nb.js +++ b/l10n/nb.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online-tjener", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (og port) for den nettbaserte Collabora-tjeneren som tilbyr redigeringsfunksjonaliteten som en WOPI-klient.", "Apply" : "Bruk", - "Enable edit for specific groups" : "Skru på redigering for gitte grupper", "Use OOXML by default for new files" : "Bruk OOXML som forvalg for nye filer", "Enable access for external apps" : "Aktiver tilgang for eksterne programmer", "Add" : "Legg til", diff --git a/l10n/nb.json b/l10n/nb.json index 3714641e..46d6acfe 100644 --- a/l10n/nb.json +++ b/l10n/nb.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online-tjener", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (og port) for den nettbaserte Collabora-tjeneren som tilbyr redigeringsfunksjonaliteten som en WOPI-klient.", "Apply" : "Bruk", - "Enable edit for specific groups" : "Skru på redigering for gitte grupper", "Use OOXML by default for new files" : "Bruk OOXML som forvalg for nye filer", "Enable access for external apps" : "Aktiver tilgang for eksterne programmer", "Add" : "Legg til", diff --git a/l10n/nl.js b/l10n/nl.js index 0189f99c..2038c167 100644 --- a/l10n/nl.js +++ b/l10n/nl.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (en poort) van de Collabora Online server die de bewerkingsfunctie als WOPI client biedt.", "Apply" : "Toepassen", - "Enable edit for specific groups" : "Schakel bewerken in voor bepaalde groepen", "Use OOXML by default for new files" : "Gebruik standaard OOXML voor nieuwe bestanden", "Enable access for external apps" : "Toegang vanuit externe apps toestaan", "Add" : "Toevoegen", diff --git a/l10n/nl.json b/l10n/nl.json index 2bf4f621..aec9b667 100644 --- a/l10n/nl.json +++ b/l10n/nl.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (en poort) van de Collabora Online server die de bewerkingsfunctie als WOPI client biedt.", "Apply" : "Toepassen", - "Enable edit for specific groups" : "Schakel bewerken in voor bepaalde groepen", "Use OOXML by default for new files" : "Gebruik standaard OOXML voor nieuwe bestanden", "Enable access for external apps" : "Toegang vanuit externe apps toestaan", "Add" : "Toevoegen", diff --git a/l10n/pl.js b/l10n/pl.js index d9ea05c8..ce8f3b92 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Serwer Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Adres URL (i port) serwera Collabora Online, który dostarcza funkcjonalność edycji jako WOPI klient", "Apply" : "Zastosuj", - "Enable edit for specific groups" : "Włącz edycję tylko dla określonych grup", "Use OOXML by default for new files" : "Użyj domyślnie dla nowych plików OOXML", "Enable access for external apps" : "Aktywuj dostęp dla zewnętrznych aplikacji", "Add" : "Dodaj", diff --git a/l10n/pl.json b/l10n/pl.json index 91667cdd..d5d6df81 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Serwer Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Adres URL (i port) serwera Collabora Online, który dostarcza funkcjonalność edycji jako WOPI klient", "Apply" : "Zastosuj", - "Enable edit for specific groups" : "Włącz edycję tylko dla określonych grup", "Use OOXML by default for new files" : "Użyj domyślnie dla nowych plików OOXML", "Enable access for external apps" : "Aktywuj dostęp dla zewnętrznych aplikacji", "Add" : "Dodaj", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 1bf61041..abb4df16 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (e porto) do servidor Collabora Online que fornece a funcionalidade de edição como um cliente WOPI.", "Apply" : "Aplicar", - "Enable edit for specific groups" : "habilitar edição para grupos específicos", "Use OOXML by default for new files" : "Use OOXML por padrão para novos arquivos", "Enable access for external apps" : "Habilitar acesso a aplicativos externos", "Add" : "Adicionar", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 92c3c82f..65391ba8 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (e porto) do servidor Collabora Online que fornece a funcionalidade de edição como um cliente WOPI.", "Apply" : "Aplicar", - "Enable edit for specific groups" : "habilitar edição para grupos específicos", "Use OOXML by default for new files" : "Use OOXML por padrão para novos arquivos", "Enable access for external apps" : "Habilitar acesso a aplicativos externos", "Add" : "Adicionar", diff --git a/l10n/ru.js b/l10n/ru.js index 0edaa255..d93e3de4 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Сервер Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (и порт) сервера Collabora Online, который предоставляет возможность редактирования, как клиент WOPI.", "Apply" : "Применить", - "Enable edit for specific groups" : "Включить редактирование только для указанных групп", "Use OOXML by default for new files" : "Для новых файлов по умолчанию использовать OOXML", "Enable access for external apps" : "Разрешить доступ внешним приложениям", "Add" : "Добавить", diff --git a/l10n/ru.json b/l10n/ru.json index 66132b8b..a164856e 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Сервер Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (и порт) сервера Collabora Online, который предоставляет возможность редактирования, как клиент WOPI.", "Apply" : "Применить", - "Enable edit for specific groups" : "Включить редактирование только для указанных групп", "Use OOXML by default for new files" : "Для новых файлов по умолчанию использовать OOXML", "Enable access for external apps" : "Разрешить доступ внешним приложениям", "Add" : "Добавить", diff --git a/l10n/sq.js b/l10n/sq.js index 761e04fe..57512491 100644 --- a/l10n/sq.js +++ b/l10n/sq.js @@ -29,7 +29,6 @@ OC.L10N.register( "Collabora Online server" : "Server Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL-ja (dhe porta) e shërbyesit Collabora Online që ofron funksione përpunimi si klient WOPI.", "Apply" : "Zbatoje", - "Enable edit for specific groups" : "Mundëso editimin për grupe specifike", "Use OOXML by default for new files" : "Si parazgjedhje, përdor OOXML për kartela të reja", "Wrong password. Please retry." : "Fjalëkalim gabuar. Ju lutemi, riprovoni.", "Password" : "Fjalëkalim", diff --git a/l10n/sq.json b/l10n/sq.json index 578af272..eb59b4bf 100644 --- a/l10n/sq.json +++ b/l10n/sq.json @@ -27,7 +27,6 @@ "Collabora Online server" : "Server Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL-ja (dhe porta) e shërbyesit Collabora Online që ofron funksione përpunimi si klient WOPI.", "Apply" : "Zbatoje", - "Enable edit for specific groups" : "Mundëso editimin për grupe specifike", "Use OOXML by default for new files" : "Si parazgjedhje, përdor OOXML për kartela të reja", "Wrong password. Please retry." : "Fjalëkalim gabuar. Ju lutemi, riprovoni.", "Password" : "Fjalëkalim", diff --git a/l10n/sr.js b/l10n/sr.js index 0ff85fdd..5253cd6c 100644 --- a/l10n/sr.js +++ b/l10n/sr.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online сервер", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Адреса (и порт) Collabora Online сервера који омогућава функционалност измене као WOPI клијент.", "Apply" : "Примени", - "Enable edit for specific groups" : "Дозволи измењивање за одређене групе", "Use OOXML by default for new files" : "Користи OOXML као подразумевани за нове фајлове", "Enable access for external apps" : "Дозволи приступ за спољне апликације", "Add" : "Додај", diff --git a/l10n/sr.json b/l10n/sr.json index 7aea7834..cdb7d3cc 100644 --- a/l10n/sr.json +++ b/l10n/sr.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online сервер", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Адреса (и порт) Collabora Online сервера који омогућава функционалност измене као WOPI клијент.", "Apply" : "Примени", - "Enable edit for specific groups" : "Дозволи измењивање за одређене групе", "Use OOXML by default for new files" : "Користи OOXML као подразумевани за нове фајлове", "Enable access for external apps" : "Дозволи приступ за спољне апликације", "Add" : "Додај", diff --git a/l10n/sv.js b/l10n/sv.js index 0ab3ccbc..4f261703 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (och port) av Collabora Online-servern som ger redigeringsfunktioner som WOPI klient.", "Apply" : "Tillämpa", - "Enable edit for specific groups" : "Aktivera ändring för specifika grupper", "Use OOXML by default for new files" : "Använd OOXML som standard för nya filer", "Enable access for external apps" : "Aktivera åtkomst för externa appar", "Add" : "Lägg till", diff --git a/l10n/sv.json b/l10n/sv.json index 1e135f9e..1225c9e3 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (och port) av Collabora Online-servern som ger redigeringsfunktioner som WOPI klient.", "Apply" : "Tillämpa", - "Enable edit for specific groups" : "Aktivera ändring för specifika grupper", "Use OOXML by default for new files" : "Använd OOXML som standard för nya filer", "Enable access for external apps" : "Aktivera åtkomst för externa appar", "Add" : "Lägg till", diff --git a/l10n/tr.js b/l10n/tr.js index 94aa5c0e..40844d31 100644 --- a/l10n/tr.js +++ b/l10n/tr.js @@ -30,7 +30,6 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online sunucusu", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Bir WOPI istemcisi olarak düzenleme işlevi sağlayan Collabora Onlie sunucusunun adresi (ve kapı numarası).", "Apply" : "Uygula", - "Enable edit for specific groups" : "Düzenlemeyi yalnız belirli gruplar için etkinleştir", "Use OOXML by default for new files" : "Yeni dosyalar için varsayılan olarak OOXML kullanılsın", "Enable access for external apps" : "Dış uygulamalara erişilebilsin", "Add" : "Ekle", diff --git a/l10n/tr.json b/l10n/tr.json index 6c809e5c..b3b7c615 100644 --- a/l10n/tr.json +++ b/l10n/tr.json @@ -28,7 +28,6 @@ "Collabora Online server" : "Collabora Online sunucusu", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Bir WOPI istemcisi olarak düzenleme işlevi sağlayan Collabora Onlie sunucusunun adresi (ve kapı numarası).", "Apply" : "Uygula", - "Enable edit for specific groups" : "Düzenlemeyi yalnız belirli gruplar için etkinleştir", "Use OOXML by default for new files" : "Yeni dosyalar için varsayılan olarak OOXML kullanılsın", "Enable access for external apps" : "Dış uygulamalara erişilebilsin", "Add" : "Ekle", diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index d6bc2a16..86bc519e 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -29,7 +29,6 @@ OC.L10N.register( "Collabora Online server" : "在线协作服务器", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "类WOPI客户端提供编辑功能在线协作服务器的网址URL (端口) ", "Apply" : "应用", - "Enable edit for specific groups" : "为特定组群开启编辑功能", "Use OOXML by default for new files" : "为新文件默认使用面向对象XML", "Wrong password. Please retry." : "密码错误，请重新尝试。", "Password" : "密码", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index a5c5117d..dac1355e 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -27,7 +27,6 @@ "Collabora Online server" : "在线协作服务器", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "类WOPI客户端提供编辑功能在线协作服务器的网址URL (端口) ", "Apply" : "应用", - "Enable edit for specific groups" : "为特定组群开启编辑功能", "Use OOXML by default for new files" : "为新文件默认使用面向对象XML", "Wrong password. Please retry." : "密码错误，请重新尝试。", "Password" : "密码", From cec91ab3356e76625a6d5e5da9a17ec75baedf5e Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 7 Nov 2017 10:07:40 +0100 Subject: [PATCH 24/26] Bump version to 1.12.36 --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 8b631a3e..c8376e3f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Collabora Online allows you to to work with all kinds of office documents directly in your browser. This application requires Collabora Cloudsuite to be installed on one of your servers, please read the documentation to learn more about that. Edit office documents directly in your browser. AGPL - 1.12.35 + 1.12.36 Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk https://github.com/nextcloud/richdocuments/issues https://github.com/nextcloud/richdocuments.git From 74f575e48a529c5acb6a59f43f80ad240cdc34ed Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 8 Nov 2017 01:25:51 +0000 Subject: [PATCH 25/26] [tx-robot] updated from transifex --- l10n/de.js | 2 ++ l10n/de.json | 2 ++ l10n/de_DE.js | 2 ++ l10n/de_DE.json | 2 ++ l10n/en_GB.js | 2 ++ l10n/en_GB.json | 2 ++ l10n/es.js | 2 ++ l10n/es.json | 2 ++ l10n/it.js | 2 ++ l10n/it.json | 2 ++ l10n/nl.js | 2 ++ l10n/nl.json | 2 ++ l10n/pt_BR.js | 2 ++ l10n/pt_BR.json | 2 ++ l10n/tr.js | 2 ++ l10n/tr.json | 2 ++ 16 files changed, 32 insertions(+) diff --git a/l10n/de.js b/l10n/de.js index 4dbb5621..14042b44 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", + "Restrict usage to specific groups" : "Verwendung auf bestimmte Gruppen beschränken", + "Restrict edit to specific groups" : "Bearbeitung auf bestimmte Gruppen beschränken", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/de.json b/l10n/de.json index 604747ee..4e8448b8 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", + "Restrict usage to specific groups" : "Verwendung auf bestimmte Gruppen beschränken", + "Restrict edit to specific groups" : "Bearbeitung auf bestimmte Gruppen beschränken", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index c202b2c5..b80facd7 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", + "Restrict usage to specific groups" : "Verwendung auf bestimmte Gruppen beschränken", + "Restrict edit to specific groups" : "Bearbeitung auf bestimmte Gruppen beschränken", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index b0ee395c..950e5f92 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Collabora Online Server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (und Port) des Collabora Online Servers, der als WOPI-Client die Bearbeitungsfunktionalität bereitstellt.", "Apply" : "Anwenden", + "Restrict usage to specific groups" : "Verwendung auf bestimmte Gruppen beschränken", + "Restrict edit to specific groups" : "Bearbeitung auf bestimmte Gruppen beschränken", "Use OOXML by default for new files" : "OOXML als Standard für neue Dateien nutzen", "Enable access for external apps" : "Zugriff auf experimentelle Apps aktivieren", "Add" : "Hinzufügen", diff --git a/l10n/en_GB.js b/l10n/en_GB.js index 357edec3..7951becd 100644 --- a/l10n/en_GB.js +++ b/l10n/en_GB.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.", "Apply" : "Apply", + "Restrict usage to specific groups" : "Restrict usage to specific groups", + "Restrict edit to specific groups" : "Restrict edit to specific groups", "Use OOXML by default for new files" : "Use OOXML by default for new files", "Enable access for external apps" : "Enable access for external apps", "Add" : "Add", diff --git a/l10n/en_GB.json b/l10n/en_GB.json index de2c3dea..bf0cb211 100644 --- a/l10n/en_GB.json +++ b/l10n/en_GB.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.", "Apply" : "Apply", + "Restrict usage to specific groups" : "Restrict usage to specific groups", + "Restrict edit to specific groups" : "Restrict edit to specific groups", "Use OOXML by default for new files" : "Use OOXML by default for new files", "Enable access for external apps" : "Enable access for external apps", "Add" : "Add", diff --git a/l10n/es.js b/l10n/es.js index 7f7c65cf..5bc09fae 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "La dirección URL (y puerto) del servidor Collabora Online que proporciona la funcionalidad de edición es un cliente WOPI.", "Apply" : "Aplicar", + "Restrict usage to specific groups" : "Restringir el uso a grupos específicos", + "Restrict edit to specific groups" : "Restringir la edición a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML de forma predeterminada para nuevos archivos", "Enable access for external apps" : "Permitir acceso a apps externas", "Add" : "Añadir", diff --git a/l10n/es.json b/l10n/es.json index 4c3da753..d16055ab 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "La dirección URL (y puerto) del servidor Collabora Online que proporciona la funcionalidad de edición es un cliente WOPI.", "Apply" : "Aplicar", + "Restrict usage to specific groups" : "Restringir el uso a grupos específicos", + "Restrict edit to specific groups" : "Restringir la edición a grupos específicos", "Use OOXML by default for new files" : "Usar OOXML de forma predeterminada para nuevos archivos", "Enable access for external apps" : "Permitir acceso a apps externas", "Add" : "Añadir", diff --git a/l10n/it.js b/l10n/it.js index 00dfe451..80719998 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Server Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "L'URL (e la porta) del server Collabora Online che fornisce la funzionalità di modifica come un client WOPI.", "Apply" : "Applica", + "Restrict usage to specific groups" : "Limita l'utilizzo a gruppi specifici", + "Restrict edit to specific groups" : "Limita la modifica a gruppi specifici", "Use OOXML by default for new files" : "Utilizza OOXML in modo predefinito per i nuovi file", "Enable access for external apps" : "Abilita l'accesso per le applicazioni esterne", "Add" : "Aggiungi", diff --git a/l10n/it.json b/l10n/it.json index d89ddf11..5a4a15db 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Server Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "L'URL (e la porta) del server Collabora Online che fornisce la funzionalità di modifica come un client WOPI.", "Apply" : "Applica", + "Restrict usage to specific groups" : "Limita l'utilizzo a gruppi specifici", + "Restrict edit to specific groups" : "Limita la modifica a gruppi specifici", "Use OOXML by default for new files" : "Utilizza OOXML in modo predefinito per i nuovi file", "Enable access for external apps" : "Abilita l'accesso per le applicazioni esterne", "Add" : "Aggiungi", diff --git a/l10n/nl.js b/l10n/nl.js index 2038c167..3cc93e46 100644 --- a/l10n/nl.js +++ b/l10n/nl.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (en poort) van de Collabora Online server die de bewerkingsfunctie als WOPI client biedt.", "Apply" : "Toepassen", + "Restrict usage to specific groups" : "Beperk gebruik tot bepaalde groepen", + "Restrict edit to specific groups" : "Beperk bewerken tot bepaalde groepen", "Use OOXML by default for new files" : "Gebruik standaard OOXML voor nieuwe bestanden", "Enable access for external apps" : "Toegang vanuit externe apps toestaan", "Add" : "Toevoegen", diff --git a/l10n/nl.json b/l10n/nl.json index aec9b667..b2587de3 100644 --- a/l10n/nl.json +++ b/l10n/nl.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Collabora Online server", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (en poort) van de Collabora Online server die de bewerkingsfunctie als WOPI client biedt.", "Apply" : "Toepassen", + "Restrict usage to specific groups" : "Beperk gebruik tot bepaalde groepen", + "Restrict edit to specific groups" : "Beperk bewerken tot bepaalde groepen", "Use OOXML by default for new files" : "Gebruik standaard OOXML voor nieuwe bestanden", "Enable access for external apps" : "Toegang vanuit externe apps toestaan", "Add" : "Toevoegen", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index abb4df16..9a6785df 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (e porto) do servidor Collabora Online que fornece a funcionalidade de edição como um cliente WOPI.", "Apply" : "Aplicar", + "Restrict usage to specific groups" : "Uso restrito a grupos específicos", + "Restrict edit to specific groups" : "Edição restrita a grupos específicos", "Use OOXML by default for new files" : "Use OOXML por padrão para novos arquivos", "Enable access for external apps" : "Habilitar acesso a aplicativos externos", "Add" : "Adicionar", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 65391ba8..d0fbda4a 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Servidor Collabora Online", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (e porto) do servidor Collabora Online que fornece a funcionalidade de edição como um cliente WOPI.", "Apply" : "Aplicar", + "Restrict usage to specific groups" : "Uso restrito a grupos específicos", + "Restrict edit to specific groups" : "Edição restrita a grupos específicos", "Use OOXML by default for new files" : "Use OOXML por padrão para novos arquivos", "Enable access for external apps" : "Habilitar acesso a aplicativos externos", "Add" : "Adicionar", diff --git a/l10n/tr.js b/l10n/tr.js index 40844d31..0c74b21e 100644 --- a/l10n/tr.js +++ b/l10n/tr.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online sunucusu", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Bir WOPI istemcisi olarak düzenleme işlevi sağlayan Collabora Onlie sunucusunun adresi (ve kapı numarası).", "Apply" : "Uygula", + "Restrict usage to specific groups" : "Kullanımı belirli gruplarla sınırla", + "Restrict edit to specific groups" : "Düzenlemeyi belirli gruplarla sınırla", "Use OOXML by default for new files" : "Yeni dosyalar için varsayılan olarak OOXML kullanılsın", "Enable access for external apps" : "Dış uygulamalara erişilebilsin", "Add" : "Ekle", diff --git a/l10n/tr.json b/l10n/tr.json index b3b7c615..a8f7886f 100644 --- a/l10n/tr.json +++ b/l10n/tr.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Collabora Online sunucusu", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Bir WOPI istemcisi olarak düzenleme işlevi sağlayan Collabora Onlie sunucusunun adresi (ve kapı numarası).", "Apply" : "Uygula", + "Restrict usage to specific groups" : "Kullanımı belirli gruplarla sınırla", + "Restrict edit to specific groups" : "Düzenlemeyi belirli gruplarla sınırla", "Use OOXML by default for new files" : "Yeni dosyalar için varsayılan olarak OOXML kullanılsın", "Enable access for external apps" : "Dış uygulamalara erişilebilsin", "Add" : "Ekle", From caa84765431df49dee8d2db7f4ba08857bab5b8b Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 9 Nov 2017 01:25:55 +0000 Subject: [PATCH 26/26] [tx-robot] updated from transifex --- l10n/ka_GE.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ l10n/ka_GE.json | 42 ++++++++++++++++++++++++++++++++++++++++++ l10n/sr.js | 2 ++ l10n/sr.json | 2 ++ 4 files changed, 90 insertions(+) create mode 100644 l10n/ka_GE.js create mode 100644 l10n/ka_GE.json diff --git a/l10n/ka_GE.js b/l10n/ka_GE.js new file mode 100644 index 00000000..d0df181c --- /dev/null +++ b/l10n/ka_GE.js @@ -0,0 +1,44 @@ +OC.L10N.register( + "richdocuments", + { + "Saving…" : "მიმდინარეობს შენახვა…", + "Saving..." : "მიმდინარეობს შენახვა…", + "All" : "ყველა", + "Download this revision" : "ამ რევიზიის გადმოწერა", + "Restore this revision" : "ამ რევიზიის აღდგენა", + "Latest revision" : "ბოლო რევიზია", + "More versions…" : "მეტი ვერსიები...", + "Just now" : "ამ წამს", + "Failed to revert the document to older version" : "დოკუმენტის ძველ ვერსიაზე დაბრუნება ვერ მოხერხდა", + "Save" : "შენახვა", + "Loading documents…" : "დოკუემნტების ჩატვირთვა...", + "Edit" : "რედაქტირება", + "New Document" : "ახალი დოკუმენტი", + "New Spreadsheet" : "ახალი ცხრილები", + "New Presentation" : "ახალი პრეზენტაცია", + "Could not create file" : "ფაილი ვერ შეიქმნა", + "New Document.odt" : "ახალი დოკუმენტი.odt", + "New Spreadsheet.ods" : "ახალი ცხრილები.ods", + "New Presentation.odp" : "ახალი პრეზენტაცია.odp", + "New Document.docx" : "ახალი დოკუმენტი.docx", + "New Spreadsheet.xlsx" : "ახალი ცხრილები.xlsx", + "New Presentation.pptx" : "ახალი პრეზენტაცია.pptx", + "Can't create document" : "დოკუმენტი ვერ შეიქმნა", + "Saved" : "შენახულია", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "შენახულია შეცდომით: Collabora Online უნდა იყენებდეს იგივე პროტოკოლს რომელსაც იყენებს სერვერის ინსტალაცია.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Collabora Online სერვერი", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (და პორტი) Collabora Online სერვერისა რომელიც უზრუნველყოფს WOPI client-ის მაგვარ ცვლილების ფუნქციონალს.", + "Apply" : "გამოყენება", + "Restrict usage to specific groups" : "მოხმარების აკრძალვა სპეციფიურ ჯგუფებზე", + "Restrict edit to specific groups" : "ცვლიების აკრძალვა სპეციფიურ ჯგუფებზე", + "Use OOXML by default for new files" : "ახალი ფაილებისთვის OOXML-ის საწყისად გამოყენება.", + "Enable access for external apps" : "დართეთ წვდომა გარე აპლიკაცებზე", + "Add" : "დამატება", + "Wrong password. Please retry." : "არასწორი პაროლი სცადეთ ახლიდან.", + "Password" : "პაროლი", + "OK" : "დიახ", + "Guest %s" : "სტუმარი %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "ამ ბმულს გაუვიდა ვადა ან არც არსებობდა. დეტალებისთვის გთხოვთ დაუკავშირდეთ პიროვნებას ვინც გაგიზიარათ ეს." +}, +"nplurals=1; plural=0;"); diff --git a/l10n/ka_GE.json b/l10n/ka_GE.json new file mode 100644 index 00000000..c4db9f96 --- /dev/null +++ b/l10n/ka_GE.json @@ -0,0 +1,42 @@ +{ "translations": { + "Saving…" : "მიმდინარეობს შენახვა…", + "Saving..." : "მიმდინარეობს შენახვა…", + "All" : "ყველა", + "Download this revision" : "ამ რევიზიის გადმოწერა", + "Restore this revision" : "ამ რევიზიის აღდგენა", + "Latest revision" : "ბოლო რევიზია", + "More versions…" : "მეტი ვერსიები...", + "Just now" : "ამ წამს", + "Failed to revert the document to older version" : "დოკუმენტის ძველ ვერსიაზე დაბრუნება ვერ მოხერხდა", + "Save" : "შენახვა", + "Loading documents…" : "დოკუემნტების ჩატვირთვა...", + "Edit" : "რედაქტირება", + "New Document" : "ახალი დოკუმენტი", + "New Spreadsheet" : "ახალი ცხრილები", + "New Presentation" : "ახალი პრეზენტაცია", + "Could not create file" : "ფაილი ვერ შეიქმნა", + "New Document.odt" : "ახალი დოკუმენტი.odt", + "New Spreadsheet.ods" : "ახალი ცხრილები.ods", + "New Presentation.odp" : "ახალი პრეზენტაცია.odp", + "New Document.docx" : "ახალი დოკუმენტი.docx", + "New Spreadsheet.xlsx" : "ახალი ცხრილები.xlsx", + "New Presentation.pptx" : "ახალი პრეზენტაცია.pptx", + "Can't create document" : "დოკუმენტი ვერ შეიქმნა", + "Saved" : "შენახულია", + "Saved with error: Collabora Online should use the same protocol as the server installation." : "შენახულია შეცდომით: Collabora Online უნდა იყენებდეს იგივე პროტოკოლს რომელსაც იყენებს სერვერის ინსტალაცია.", + "Collabora Online" : "Collabora Online", + "Collabora Online server" : "Collabora Online სერვერი", + "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "URL (და პორტი) Collabora Online სერვერისა რომელიც უზრუნველყოფს WOPI client-ის მაგვარ ცვლილების ფუნქციონალს.", + "Apply" : "გამოყენება", + "Restrict usage to specific groups" : "მოხმარების აკრძალვა სპეციფიურ ჯგუფებზე", + "Restrict edit to specific groups" : "ცვლიების აკრძალვა სპეციფიურ ჯგუფებზე", + "Use OOXML by default for new files" : "ახალი ფაილებისთვის OOXML-ის საწყისად გამოყენება.", + "Enable access for external apps" : "დართეთ წვდომა გარე აპლიკაცებზე", + "Add" : "დამატება", + "Wrong password. Please retry." : "არასწორი პაროლი სცადეთ ახლიდან.", + "Password" : "პაროლი", + "OK" : "დიახ", + "Guest %s" : "სტუმარი %s", + "This link has been expired or is never existed. Please contact the person who shared it with you for details." : "ამ ბმულს გაუვიდა ვადა ან არც არსებობდა. დეტალებისთვის გთხოვთ დაუკავშირდეთ პიროვნებას ვინც გაგიზიარათ ეს." +},"pluralForm" :"nplurals=1; plural=0;" +} \ No newline at end of file diff --git a/l10n/sr.js b/l10n/sr.js index 5253cd6c..a5fde754 100644 --- a/l10n/sr.js +++ b/l10n/sr.js @@ -30,6 +30,8 @@ OC.L10N.register( "Collabora Online server" : "Collabora Online сервер", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Адреса (и порт) Collabora Online сервера који омогућава функционалност измене као WOPI клијент.", "Apply" : "Примени", + "Restrict usage to specific groups" : "Ограничи коришћење на одређене групе", + "Restrict edit to specific groups" : "Ограничи могућност мењања на одређене групе", "Use OOXML by default for new files" : "Користи OOXML као подразумевани за нове фајлове", "Enable access for external apps" : "Дозволи приступ за спољне апликације", "Add" : "Додај", diff --git a/l10n/sr.json b/l10n/sr.json index cdb7d3cc..d84f95be 100644 --- a/l10n/sr.json +++ b/l10n/sr.json @@ -28,6 +28,8 @@ "Collabora Online server" : "Collabora Online сервер", "URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client." : "Адреса (и порт) Collabora Online сервера који омогућава функционалност измене као WOPI клијент.", "Apply" : "Примени", + "Restrict usage to specific groups" : "Ограничи коришћење на одређене групе", + "Restrict edit to specific groups" : "Ограничи могућност мењања на одређене групе", "Use OOXML by default for new files" : "Користи OOXML као подразумевани за нове фајлове", "Enable access for external apps" : "Дозволи приступ за спољне апликације", "Add" : "Додај",