diff options
104 files changed, 363 insertions, 163 deletions
diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php index e4e5595efa1..3acf77e4c44 100644 --- a/apps/encryption/lib/migration.php +++ b/apps/encryption/lib/migration.php @@ -54,6 +54,7 @@ class Migration { public function __destruct() { $this->view->deleteAll('files_encryption/public_keys'); $this->updateFileCache(); + $this->config->deleteAppValue('files_encryption', 'installed_version'); } /** @@ -139,7 +140,6 @@ class Migration { public function updateDB() { // delete left-over from old encryption which is no longer needed - $this->config->deleteAppValue('files_encryption', 'installed_version'); $this->config->deleteAppValue('files_encryption', 'ocsid'); $this->config->deleteAppValue('files_encryption', 'types'); $this->config->deleteAppValue('files_encryption', 'enabled'); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index b6f464bfd29..5fc444e6121 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1123,6 +1123,14 @@ return false; } + // Firewall Blocked request? + if (result.status === 403) { + // Go home + this.changeDirectory('/'); + OC.Notification.show(t('files', 'This operation is forbidden')); + return false; + } + if (result.status === 404) { // go back home this.changeDirectory('/'); @@ -1708,11 +1716,13 @@ if (this._filter && this.fileSummary.summary.totalDirs + this.fileSummary.summary.totalFiles === 0) { this.$el.find('#filestable thead th').addClass('hidden'); this.$el.find('#emptycontent').addClass('hidden'); + $('#searchresults').addClass('filter-empty'); if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) { this.$el.find('.nofilterresults').removeClass('hidden'). find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}, null, {'escape': false})); } } else { + $('#searchresults').removeClass('filter-empty'); this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty); if (!this.$el.find('.mask').exists()) { this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty); diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index 09974a0321d..d1830fefd99 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -43,7 +43,7 @@ OC.L10N.register( "Disconnect storage" : "Desconete o armazenamento", "Unshare" : "Deixar de partilhar", "No permission to delete" : "Não tem permissão para apagar", - "Download" : "Transferir", + "Download" : "Descarregar", "Select" : "Selecionar", "Pending" : "Pendente", "Unable to determine date" : "Impossível determinar a data", diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index 4172185936a..f0d2d6b74de 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -41,7 +41,7 @@ "Disconnect storage" : "Desconete o armazenamento", "Unshare" : "Deixar de partilhar", "No permission to delete" : "Não tem permissão para apagar", - "Download" : "Transferir", + "Download" : "Descarregar", "Select" : "Selecionar", "Pending" : "Pendente", "Unable to determine date" : "Impossível determinar a data", diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index aa44c92792d..6bcef8b6f4f 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -1279,6 +1279,17 @@ describe('OCA.Files.FileList tests', function() { fakeServer.respond(); expect(fileList.getCurrentDirectory()).toEqual('/'); }); + it('switches to root dir when current directory is forbidden', function() { + fakeServer.respondWith(/\/index\.php\/apps\/files\/ajax\/list.php\?dir=%2funexist/, [ + 403, { + "Content-Type": "application/json" + }, + '' + ]); + fileList.changeDirectory('/unexist'); + fakeServer.respond(); + expect(fileList.getCurrentDirectory()).toEqual('/'); + }); it('shows mask before loading file list then hides it at the end', function() { var showMaskStub = sinon.stub(fileList, 'showMask'); var hideMaskStub = sinon.stub(fileList, 'hideMask'); diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index 32db7c48d55..d395470a794 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -1,8 +1,8 @@ OC.L10N.register( "files_external", { - "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов запроса прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", - "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов доступа прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен запроса. Проверьте правильность вашего ключа и секрета Dropbox.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен доступа. Проверьте правильность вашего ключа и секрета Dropbox.", "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.", "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s", "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 8966cac2221..daeda1d8363 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -1,6 +1,6 @@ { "translations": { - "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов запроса прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", - "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Получение токенов доступа прошло не успешно. Проверьте правильность вашего ключа и секрета Dropbox.", + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен запроса. Проверьте правильность вашего ключа и секрета Dropbox.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен доступа. Проверьте правильность вашего ключа и секрета Dropbox.", "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.", "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s", "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s", diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 763cf59aa4c..02a02710a14 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -443,9 +443,12 @@ class AmazonS3 extends \OC\Files\Storage\Common { $path = $this->normalizePath($path); $metadata = array(); - if (!is_null($mtime)) { - $metadata = array('lastmodified' => $mtime); + if (is_null($mtime)) { + $mtime = time(); } + $metadata = [ + 'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime) + ]; $fileType = $this->filetype($path); try { @@ -453,22 +456,24 @@ class AmazonS3 extends \OC\Files\Storage\Common { if ($fileType === 'dir' && ! $this->isRoot($path)) { $path .= '/'; } - $this->getConnection()->copyObject(array( + $this->getConnection()->copyObject([ 'Bucket' => $this->bucket, 'Key' => $this->cleanKey($path), 'Metadata' => $metadata, - 'CopySource' => $this->bucket . '/' . $path - )); + 'CopySource' => $this->bucket . '/' . $path, + 'MetadataDirective' => 'REPLACE', + ]); $this->testTimeout(); } else { $mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path); - $this->getConnection()->putObject(array( + $this->getConnection()->putObject([ 'Bucket' => $this->bucket, 'Key' => $this->cleanKey($path), 'Metadata' => $metadata, 'Body' => '', - 'ContentType' => $mimeType - )); + 'ContentType' => $mimeType, + 'MetadataDirective' => 'REPLACE', + ]); $this->testTimeout(); } } catch (S3Exception $e) { diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 06aecac9c42..d46e907e0c8 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -60,6 +60,8 @@ OC.L10N.register( "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 1e3213113b1..30d6badbb34 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -58,6 +58,8 @@ "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 1536da3b98f..0074bdbecad 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -60,6 +60,9 @@ OC.L10N.register( "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 9ff15fb26da..fef8ebf7b9d 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -58,6 +58,9 @@ "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index 1c1c863a240..4f20489a687 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -60,6 +62,11 @@ OC.L10N.register( "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", - "Federated Cloud" : "Federated σύννεφο" + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 934b6704146..8d5a947f4c2 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -58,6 +60,11 @@ "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", - "Federated Cloud" : "Federated σύννεφο" + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 04a8418f3ea..61ee5c1a61b 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -15,7 +15,7 @@ OC.L10N.register( "Nothing shared yet" : "Rien n'est partagé pour l'instant", "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagez apparaîtront ici", "No shared links" : "Aucun partage par lien", - "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici", + "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagez par lien apparaîtront ici", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?", "Remote share" : "Partage distant", "Remote share password" : "Mot de passe du partage distant", diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index c9f572f8912..a57b1befbcc 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -13,7 +13,7 @@ "Nothing shared yet" : "Rien n'est partagé pour l'instant", "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagez apparaîtront ici", "No shared links" : "Aucun partage par lien", - "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagerez par lien apparaîtront ici", + "Files and folders you share by link will show up here" : "Les fichiers et dossiers que vous partagez par lien apparaîtront ici", "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de {owner}@{remote} ?", "Remote share" : "Partage distant", "Remote share password" : "Mot de passe du partage distant", diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index c4c347b33da..50ea0c28631 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s", "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки", "Shares" : "События обмена файлами", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", @@ -60,6 +62,11 @@ OC.L10N.register( "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Federated Cloud" : "Объединение облачных хранилищ" + "Federated Cloud" : "Объединение облачных хранилищ", + "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", + "Share it:" : "Поделись этим:", + "Add it to your website:" : "Добавь это на свой сайт:", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index c1b3a97d074..9fd69583970 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s", "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки", "Shares" : "События обмена файлами", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", @@ -58,6 +60,11 @@ "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Federated Cloud" : "Объединение облачных хранилищ" + "Federated Cloud" : "Объединение облачных хранилищ", + "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", + "Share it:" : "Поделись этим:", + "Add it to your website:" : "Добавь это на свой сайт:", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php index 94fb473883d..c5d3643f28d 100644 --- a/apps/files_sharing/lib/mountprovider.php +++ b/apps/files_sharing/lib/mountprovider.php @@ -9,6 +9,7 @@ namespace OCA\Files_Sharing; use OC\Files\Filesystem; +use OC\User\NoUserException; use OCA\Files_Sharing\Propagation\PropagationManager; use OCP\Files\Config\IMountProvider; use OCP\Files\Storage\IStorageFactory; @@ -50,8 +51,13 @@ class MountProvider implements IMountProvider { $shares = array_filter($shares, function ($share) { return $share['permissions'] > 0; }); - return array_map(function ($share) use ($user, $storageFactory) { - Filesystem::initMountPoints($share['uid_owner']); + $shares = array_map(function ($share) use ($user, $storageFactory) { + try { + Filesystem::initMountPoints($share['uid_owner']); + } catch(NoUserException $e) { + \OC::$server->getLogger()->warning('The user \'' . $share['uid_owner'] . '\' of share with ID \'' . $share['id'] . '\' can\'t be retrieved.', array('app' => 'files_sharing')); + return null; + } // for updating etags for the share owner when we make changes to this share. $ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']); @@ -68,5 +74,7 @@ class MountProvider implements IMountProvider { $storageFactory ); }, $shares); + // array_filter removes the null values from the array + return array_filter($shares); } } diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 44c6b1dc4b9..d5a6fd5b657 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -888,7 +888,6 @@ class Test_Files_Sharing_Api extends TestCase { $this->assertEquals('1', $newUserShare['permissions']); // update password for link share - $this->assertTrue(empty($linkShare['share_with'])); $params = array(); @@ -913,6 +912,29 @@ class Test_Files_Sharing_Api extends TestCase { $this->assertTrue(is_array($newLinkShare)); $this->assertTrue(!empty($newLinkShare['share_with'])); + // Remove password for link share + $params = array(); + $params['id'] = $linkShare['id']; + $params['_put'] = array(); + $params['_put']['password'] = ''; + + $result = \OCA\Files_Sharing\API\Local::updateShare($params); + + $this->assertTrue($result->succeeded()); + + $items = \OCP\Share::getItemShared('file', $linkShare['file_source']); + + $newLinkShare = null; + foreach ($items as $item) { + if ($item['share_type'] === \OCP\Share::SHARE_TYPE_LINK) { + $newLinkShare = $item; + break; + } + } + + $this->assertTrue(is_array($newLinkShare)); + $this->assertTrue(empty($newLinkShare['share_with'])); + \OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2); diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php index 72018ca68b9..3cc324c2306 100644 --- a/apps/files_versions/download.php +++ b/apps/files_versions/download.php @@ -34,7 +34,7 @@ $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision; $view = new OC\Files\View('/'); -$ftype = $view->getMimeType('/'.$uid.'/files/'.$filename); +$ftype = \OC_Helper::getSecureMimeType($view->getMimeType('/'.$uid.'/files/'.$filename)); header('Content-Type:'.$ftype); OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml index abbf79131b5..755a6d5bfb4 100644 --- a/apps/user_webdavauth/appinfo/info.xml +++ b/apps/user_webdavauth/appinfo/info.xml @@ -1,10 +1,10 @@ <?xml version="1.0"?> <info> <id>user_webdavauth</id> - <name>WebDAV user backend</name> - <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones. + <name>User backend using remote HTTP servers</name> + <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other web server to authenticate. It should return http 200 for right credentials and http 401 for wrong ones. - Attention: This app is not compatible with the LDAP user and group backend. This app is not the webdav interface of ownCloud, if you don't understand what it does then do not enable it.</description> + Attention: This app is not compatible with the LDAP user and group backend. This app is not the WebDAV interface of ownCloud, if you don't understand what it does then do not enable it.</description> <licence>AGPL</licence> <author>Frank Karlitschek</author> <requiremin>4.93</requiremin> diff --git a/autotest.sh b/autotest.sh index 8e99c8f0ca9..46c55edef19 100755 --- a/autotest.sh +++ b/autotest.sh @@ -152,8 +152,8 @@ function execute_tests { DOCKER_CONTAINER_ID=$(docker run -d deepdiver/docker-oracle-xe-11g) DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4) - echo "Waiting 60 seconds for Oracle initialization ... " - sleep 60 + echo "Waiting 120 seconds for Oracle initialization ... " + sleep 120 DATABASEUSER=autotest DATABASENAME='XE' diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php index 6d10714d410..9e5514429ff 100644 --- a/core/command/app/checkcode.php +++ b/core/command/app/checkcode.php @@ -73,6 +73,7 @@ class CheckCode extends Command { $output->writeln('<info>App is compliant - awesome job!</info>'); } else { $output->writeln('<error>App is not compliant</error>'); + return 1; } } } diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 2d6394fea85..cf376148a00 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -39,8 +39,7 @@ class Upgrade extends Command { const ERROR_MAINTENANCE_MODE = 2; const ERROR_UP_TO_DATE = 3; const ERROR_INVALID_ARGUMENTS = 4; - - public $upgradeFailed = false; + const ERROR_FAILURE = 5; /** * @var IConfig @@ -128,10 +127,11 @@ class Upgrade extends Command { $output->writeln('<info>Maintenance mode is kept active</info>'); }); $updater->listen('\OC\Updater', 'updateEnd', - function () use($output, $updateStepEnabled, $self) { + function ($success) use($output, $updateStepEnabled, $self) { $mode = $updateStepEnabled ? 'Update' : 'Update simulation'; - $status = $self->upgradeFailed ? 'failed' : 'successful'; - $message = "<info>$mode $status</info>"; + $status = $success ? 'successful' : 'failed' ; + $type = $success ? 'info' : 'error'; + $message = "<$type>$mode $status</$type>"; $output->writeln($message); }); $updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) { @@ -158,18 +158,24 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) { $output->writeln('<info>Checked database schema update for apps</info>'); }); + $updater->listen('\OC\Updater', 'appUpgradeStarted', function ($app, $version) use ($output) { + $output->writeln("<info>Updating <$app> ...</info>"); + }); $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) { $output->writeln("<info>Updated <$app> to $version</info>"); }); $updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) { $output->writeln("<error>$message</error>"); - $self->upgradeFailed = true; }); - $updater->upgrade(); + $success = $updater->upgrade(); $this->postUpgradeCheck($input, $output); + if(!$success) { + return self::ERROR_FAILURE; + } + return self::ERROR_SUCCESS; } else if($this->config->getSystemValue('maintenance', false)) { //Possible scenario: ownCloud core is updated but an app failed diff --git a/core/css/apps.css b/core/css/apps.css index 57133729f15..af2e85e3b9b 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -410,6 +410,7 @@ position: relative; height: 100%; overflow-y: auto; + z-index: 100; } #app-content-wrapper { @@ -555,4 +556,3 @@ em { z-index:500; padding:16px; } - diff --git a/core/l10n/el.js b/core/l10n/el.js index 2a2e69b7f98..04e49fb4598 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -77,6 +77,8 @@ OC.L10N.register( "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.", "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Έχετε πρόσβαση σε αυτό τον ιστότοπο μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί τη χρήση HTTPS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", "Shared" : "Κοινόχρηστα", "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}", "Share" : "Διαμοιρασμός", diff --git a/core/l10n/el.json b/core/l10n/el.json index e97eac43fc2..9f955c9d385 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -75,6 +75,8 @@ "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.", "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Έχετε πρόσβαση σε αυτό τον ιστότοπο μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί τη χρήση HTTPS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", "Shared" : "Κοινόχρηστα", "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}", "Share" : "Διαμοιρασμός", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index eb0ecdbde72..716a06d3a77 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -44,7 +44,7 @@ OC.L10N.register( "Saving..." : "Enregistrement…", "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", + "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.", "No" : "Non", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 06830b30c09..f3b3ed03592 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -42,7 +42,7 @@ "Saving..." : "Enregistrement…", "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", + "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.", "No" : "Non", diff --git a/core/search/css/results.css b/core/search/css/results.css index 36a2ccc13c3..fd07561d133 100644 --- a/core/search/css/results.css +++ b/core/search/css/results.css @@ -12,6 +12,10 @@ /* account for margin-bottom in files list */ margin-top: -250px; } +#searchresults.filter-empty { + /* remove whitespace on bottom when no search results, to fix layout */ + margin-top: 0 !important; +} #searchresults.hidden { display: none; diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 212deb24b7a..4d991e5d11d 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -365,6 +365,7 @@ class Filesystem { * Initialize system and personal mount points for a user * * @param string $user + * @throws \OC\User\NoUserException if the user is not available */ public static function initMountPoints($user = '') { if ($user == '') { @@ -382,7 +383,7 @@ class Filesystem { if (is_null($userObject)) { \OCP\Util::writeLog('files', ' Backends provided no user object for ' . $user, \OCP\Util::ERROR); - throw new \OC\User\NoUserException(); + throw new \OC\User\NoUserException('Backends provided no user object for ' . $user); } $homeStorage = \OC_Config::getValue('objectstore'); diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 056f823c18b..8d1f80c53c0 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -349,7 +349,8 @@ class Encryption extends Wrapper { if ($this->util->isExcluded($fullPath) === false) { $size = $unencryptedSize = 0; - $targetExists = $this->file_exists($path); + $realFile = $this->util->stripPartialFileExtension($path); + $targetExists = $this->file_exists($realFile); $targetIsEncrypted = false; if ($targetExists) { // in case the file exists we require the explicit module as @@ -605,8 +606,9 @@ class Encryption extends Wrapper { */ protected function getHeader($path) { $header = ''; - if ($this->storage->file_exists($path)) { - $handle = $this->storage->fopen($path, 'r'); + $realFile = $this->util->stripPartialFileExtension($path); + if ($this->storage->file_exists($realFile)) { + $handle = $this->storage->fopen($realFile, 'r'); $firstBlock = fread($handle, $this->util->getHeaderSize()); fclose($handle); if (substr($firstBlock, 0, strlen(Util::HEADER_START)) === Util::HEADER_START) { diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index e2b82b256e5..5f222cbd835 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -117,6 +117,8 @@ return array( 'mpg' => array('video/mpeg', null), 'mpo' => array('image/jpeg', null), 'msi' => array('application/x-msi', null), + 'mts' => ['video/MP2T', null], + 'mt2s' => ['video/MP2T', null], 'nef' => array('image/x-dcraw', null), 'numbers' => array('application/x-iwork-numbers-sffnumbers', null), 'odf' => array('application/vnd.oasis.opendocument.formula', null), @@ -176,7 +178,7 @@ return array( 'wav' => array('audio/wav', null), 'webm' => array('video/webm', null), 'woff' => array('application/font-woff', null), - 'wmv' => array('video/x-ms-asf', null), + 'wmv' => array('video/x-ms-wmv', null), 'xcf' => array('application/x-gimp', null), 'xla' => array('application/vnd.ms-excel', null), 'xlam' => array('application/vnd.ms-excel.addin.macroEnabled.12', null), diff --git a/lib/private/preview.php b/lib/private/preview.php index 145b7924c05..f3599852838 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -701,7 +701,7 @@ class Preview { $this->generatePreview($fileId); } - // We still don't have a preview, so we generate an empty object which can't be displayed + // We still don't have a preview, so we send back an empty object if (is_null($this->preview)) { $this->preview = new \OC_Image(); } @@ -712,22 +712,26 @@ class Preview { /** * Sends the preview, including the headers to client which requested it * - * @param null|string $mimeType + * @param null|string $mimeTypeForHeaders the media type to use when sending back the reply * * @throws NotFoundException */ - public function showPreview($mimeType = null) { + public function showPreview($mimeTypeForHeaders = null) { // Check if file is valid if ($this->isFileValid() === false) { throw new NotFoundException('File not found.'); } - \OCP\Response::enableCaching(3600 * 24); // 24 hours if (is_null($this->preview)) { $this->getPreview(); } if ($this->preview instanceof \OCP\IImage) { - $this->preview->show($mimeType); + if ($this->preview->valid()) { + \OCP\Response::enableCaching(3600 * 24); // 24 hours + } else { + $this->getMimeIcon(); + } + $this->preview->show($mimeTypeForHeaders); } } @@ -812,9 +816,8 @@ class Preview { */ // It turns out the scaled preview is now too big, so we crop the image if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) { - list($newPreviewWidth, $newPreviewHeight) = - $this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight); - $this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight); + $this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight); + $this->storePreview($fileId, $askedWidth, $askedHeight); return; } @@ -822,11 +825,10 @@ class Preview { // At least one dimension of the scaled preview is too small, // so we fill the space with a transparent background if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) { - list($newPreviewWidth, $newPreviewHeight) = - $this->cropAndFill( - $image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight - ); - $this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight); + $this->cropAndFill( + $image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight + ); + $this->storePreview($fileId, $askedWidth, $askedHeight); return; } @@ -894,8 +896,6 @@ class Preview { * @param int $askedHeight * @param int $previewWidth * @param null $previewHeight - * - * @return \int[] */ private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) { $cropX = floor(abs($askedWidth - $previewWidth) * 0.5); @@ -904,8 +904,6 @@ class Preview { $cropY = 0; $image->crop($cropX, $cropY, $askedWidth, $askedHeight); $this->preview = $image; - - return [$askedWidth, $askedHeight]; } /** @@ -917,8 +915,6 @@ class Preview { * @param int $askedHeight * @param int $previewWidth * @param null $previewHeight - * - * @return \int[] */ private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { if ($previewWidth > $askedWidth) { @@ -954,8 +950,6 @@ class Preview { $image = new \OC_Image($backgroundLayer); $this->preview = $image; - - return [$askedWidth, $askedHeight]; } /** @@ -1092,6 +1086,22 @@ class Preview { } /** + * Defines the media icon, for the media type of the original file, as the preview + */ + private function getMimeIcon() { + $image = new \OC_Image(); + $mimeIconWebPath = \OC_Helper::mimetypeIcon($this->mimeType); + if (empty(\OC::$WEBROOT)) { + $mimeIconServerPath = \OC::$SERVERROOT . $mimeIconWebPath; + } else { + $mimeIconServerPath = str_replace(\OC::$WEBROOT, \OC::$SERVERROOT, $mimeIconWebPath); + } + $image->loadFromFile($mimeIconServerPath); + + $this->preview = $image; + } + + /** * Stores the max preview in the cache * * @param string $previewPath path to the preview diff --git a/lib/private/setup.php b/lib/private/setup.php index 7ca30e172ec..1ffe074dc34 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -402,10 +402,20 @@ class Setup { throw new \OC\HintException('.htaccess file has the wrong version. Please upload the correct version. Maybe you forgot to replace it after updating?'); } - $content = "\n"; - $content.= "ErrorDocument 403 ".\OC::$WEBROOT."/core/templates/403.php\n";//custom 403 error page - $content.= "ErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php";//custom 404 error page - @file_put_contents($setupHelper->pathToHtaccess(), $content, FILE_APPEND); //suppress errors in case we don't have permissions for it + $htaccessContent = file_get_contents($setupHelper->pathToHtaccess()); + $content = ''; + if (strpos($htaccessContent, 'ErrorDocument 403') === false) { + //custom 403 error page + $content.= "\nErrorDocument 403 ".\OC::$WEBROOT."/core/templates/403.php"; + } + if (strpos($htaccessContent, 'ErrorDocument 404') === false) { + //custom 404 error page + $content.= "\nErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php"; + } + if ($content !== '') { + //suppress errors in case we don't have permissions for it + @file_put_contents($setupHelper->pathToHtaccess(), $content . "\n", FILE_APPEND); + } } public static function protectDataDirectory() { diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 027c518f9f1..954071fdd6c 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1220,7 +1220,7 @@ class Share extends Constants { $qb->update('`*PREFIX*share`') ->set('`share_with`', ':pass') ->where('`id` = :shareId') - ->setParameter(':pass', is_null($password) ? 'NULL' : \OC::$server->getHasher()->hash($password)) + ->setParameter(':pass', is_null($password) ? null : \OC::$server->getHasher()->hash($password)) ->setParameter(':shareId', $shareId); $qb->execute(); diff --git a/lib/private/updater.php b/lib/private/updater.php index 7f1a493d2a0..00c6569a52f 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -189,20 +189,25 @@ class Updater extends BasicEmitter { $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core')); } + $success = true; try { $this->doUpgrade($currentVersion, $installedVersion); } catch (\Exception $exception) { - $this->emit('\OC\Updater', 'failure', array($exception->getMessage())); + \OCP\Util::logException('update', $exception); + $this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage())); + $success = false; } - $this->emit('\OC\Updater', 'updateEnd'); + $this->emit('\OC\Updater', 'updateEnd', array($success)); - if(!$wasMaintenanceModeEnabled) { + if(!$wasMaintenanceModeEnabled && $success) { $this->config->setSystemValue('maintenance', false); $this->emit('\OC\Updater', 'maintenanceDisabled'); } else { $this->emit('\OC\Updater', 'maintenanceActive'); } + + return $success; } /** @@ -386,6 +391,7 @@ class Updater extends BasicEmitter { foreach ($stacks as $type => $stack) { foreach ($stack as $appId) { if (\OC_App::shouldUpgrade($appId)) { + $this->emit('\OC\Updater', 'appUpgradeStarted', array($appId, \OC_App::getAppVersion($appId))); \OC_App::updateApp($appId); $this->emit('\OC\Updater', 'appUpgrade', array($appId, \OC_App::getAppVersion($appId))); } diff --git a/settings/js/apps.js b/settings/js/apps.js index 2863e86dba8..7849e1b7573 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -119,7 +119,7 @@ OC.Settings.Apps = OC.Settings.Apps || { $('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.')}); $('.app-level .approved').tipsy({fallback: t('settings', 'Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.')}); - $('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install on your own risk.')}); + $('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')}); }, complete: function() { $('#apps-list').removeClass('icon-loading'); diff --git a/settings/l10n/az.js b/settings/l10n/az.js index 6bf40131464..067f6283d61 100644 --- a/settings/l10n/az.js +++ b/settings/l10n/az.js @@ -47,6 +47,7 @@ OC.L10N.register( "Add trusted domain" : "İnamlı domainlərə əlavə et", "Sending..." : "Göndərilir...", "All" : "Hamısı", + "Update to %s" : "Yenilə bunadək %s", "Please wait...." : "Xahiş olunur gözləyəsiniz.", "Error while disabling app" : "Proqram təminatını dayandırdıqda səhv baş verdi", "Disable" : "Dayandır", @@ -161,7 +162,6 @@ OC.L10N.register( "Show description …" : "Açıqlanmanı göstər ...", "Hide description …" : "Açıqlamanı gizlət ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu proqram yüklənə bilməz ona görə ki, göstərilən asılılıqlar yerinə yetirilməyib:", - "Update to %s" : "Yenilə bunadək %s", "Enable only for specific groups" : "Yalnız spesifik qruplara izin ver", "Uninstall App" : "Proqram təminatını sil", "No apps found for your version" : "Sizin versiya üçün proqram tapılmadı", diff --git a/settings/l10n/az.json b/settings/l10n/az.json index 62244170115..1c58a89334b 100644 --- a/settings/l10n/az.json +++ b/settings/l10n/az.json @@ -45,6 +45,7 @@ "Add trusted domain" : "İnamlı domainlərə əlavə et", "Sending..." : "Göndərilir...", "All" : "Hamısı", + "Update to %s" : "Yenilə bunadək %s", "Please wait...." : "Xahiş olunur gözləyəsiniz.", "Error while disabling app" : "Proqram təminatını dayandırdıqda səhv baş verdi", "Disable" : "Dayandır", @@ -159,7 +160,6 @@ "Show description …" : "Açıqlanmanı göstər ...", "Hide description …" : "Açıqlamanı gizlət ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu proqram yüklənə bilməz ona görə ki, göstərilən asılılıqlar yerinə yetirilməyib:", - "Update to %s" : "Yenilə bunadək %s", "Enable only for specific groups" : "Yalnız spesifik qruplara izin ver", "Uninstall App" : "Proqram təminatını sil", "No apps found for your version" : "Sizin versiya üçün proqram tapılmadı", diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js index 705728ef365..c0630a462e7 100644 --- a/settings/l10n/bg_BG.js +++ b/settings/l10n/bg_BG.js @@ -47,6 +47,7 @@ OC.L10N.register( "Add trusted domain" : "Добавяне на сигурен домейн", "Sending..." : "Изпращане...", "All" : "Всички", + "Update to %s" : "Обнови до %s", "Please wait...." : "Моля, изчакайте....", "Error while disabling app" : "Грешка при изключването на приложението", "Disable" : "Изключване", @@ -162,7 +163,6 @@ OC.L10N.register( "Show description …" : "Покажи описание ...", "Hide description …" : "Скрии описание ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Това приложение не може да бъде инсталирано, защото следните зависимости не са удовлетворени:", - "Update to %s" : "Обнови до %s", "Enable only for specific groups" : "Включи само за определени групи", "Uninstall App" : "Премахни Приложението", "No apps found for your version" : "Няма намерени приложения за вашата версия", diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json index 4e21984c104..e46c81f7404 100644 --- a/settings/l10n/bg_BG.json +++ b/settings/l10n/bg_BG.json @@ -45,6 +45,7 @@ "Add trusted domain" : "Добавяне на сигурен домейн", "Sending..." : "Изпращане...", "All" : "Всички", + "Update to %s" : "Обнови до %s", "Please wait...." : "Моля, изчакайте....", "Error while disabling app" : "Грешка при изключването на приложението", "Disable" : "Изключване", @@ -160,7 +161,6 @@ "Show description …" : "Покажи описание ...", "Hide description …" : "Скрии описание ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Това приложение не може да бъде инсталирано, защото следните зависимости не са удовлетворени:", - "Update to %s" : "Обнови до %s", "Enable only for specific groups" : "Включи само за определени групи", "Uninstall App" : "Премахни Приложението", "No apps found for your version" : "Няма намерени приложения за вашата версия", diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js index dfba4566d82..d244a03740b 100644 --- a/settings/l10n/bs.js +++ b/settings/l10n/bs.js @@ -41,6 +41,7 @@ OC.L10N.register( "Add trusted domain" : "Dodaj pouzdanu domenu", "Sending..." : "Slanje...", "All" : "Sve", + "Update to %s" : "Ažuriraj na %s", "Please wait...." : "Molim pričekajte...", "Error while disabling app" : "Greška pri onemogućavanju aplikacije", "Disable" : "Onemogući", @@ -137,7 +138,6 @@ OC.L10N.register( "User Documentation" : "Korisnička Dokumentacija", "Admin Documentation" : "Admin Dokumentacija", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ova aplikacija se ne može instalirati zbog slijedećih neispunjenih ovisnosti:", - "Update to %s" : "Ažuriraj na %s", "Enable only for specific groups" : "Omogućite samo za specifične grupe", "Uninstall App" : "Deinstaliraj aplikaciju", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej,<br><br>samo da javim da sad imate %s račum.<br><br>Vaše korisničko ime: %s<br>Pristupite mu: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json index 5c6f543656f..46e8a4696e7 100644 --- a/settings/l10n/bs.json +++ b/settings/l10n/bs.json @@ -39,6 +39,7 @@ "Add trusted domain" : "Dodaj pouzdanu domenu", "Sending..." : "Slanje...", "All" : "Sve", + "Update to %s" : "Ažuriraj na %s", "Please wait...." : "Molim pričekajte...", "Error while disabling app" : "Greška pri onemogućavanju aplikacije", "Disable" : "Onemogući", @@ -135,7 +136,6 @@ "User Documentation" : "Korisnička Dokumentacija", "Admin Documentation" : "Admin Dokumentacija", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ova aplikacija se ne može instalirati zbog slijedećih neispunjenih ovisnosti:", - "Update to %s" : "Ažuriraj na %s", "Enable only for specific groups" : "Omogućite samo za specifične grupe", "Uninstall App" : "Deinstaliraj aplikaciju", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej,<br><br>samo da javim da sad imate %s račum.<br><br>Vaše korisničko ime: %s<br>Pristupite mu: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 4a328df2fd0..1d3fc13d1b6 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -1,6 +1,8 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Upozornění zabezpečení a nastavení", "Sharing" : "Sdílení", "Server-side encryption" : "Šifrování na serveru", @@ -56,7 +58,7 @@ OC.L10N.register( "All" : "Vše", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "U této aplikace nebyla provedena kontrola bezpečnostních problémů. Aplikace je nová nebo nestabilní. Instalujete na vlastní nebezpečí.", + "Update to %s" : "Aktualizovat na %s", "Please wait...." : "Čekejte prosím...", "Error while disabling app" : "Chyba při zakazování aplikace", "Disable" : "Zakázat", @@ -190,7 +192,6 @@ OC.L10N.register( "Show description …" : "Zobrazit popis ...", "Hide description …" : "Skrýt popis ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:", - "Update to %s" : "Aktualizovat na %s", "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny", "Uninstall App" : "Odinstalovat aplikaci", "Enable experimental apps" : "Povolit experimentální aplikace", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 58ef1a9523f..976c4dc867e 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -1,4 +1,6 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Upozornění zabezpečení a nastavení", "Sharing" : "Sdílení", "Server-side encryption" : "Šifrování na serveru", @@ -54,7 +56,7 @@ "All" : "Vše", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "U této aplikace nebyla provedena kontrola bezpečnostních problémů. Aplikace je nová nebo nestabilní. Instalujete na vlastní nebezpečí.", + "Update to %s" : "Aktualizovat na %s", "Please wait...." : "Čekejte prosím...", "Error while disabling app" : "Chyba při zakazování aplikace", "Disable" : "Zakázat", @@ -188,7 +190,6 @@ "Show description …" : "Zobrazit popis ...", "Hide description …" : "Skrýt popis ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:", - "Update to %s" : "Aktualizovat na %s", "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny", "Uninstall App" : "Odinstalovat aplikaci", "Enable experimental apps" : "Povolit experimentální aplikace", diff --git a/settings/l10n/da.js b/settings/l10n/da.js index c78e53b8e61..3b821dcea00 100644 --- a/settings/l10n/da.js +++ b/settings/l10n/da.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Dette program er ikke undersøgt for sikkerhedsrisici, det er et nyt program som kan være ustabilt. Installer programmet på eget ansvar.", "Update to %s" : "Opdatér til %s", "Please wait...." : "Vent venligst...", "Error while disabling app" : "Kunne ikke deaktivere app", diff --git a/settings/l10n/da.json b/settings/l10n/da.json index a99699cee5f..82a4c87bdc5 100644 --- a/settings/l10n/da.json +++ b/settings/l10n/da.json @@ -60,7 +60,6 @@ "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Dette program er ikke undersøgt for sikkerhedsrisici, det er et nyt program som kan være ustabilt. Installer programmet på eget ansvar.", "Update to %s" : "Opdatér til %s", "Please wait...." : "Vent venligst...", "Error while disabling app" : "Kunne ikke deaktivere app", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 611bea53b9d..e420548b936 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 82d0e966dbd..68045bb7105 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -60,7 +60,6 @@ "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index dbc229b73b6..6d6e7b88409 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 7a145a75c2d..7d0ba38a1a4 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -60,7 +60,6 @@ "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.", "Update to %s" : "Aktualisierung auf %s", "Please wait...." : "Bitte warten…", "Error while disabling app" : "Beim Deaktivieren der App ist ein Fehler aufgetreten", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index e0f85414ccf..195b191479c 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -62,7 +62,7 @@ OC.L10N.register( "All" : "Όλες", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.", + "Update to %s" : "Ενημέρωση σε %s", "Please wait...." : "Παρακαλώ περιμένετε...", "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου", "Disable" : "Απενεργοποίηση", @@ -199,7 +199,6 @@ OC.L10N.register( "Show description …" : "Εμφάνιση περιγραφής", "Hide description …" : "Απόκρυψη περιγραφής", "This app cannot be installed because the following dependencies are not fulfilled:" : "Αυτή η εφαρμογή δεν μπορεί να εγκατασταθεί διότι δεν εκπληρώνονται οι ακόλουθες εξαρτήσεις:", - "Update to %s" : "Ενημέρωση σε %s", "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες", "Uninstall App" : "Απεγκατάσταση Εφαρμογής", "Enable experimental apps" : "Ενεργοποίηση πειραματικών εφαρμογών", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index abf5b07a37c..5be1d59fb44 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -60,7 +60,7 @@ "All" : "Όλες", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.", + "Update to %s" : "Ενημέρωση σε %s", "Please wait...." : "Παρακαλώ περιμένετε...", "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου", "Disable" : "Απενεργοποίηση", @@ -197,7 +197,6 @@ "Show description …" : "Εμφάνιση περιγραφής", "Hide description …" : "Απόκρυψη περιγραφής", "This app cannot be installed because the following dependencies are not fulfilled:" : "Αυτή η εφαρμογή δεν μπορεί να εγκατασταθεί διότι δεν εκπληρώνονται οι ακόλουθες εξαρτήσεις:", - "Update to %s" : "Ενημέρωση σε %s", "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες", "Uninstall App" : "Απεγκατάσταση Εφαρμογής", "Enable experimental apps" : "Ενεργοποίηση πειραματικών εφαρμογών", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index 14a96c3ddb1..b14f36e0154 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -60,7 +60,7 @@ OC.L10N.register( "All" : "All", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install on your own risk.", + "Update to %s" : "Update to %s", "Please wait...." : "Please wait....", "Error while disabling app" : "Error whilst disabling app", "Disable" : "Disable", @@ -196,7 +196,6 @@ OC.L10N.register( "Show description …" : "Show description …", "Hide description …" : "Hide description …", "This app cannot be installed because the following dependencies are not fulfilled:" : "This app cannot be installed because the following dependencies are not fulfilled:", - "Update to %s" : "Update to %s", "Enable only for specific groups" : "Enable only for specific groups", "Uninstall App" : "Uninstall App", "Enable experimental apps" : "Enable experimental apps", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index cd91b5abe82..c86d1417e8f 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -58,7 +58,7 @@ "All" : "All", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install on your own risk.", + "Update to %s" : "Update to %s", "Please wait...." : "Please wait....", "Error while disabling app" : "Error whilst disabling app", "Disable" : "Disable", @@ -194,7 +194,6 @@ "Show description …" : "Show description …", "Hide description …" : "Hide description …", "This app cannot be installed because the following dependencies are not fulfilled:" : "This app cannot be installed because the following dependencies are not fulfilled:", - "Update to %s" : "Update to %s", "Enable only for specific groups" : "Enable only for specific groups", "Uninstall App" : "Uninstall App", "Enable experimental apps" : "Enable experimental apps", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index bf70fd41693..931edc50c23 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Todos", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicaciones oficiales son desarrolladas por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad central con ownCloud y están listas para su uso en producción. ", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas son desarrolladas por desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus mantenedores las consideran estables para un uso normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Esta aplicación no está verificada por problemas de seguridad, es nueva o conocida por ser inestable. Instálela bajo su propio riesgo.", "Update to %s" : "Actualizar a %s", "Please wait...." : "Espere, por favor....", "Error while disabling app" : "Error mientras se desactivaba la aplicación", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index fb02d110cc7..b2cde52259b 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -60,7 +60,6 @@ "All" : "Todos", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicaciones oficiales son desarrolladas por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad central con ownCloud y están listas para su uso en producción. ", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicaciones aprobadas son desarrolladas por desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus mantenedores las consideran estables para un uso normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Esta aplicación no está verificada por problemas de seguridad, es nueva o conocida por ser inestable. Instálela bajo su propio riesgo.", "Update to %s" : "Actualizar a %s", "Please wait...." : "Espere, por favor....", "Error while disabling app" : "Error mientras se desactivaba la aplicación", diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js index 027c1c930bf..e3c8817a814 100644 --- a/settings/l10n/et_EE.js +++ b/settings/l10n/et_EE.js @@ -32,6 +32,7 @@ OC.L10N.register( "Add trusted domain" : "Lis ausaldusväärne domeen", "Sending..." : "Saadan...", "All" : "Kõik", + "Update to %s" : "Uuenda versioonile %s", "Please wait...." : "Palun oota...", "Error while disabling app" : "Viga rakenduse keelamisel", "Disable" : "Lülita välja", @@ -123,7 +124,6 @@ OC.L10N.register( "Documentation:" : "Dokumentatsioon:", "User Documentation" : "Kasutaja dokumentatsioon", "Admin Documentation" : "Admin dokumentatsioon", - "Update to %s" : "Uuenda versioonile %s", "Enable only for specific groups" : "Luba ainult kindlad grupid", "Uninstall App" : "Eemada rakend", "Cheers!" : "Terekest!", diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json index f1cb49e5fc6..50c261cd8c3 100644 --- a/settings/l10n/et_EE.json +++ b/settings/l10n/et_EE.json @@ -30,6 +30,7 @@ "Add trusted domain" : "Lis ausaldusväärne domeen", "Sending..." : "Saadan...", "All" : "Kõik", + "Update to %s" : "Uuenda versioonile %s", "Please wait...." : "Palun oota...", "Error while disabling app" : "Viga rakenduse keelamisel", "Disable" : "Lülita välja", @@ -121,7 +122,6 @@ "Documentation:" : "Dokumentatsioon:", "User Documentation" : "Kasutaja dokumentatsioon", "Admin Documentation" : "Admin dokumentatsioon", - "Update to %s" : "Uuenda versioonile %s", "Enable only for specific groups" : "Luba ainult kindlad grupid", "Uninstall App" : "Eemada rakend", "Cheers!" : "Terekest!", diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js index d0da711e006..a15ee7c0688 100644 --- a/settings/l10n/eu.js +++ b/settings/l10n/eu.js @@ -43,6 +43,7 @@ OC.L10N.register( "Add trusted domain" : "Gehitu domeinu fidagarria", "Sending..." : "Bidaltzen...", "All" : "Denak", + "Update to %s" : "Eguneratu %sra", "Please wait...." : "Itxoin mesedez...", "Error while disabling app" : "Erroea izan da aplikazioa desgaitzerakoan", "Disable" : "Ez-gaitu", @@ -143,7 +144,6 @@ OC.L10N.register( "User Documentation" : "Erabiltzaile dokumentazioa", "Admin Documentation" : "Administrazio dokumentazioa", "This app cannot be installed because the following dependencies are not fulfilled:" : "Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako:", - "Update to %s" : "Eguneratu %sra", "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako", "Uninstall App" : "Desinstalatu aplikazioa", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json index 6cbfc0a9d25..cbbc2361d50 100644 --- a/settings/l10n/eu.json +++ b/settings/l10n/eu.json @@ -41,6 +41,7 @@ "Add trusted domain" : "Gehitu domeinu fidagarria", "Sending..." : "Bidaltzen...", "All" : "Denak", + "Update to %s" : "Eguneratu %sra", "Please wait...." : "Itxoin mesedez...", "Error while disabling app" : "Erroea izan da aplikazioa desgaitzerakoan", "Disable" : "Ez-gaitu", @@ -141,7 +142,6 @@ "User Documentation" : "Erabiltzaile dokumentazioa", "Admin Documentation" : "Administrazio dokumentazioa", "This app cannot be installed because the following dependencies are not fulfilled:" : "Aplikazioa ezin da instalatu hurrengo menpekotasunak betetzen ez direlako:", - "Update to %s" : "Eguneratu %sra", "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako", "Uninstall App" : "Desinstalatu aplikazioa", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Kaixo,<br><br>orain %s kontu bat duzula esateko besterik ez.<br><br>Zure erabiltzailea: %s<br>Sar zaitez: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 32d1cce9f9f..8d81fbcae24 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Kaikki", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvariskien varalta. Se on uusi sovellus tai se jopa mielletään epävakaaksi. Asenna omalla vastuulla.", "Update to %s" : "Päivitä versioon %s", "Please wait...." : "Odota hetki...", "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index 43b211f0e13..fa1834a68ab 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -60,7 +60,6 @@ "All" : "Kaikki", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvariskien varalta. Se on uusi sovellus tai se jopa mielletään epävakaaksi. Asenna omalla vastuulla.", "Update to %s" : "Päivitä versioon %s", "Please wait...." : "Odota hetki...", "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index d64ea32e435..2dfa687a29c 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Tous", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles offrent ses fonctionnalités principales à ownCloud et sont prêtes pour une utilisation en production. ", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les test de sécurité. Elles sont activement maintenues dans un dépôt ouvert et leurs développeurs pensent qu'elles sont stables pour une utilisation normale.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Cette application n'a pas été testée pour sa sécurité, et est nouvelle ou connue comme étant instable. À installer à vos risques et périls.", "Update to %s" : "Mettre à niveau vers la version %s", "Please wait...." : "Veuillez patienter…", "Error while disabling app" : "Erreur lors de la désactivation de l'application", @@ -134,7 +133,7 @@ OC.L10N.register( "Enforce password protection" : "Obliger la protection par mot de passe", "Allow public uploads" : "Autoriser les téléversements publics", "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages", - "Set default expiration date" : "Spécifier la date d'expiration par défaut", + "Set default expiration date" : "Spécifier une date d'expiration par défaut", "Expire after " : "Expiration après ", "days" : "jours", "Enforce expiration date" : "Imposer la date d'expiration", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 4972e23e64b..94949afe9d6 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -60,7 +60,6 @@ "All" : "Tous", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles offrent ses fonctionnalités principales à ownCloud et sont prêtes pour une utilisation en production. ", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les test de sécurité. Elles sont activement maintenues dans un dépôt ouvert et leurs développeurs pensent qu'elles sont stables pour une utilisation normale.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Cette application n'a pas été testée pour sa sécurité, et est nouvelle ou connue comme étant instable. À installer à vos risques et périls.", "Update to %s" : "Mettre à niveau vers la version %s", "Please wait...." : "Veuillez patienter…", "Error while disabling app" : "Erreur lors de la désactivation de l'application", @@ -132,7 +131,7 @@ "Enforce password protection" : "Obliger la protection par mot de passe", "Allow public uploads" : "Autoriser les téléversements publics", "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages", - "Set default expiration date" : "Spécifier la date d'expiration par défaut", + "Set default expiration date" : "Spécifier une date d'expiration par défaut", "Expire after " : "Expiration après ", "days" : "jours", "Enforce expiration date" : "Imposer la date d'expiration", diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js index 25d6388cdfe..f5799b301eb 100644 --- a/settings/l10n/gl.js +++ b/settings/l10n/gl.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Todo", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.", "Update to %s" : "Actualizar a %s", "Please wait...." : "Agarde...", "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación", diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json index 36d7da358b5..c75d19293f2 100644 --- a/settings/l10n/gl.json +++ b/settings/l10n/gl.json @@ -60,7 +60,6 @@ "All" : "Todo", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.", "Update to %s" : "Actualizar a %s", "Please wait...." : "Agarde...", "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index 810141a10c4..f932327f5ad 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -56,7 +56,7 @@ OC.L10N.register( "All" : "Semua", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Aplikasi ini belum diperiksa masalah keamanan dan masih baru atau dikenal tidak stabil. Instal dengan resiko.", + "Update to %s" : "Perbarui ke %s", "Please wait...." : "Mohon tunggu....", "Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi", "Disable" : "Nonaktifkan", @@ -189,7 +189,6 @@ OC.L10N.register( "Show description …" : "Tampilkan deskripsi ...", "Hide description …" : "Sembunyikan deskripsi ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Apl ini tidak dapat diinstal karena ketergantungan berikut belum terpenuhi:", - "Update to %s" : "Perbarui ke %s", "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu", "Uninstall App" : "Copot aplikasi", "Enable experimental apps" : "Aktifkan aplikasi percobaan", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index c8b819a6eb0..3b11766f1ab 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -54,7 +54,7 @@ "All" : "Semua", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Aplikasi ini belum diperiksa masalah keamanan dan masih baru atau dikenal tidak stabil. Instal dengan resiko.", + "Update to %s" : "Perbarui ke %s", "Please wait...." : "Mohon tunggu....", "Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi", "Disable" : "Nonaktifkan", @@ -187,7 +187,6 @@ "Show description …" : "Tampilkan deskripsi ...", "Hide description …" : "Sembunyikan deskripsi ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Apl ini tidak dapat diinstal karena ketergantungan berikut belum terpenuhi:", - "Update to %s" : "Perbarui ke %s", "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu", "Uninstall App" : "Copot aplikasi", "Enable experimental apps" : "Aktifkan aplikasi percobaan", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 69a5de1a841..95d22bbf48d 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Tutti", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.", "Update to %s" : "Aggiornato a %s", "Please wait...." : "Attendere...", "Error while disabling app" : "Errore durante la disattivazione", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index 9bdbd870e38..805e00b8fb2 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -60,7 +60,6 @@ "All" : "Tutti", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.", "Update to %s" : "Aggiornato a %s", "Please wait...." : "Attendere...", "Error while disabling app" : "Errore durante la disattivazione", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index bbd9f75a124..58ce3061523 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -50,6 +50,7 @@ OC.L10N.register( "Add trusted domain" : "信頼するドメイン名に追加", "Sending..." : "送信中…", "All" : "すべて", + "Update to %s" : "%sにアップデート", "Please wait...." : "しばらくお待ちください...", "Error while disabling app" : "アプリ無効化中にエラーが発生", "Disable" : "無効", @@ -168,7 +169,6 @@ OC.L10N.register( "Show description …" : "説明を表示 ...", "Hide description …" : "説明を隠す ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:", - "Update to %s" : "%sにアップデート", "Enable only for specific groups" : "特定のグループのみ有効に", "Uninstall App" : "アプリをアンインストール", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index 065c0fcd43f..0cdbb741d77 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -48,6 +48,7 @@ "Add trusted domain" : "信頼するドメイン名に追加", "Sending..." : "送信中…", "All" : "すべて", + "Update to %s" : "%sにアップデート", "Please wait...." : "しばらくお待ちください...", "Error while disabling app" : "アプリ無効化中にエラーが発生", "Disable" : "無効", @@ -166,7 +167,6 @@ "Show description …" : "説明を表示 ...", "Hide description …" : "説明を隠す ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:", - "Update to %s" : "%sにアップデート", "Enable only for specific groups" : "特定のグループのみ有効に", "Uninstall App" : "アプリをアンインストール", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "こんにちは、<br><br>あなたのアカウント %s が利用可能になったことをお知らせします。<br><br>ユーザー名: %s<br>以下のURLからアクセス: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js index ed045a87e03..4f102e311b7 100644 --- a/settings/l10n/ko.js +++ b/settings/l10n/ko.js @@ -56,7 +56,7 @@ OC.L10N.register( "All" : "모두", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "공식 앱은 ownCloud 커뮤니티 내에서 개발됩니다. ownCloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과하였습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "이 앱은 보안 검사를 통과하지 않았으며 새로 출시되었거나 안정적이지 않은 것으로 알려져 있습니다. 본인 책임 하에 설치하십시오.", + "Update to %s" : "%s(으)로 업데이트", "Please wait...." : "기다려 주십시오....", "Error while disabling app" : "앱을 비활성화하는 중 오류 발생", "Disable" : "사용 안함", @@ -189,7 +189,6 @@ OC.L10N.register( "Show description …" : "설명 보기...", "Hide description …" : "설명 숨기기...", "This app cannot be installed because the following dependencies are not fulfilled:" : "다음 의존성을 만족할 수 없기 때문에 이 앱을 설치할 수 없습니다:", - "Update to %s" : "%s(으)로 업데이트", "Enable only for specific groups" : "특정 그룹에만 허용", "Uninstall App" : "앱 제거", "Enable experimental apps" : "실험적인 앱 사용", diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json index d109840b2a9..93672959d6a 100644 --- a/settings/l10n/ko.json +++ b/settings/l10n/ko.json @@ -54,7 +54,7 @@ "All" : "모두", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "공식 앱은 ownCloud 커뮤니티 내에서 개발됩니다. ownCloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과하였습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "이 앱은 보안 검사를 통과하지 않았으며 새로 출시되었거나 안정적이지 않은 것으로 알려져 있습니다. 본인 책임 하에 설치하십시오.", + "Update to %s" : "%s(으)로 업데이트", "Please wait...." : "기다려 주십시오....", "Error while disabling app" : "앱을 비활성화하는 중 오류 발생", "Disable" : "사용 안함", @@ -187,7 +187,6 @@ "Show description …" : "설명 보기...", "Hide description …" : "설명 숨기기...", "This app cannot be installed because the following dependencies are not fulfilled:" : "다음 의존성을 만족할 수 없기 때문에 이 앱을 설치할 수 없습니다:", - "Update to %s" : "%s(으)로 업데이트", "Enable only for specific groups" : "특정 그룹에만 허용", "Uninstall App" : "앱 제거", "Enable experimental apps" : "실험적인 앱 사용", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index c0d84e63c80..84177b03c37 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offisielle apper utvikles av og innenfor ownCloud-fellesskapet. De tilbyr funksjonalitet som er sentral for ownCloud og er forberedt for produksjonsbruk.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkjente apper er utviklet av pålitelige utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tilfeldig til normal bruk.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.", "Update to %s" : "Oppdater til %s", "Please wait...." : "Vennligst vent...", "Error while disabling app" : "Deaktivering av app feilet", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index 9a7a9a8b973..27cc0a5ccab 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -60,7 +60,6 @@ "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offisielle apper utvikles av og innenfor ownCloud-fellesskapet. De tilbyr funksjonalitet som er sentral for ownCloud og er forberedt for produksjonsbruk.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkjente apper er utviklet av pålitelige utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tilfeldig til normal bruk.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.", "Update to %s" : "Oppdater til %s", "Please wait...." : "Vennligst vent...", "Error while disabling app" : "Deaktivering av app feilet", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index ee2597159a1..19692abdcfd 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -62,7 +62,7 @@ OC.L10N.register( "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw of staat bekend als instabiel. Installatie is op eigen risico.", + "Update to %s" : "Bijgewerkt naar %s", "Please wait...." : "Even geduld a.u.b.", "Error while disabling app" : "Fout tijdens het uitzetten van het programma", "Disable" : "Uitschakelen", @@ -199,7 +199,6 @@ OC.L10N.register( "Show description …" : "Toon beschrijving ...", "Hide description …" : "Verberg beschrijving ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", - "Update to %s" : "Bijgewerkt naar %s", "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren", "Uninstall App" : "De-installeren app", "Enable experimental apps" : "Inschakelen experimentele apps", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index 61239b8f61b..a82297bb149 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -60,7 +60,7 @@ "All" : "Alle", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw of staat bekend als instabiel. Installatie is op eigen risico.", + "Update to %s" : "Bijgewerkt naar %s", "Please wait...." : "Even geduld a.u.b.", "Error while disabling app" : "Fout tijdens het uitzetten van het programma", "Disable" : "Uitschakelen", @@ -197,7 +197,6 @@ "Show description …" : "Toon beschrijving ...", "Hide description …" : "Verberg beschrijving ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:", - "Update to %s" : "Bijgewerkt naar %s", "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren", "Uninstall App" : "De-installeren app", "Enable experimental apps" : "Inschakelen experimentele apps", diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js index 6980231f7a5..d5d8df1fda8 100644 --- a/settings/l10n/oc.js +++ b/settings/l10n/oc.js @@ -56,7 +56,6 @@ OC.L10N.register( "All" : "Totes", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Aquesta aplicacion es pas estada testada per sa seguretat, e es novèla o coneguda coma instabla. D'installar en essent conscient de las riscas.", "Update to %s" : "Metre a nivèl cap a la version %s", "Please wait...." : "Pacientatz…", "Error while disabling app" : "Error al moment de la desactivacion de l'aplicacion", diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json index d6873f15527..27825cb7a4b 100644 --- a/settings/l10n/oc.json +++ b/settings/l10n/oc.json @@ -54,7 +54,6 @@ "All" : "Totes", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Aquesta aplicacion es pas estada testada per sa seguretat, e es novèla o coneguda coma instabla. D'installar en essent conscient de las riscas.", "Update to %s" : "Metre a nivèl cap a la version %s", "Please wait...." : "Pacientatz…", "Error while disabling app" : "Error al moment de la desactivacion de l'aplicacion", diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js index 3f14ebe860d..02195557859 100644 --- a/settings/l10n/pl.js +++ b/settings/l10n/pl.js @@ -44,6 +44,7 @@ OC.L10N.register( "Add trusted domain" : "Dodaj zaufaną domenę", "Sending..." : "Wysyłam...", "All" : "Wszystkie", + "Update to %s" : "Uaktualnij do %s", "Please wait...." : "Proszę czekać...", "Error while disabling app" : "Błąd podczas wyłączania aplikacji", "Disable" : "Wyłącz", @@ -147,7 +148,6 @@ OC.L10N.register( "Show description …" : "Pokaż opis ...", "Hide description …" : "Ukryj opis ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ta aplikacja nie może być zainstalowana, ponieważ nie są spełnione następujące zależności:", - "Update to %s" : "Uaktualnij do %s", "Enable only for specific groups" : "Włącz tylko dla określonych grup", "Uninstall App" : "Odinstaluj aplikację", "Enable experimental apps" : "Włącz eksperymentalne aplikacje", diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json index 92192d49745..e265b226841 100644 --- a/settings/l10n/pl.json +++ b/settings/l10n/pl.json @@ -42,6 +42,7 @@ "Add trusted domain" : "Dodaj zaufaną domenę", "Sending..." : "Wysyłam...", "All" : "Wszystkie", + "Update to %s" : "Uaktualnij do %s", "Please wait...." : "Proszę czekać...", "Error while disabling app" : "Błąd podczas wyłączania aplikacji", "Disable" : "Wyłącz", @@ -145,7 +146,6 @@ "Show description …" : "Pokaż opis ...", "Hide description …" : "Ukryj opis ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ta aplikacja nie może być zainstalowana, ponieważ nie są spełnione następujące zależności:", - "Update to %s" : "Uaktualnij do %s", "Enable only for specific groups" : "Włącz tylko dla określonych grup", "Uninstall App" : "Odinstaluj aplikację", "Enable experimental apps" : "Włącz eksperymentalne aplikacje", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 0d86dea128a..7431234e882 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Todos", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Este aplicativo não está marcado por questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.", "Update to %s" : "Atualizado para %s", "Please wait...." : "Por favor, aguarde...", "Error while disabling app" : "Erro enquanto desabilitava o aplicativo", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index 638af944c73..99a69b87c51 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -60,7 +60,6 @@ "All" : "Todos", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Este aplicativo não está marcado por questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.", "Update to %s" : "Atualizado para %s", "Please wait...." : "Por favor, aguarde...", "Error while disabling app" : "Erro enquanto desabilitava o aplicativo", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 04ab048b2ec..9e2e2c0f9a5 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Все", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они полностью функциональны и готовы к работе.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, а так-же может работать нестабильно. Устанавливайте на свой страх и риск.", "Update to %s" : "Обновить до %s", "Please wait...." : "Пожалуйста подождите...", "Error while disabling app" : "Ошибка при отключении приложения", diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index 75b2d685969..52e4eb8bfa5 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -60,7 +60,6 @@ "All" : "Все", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они полностью функциональны и готовы к работе.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, а так-же может работать нестабильно. Устанавливайте на свой страх и риск.", "Update to %s" : "Обновить до %s", "Please wait...." : "Пожалуйста подождите...", "Error while disabling app" : "Ошибка при отключении приложения", diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js index 47593387c8f..a2c134e5a21 100644 --- a/settings/l10n/sk_SK.js +++ b/settings/l10n/sk_SK.js @@ -1,10 +1,14 @@ OC.L10N.register( "settings", { + "Security & setup warnings" : "Bezpečnosť a nastavenia upozornení", "Sharing" : "Zdieľanie", + "Server-side encryption" : "Šifrovanie na serveri", "External Storage" : "Externé úložisko", "Cron" : "Cron", + "Email server" : "Email server", "Log" : "Záznam", + "Server Status" : "Stav servera", "Tips & tricks" : "Tipy a triky", "Updates" : "Aktualizácie", "Authentication error" : "Chyba autentifikácie", @@ -25,15 +29,19 @@ OC.L10N.register( "Unable to change password" : "Zmena hesla sa nepodarila", "Enabled" : "Povolené", "Not enabled" : "Zakázané", + "A problem occurred, please check your log files (Error: %s)" : "Nastala chyba, skontrolujte prosím váš log súbor (Chyba: %s)", + "Migration Completed" : "Migrácia ukončená", "Group already exists." : "Skupina už existuje.", "Unable to add group." : "Nie je možné pridať skupinu.", "Unable to delete group." : "Nie je možné zmazať skupinu.", "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia", "Saved" : "Uložené", "test email settings" : "nastavenia testovacieho emailu", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia. (Chyba: %s)", "Email sent" : "Email odoslaný", "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj používateľský email, než budete môcť odoslať testovací email.", "Invalid mail address" : "Neplatná emailová adresa", + "A user with that name already exists." : "Používateľ s týmto menom už existuje.", "Unable to create user." : "Nie je možné vytvoriť používateľa.", "Your %s account was created" : "Váš účet %s bol vytvorený", "Unable to delete user." : "Nie je možné zmazať používateľa.", @@ -43,8 +51,11 @@ OC.L10N.register( "Email saved" : "Email uložený", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?", "Add trusted domain" : "Pridať dôveryhodnú doménu", + "Migration in progress. Please wait until the migration is finished" : "Prebieha migrácia. Počkajte prosím, kým sa skončí", + "Migration started …" : "Migrácia spustená ...", "Sending..." : "Odosielam...", "All" : "Všetky", + "Update to %s" : "Aktualizovať na %s", "Please wait...." : "Čakajte prosím...", "Error while disabling app" : "Chyba pri zakázaní aplikácie", "Disable" : "Zakázať", @@ -120,6 +131,7 @@ OC.L10N.register( "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.", + "Start migration" : "Začať migráciu", "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.", "Send mode" : "Mód odosielania", "Encryption" : "Šifrovanie", @@ -150,7 +162,6 @@ OC.L10N.register( "User Documentation" : "Príručka používateľa", "Admin Documentation" : "Príručka administrátora", "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:", - "Update to %s" : "Aktualizovať na %s", "Enable only for specific groups" : "Povoliť len pre vybrané skupiny", "Uninstall App" : "Odinštalovanie aplikácie", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json index b5f94b36612..56b82ade2a3 100644 --- a/settings/l10n/sk_SK.json +++ b/settings/l10n/sk_SK.json @@ -1,8 +1,12 @@ { "translations": { + "Security & setup warnings" : "Bezpečnosť a nastavenia upozornení", "Sharing" : "Zdieľanie", + "Server-side encryption" : "Šifrovanie na serveri", "External Storage" : "Externé úložisko", "Cron" : "Cron", + "Email server" : "Email server", "Log" : "Záznam", + "Server Status" : "Stav servera", "Tips & tricks" : "Tipy a triky", "Updates" : "Aktualizácie", "Authentication error" : "Chyba autentifikácie", @@ -23,15 +27,19 @@ "Unable to change password" : "Zmena hesla sa nepodarila", "Enabled" : "Povolené", "Not enabled" : "Zakázané", + "A problem occurred, please check your log files (Error: %s)" : "Nastala chyba, skontrolujte prosím váš log súbor (Chyba: %s)", + "Migration Completed" : "Migrácia ukončená", "Group already exists." : "Skupina už existuje.", "Unable to add group." : "Nie je možné pridať skupinu.", "Unable to delete group." : "Nie je možné zmazať skupinu.", "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia", "Saved" : "Uložené", "test email settings" : "nastavenia testovacieho emailu", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia. (Chyba: %s)", "Email sent" : "Email odoslaný", "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj používateľský email, než budete môcť odoslať testovací email.", "Invalid mail address" : "Neplatná emailová adresa", + "A user with that name already exists." : "Používateľ s týmto menom už existuje.", "Unable to create user." : "Nie je možné vytvoriť používateľa.", "Your %s account was created" : "Váš účet %s bol vytvorený", "Unable to delete user." : "Nie je možné zmazať používateľa.", @@ -41,8 +49,11 @@ "Email saved" : "Email uložený", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?", "Add trusted domain" : "Pridať dôveryhodnú doménu", + "Migration in progress. Please wait until the migration is finished" : "Prebieha migrácia. Počkajte prosím, kým sa skončí", + "Migration started …" : "Migrácia spustená ...", "Sending..." : "Odosielam...", "All" : "Všetky", + "Update to %s" : "Aktualizovať na %s", "Please wait...." : "Čakajte prosím...", "Error while disabling app" : "Chyba pri zakázaní aplikácie", "Disable" : "Zakázať", @@ -118,6 +129,7 @@ "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.", + "Start migration" : "Začať migráciu", "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.", "Send mode" : "Mód odosielania", "Encryption" : "Šifrovanie", @@ -148,7 +160,6 @@ "User Documentation" : "Príručka používateľa", "Admin Documentation" : "Príručka administrátora", "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:", - "Update to %s" : "Aktualizovať na %s", "Enable only for specific groups" : "Povoliť len pre vybrané skupiny", "Uninstall App" : "Odinštalovanie aplikácie", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js index a18c8b800c8..fa0c2e670ff 100644 --- a/settings/l10n/sr.js +++ b/settings/l10n/sr.js @@ -62,7 +62,7 @@ OC.L10N.register( "All" : "Све", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране и унутар оунКлауд заједнице. Оне пружају главне функционалности и спремне су и стабилне за свакодневну употребу.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Одобрене апликације су развили проверени програмери и апликације су прошле основне безбедносне провере. Оне се активно одржавају у репозиторијуму за апликације отвореног кода и њихови одржаватељи сматрају да су стабилне за уобичајену употребу.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Ова апликација је нова и није проверена по питању безбедности и зна да буде нестабилна. Инсталирате је на сопствену одговорност.", + "Update to %s" : "Ажурирај на %s", "Please wait...." : "Сачекајте…", "Error while disabling app" : "Грешка при искључивању апликације", "Disable" : "Искључи", @@ -199,7 +199,6 @@ OC.L10N.register( "Show description …" : "Прикажи опис…", "Hide description …" : "Сакриј опис…", "This app cannot be installed because the following dependencies are not fulfilled:" : "Апликација се не може инсталирати јер следеће зависности нису испуњене:", - "Update to %s" : "Ажурирај на %s", "Enable only for specific groups" : "Укључи само за одређене групе", "Uninstall App" : "Деинсталирај апликацију", "Enable experimental apps" : "Укључи експерименталне апликације", diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json index 054c3f4bc92..b06019a061f 100644 --- a/settings/l10n/sr.json +++ b/settings/l10n/sr.json @@ -60,7 +60,7 @@ "All" : "Све", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Званичнe апликације су развиjене од стране и унутар оунКлауд заједнице. Оне пружају главне функционалности и спремне су и стабилне за свакодневну употребу.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Одобрене апликације су развили проверени програмери и апликације су прошле основне безбедносне провере. Оне се активно одржавају у репозиторијуму за апликације отвореног кода и њихови одржаватељи сматрају да су стабилне за уобичајену употребу.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Ова апликација је нова и није проверена по питању безбедности и зна да буде нестабилна. Инсталирате је на сопствену одговорност.", + "Update to %s" : "Ажурирај на %s", "Please wait...." : "Сачекајте…", "Error while disabling app" : "Грешка при искључивању апликације", "Disable" : "Искључи", @@ -197,7 +197,6 @@ "Show description …" : "Прикажи опис…", "Hide description …" : "Сакриј опис…", "This app cannot be installed because the following dependencies are not fulfilled:" : "Апликација се не може инсталирати јер следеће зависности нису испуњене:", - "Update to %s" : "Ажурирај на %s", "Enable only for specific groups" : "Укључи само за одређене групе", "Uninstall App" : "Деинсталирај апликацију", "Enable experimental apps" : "Укључи експерименталне апликације", diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js index a898e8796a2..912dc7b375b 100644 --- a/settings/l10n/sv.js +++ b/settings/l10n/sv.js @@ -43,6 +43,7 @@ OC.L10N.register( "Add trusted domain" : "Lägg till betrodd domän", "Sending..." : "Skickar ...", "All" : "Alla", + "Update to %s" : "Uppdatera till %s", "Please wait...." : "Var god vänta ...", "Error while disabling app" : "Fel vid inaktivering av app", "Disable" : "Deaktivera", @@ -142,7 +143,6 @@ OC.L10N.register( "User Documentation" : "Användardokumentation", "Admin Documentation" : "Administratörsdokumentation", "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s", - "Update to %s" : "Uppdatera till %s", "Enable only for specific groups" : "Aktivera endast för specifika grupper", "Uninstall App" : "Avinstallera applikation", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json index 654f005f3a2..4ab1dfce9b1 100644 --- a/settings/l10n/sv.json +++ b/settings/l10n/sv.json @@ -41,6 +41,7 @@ "Add trusted domain" : "Lägg till betrodd domän", "Sending..." : "Skickar ...", "All" : "Alla", + "Update to %s" : "Uppdatera till %s", "Please wait...." : "Var god vänta ...", "Error while disabling app" : "Fel vid inaktivering av app", "Disable" : "Deaktivera", @@ -140,7 +141,6 @@ "User Documentation" : "Användardokumentation", "Admin Documentation" : "Administratörsdokumentation", "This app cannot be installed because the following dependencies are not fulfilled:" : "Denna applikation kan inte installeras då följande beroenden inte är uppfyllda: %s", - "Update to %s" : "Uppdatera till %s", "Enable only for specific groups" : "Aktivera endast för specifika grupper", "Uninstall App" : "Avinstallera applikation", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hej där,<br><br>vill bara informera dig om att du nu har ett %s konto.<br><br>Ditt användarnamn: %s<br>Accessa det genom: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index 0f5b6d4ff2c..754b88dc2c7 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "ทั้งหมด", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "แอพพลิเคชันนี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นของใหม่หรือที่รู้กันคือจะไม่เสถียร มันติดตั้งอยู่บนความเสี่ยงของคุณเอง", "Update to %s" : "อัพเดทไปยัง %s", "Please wait...." : "กรุณารอสักครู่...", "Error while disabling app" : "เกิดข้อผิดพลาดขณะปิดการใช้งานแอพพลิเคชัน", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index b7e595e87c1..5f5928134bb 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -60,7 +60,6 @@ "All" : "ทั้งหมด", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "แอพพลิเคชันนี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นของใหม่หรือที่รู้กันคือจะไม่เสถียร มันติดตั้งอยู่บนความเสี่ยงของคุณเอง", "Update to %s" : "อัพเดทไปยัง %s", "Please wait...." : "กรุณารอสักครู่...", "Error while disabling app" : "เกิดข้อผิดพลาดขณะปิดการใช้งานแอพพลิเคชัน", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index d16e0f49678..47a6aacab13 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -62,7 +62,6 @@ OC.L10N.register( "All" : "Tümü", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.", "Update to %s" : "%s sürümüne güncelle", "Please wait...." : "Lütfen bekleyin....", "Error while disabling app" : "Uygulama devre dışı bırakılırken hata", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index e0e080a08f5..94b16491d42 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -60,7 +60,6 @@ "All" : "Tümü", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.", "Update to %s" : "%s sürümüne güncelle", "Please wait...." : "Lütfen bekleyin....", "Error while disabling app" : "Uygulama devre dışı bırakılırken hata", diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js index 9f9d525c787..6c816bb02f0 100644 --- a/settings/l10n/uk.js +++ b/settings/l10n/uk.js @@ -56,7 +56,7 @@ OC.L10N.register( "All" : "Всі", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні застосунки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшні.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені застосунки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.", + "Update to %s" : "Оновити до %s", "Please wait...." : "Зачекайте, будь ласка...", "Error while disabling app" : "Помилка відключення додатка", "Disable" : "Вимкнути", @@ -182,7 +182,6 @@ OC.L10N.register( "Show description …" : "Показати деталі ...", "Hide description …" : "Сховати деталі ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ця програма не може бути встановлено, так як наступні залежності не будуть виконані:", - "Update to %s" : "Оновити до %s", "Enable only for specific groups" : "Включити тільки для конкретних груп", "Uninstall App" : "Видалити додаток", "Enable experimental apps" : "Увімкнути експериментальні застосунки", diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json index 413ad8f13f2..11d7b4db6dd 100644 --- a/settings/l10n/uk.json +++ b/settings/l10n/uk.json @@ -54,7 +54,7 @@ "All" : "Всі", "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні застосунки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшні.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені застосунки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.", - "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.", + "Update to %s" : "Оновити до %s", "Please wait...." : "Зачекайте, будь ласка...", "Error while disabling app" : "Помилка відключення додатка", "Disable" : "Вимкнути", @@ -180,7 +180,6 @@ "Show description …" : "Показати деталі ...", "Hide description …" : "Сховати деталі ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ця програма не може бути встановлено, так як наступні залежності не будуть виконані:", - "Update to %s" : "Оновити до %s", "Enable only for specific groups" : "Включити тільки для конкретних груп", "Uninstall App" : "Видалити додаток", "Enable experimental apps" : "Увімкнути експериментальні застосунки", diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index 00aab94e012..1eaddf53a11 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -264,6 +264,7 @@ class ObjectTree extends \Test\TestCase { $tree->getNodeForPath($path); } + public function testGetNodeForPathRoot() { $path = '/'; @@ -285,6 +286,6 @@ class ObjectTree extends \Test\TestCase { $tree = new \OC\Connector\Sabre\ObjectTree(); $tree->init($rootNode, $view, $mountManager); - $tree->getNodeForPath($path); + $this->assertInstanceOf('\Sabre\DAV\INode', $tree->getNodeForPath($path)); } } diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 520091df42d..175713de497 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -68,6 +68,17 @@ class Encryption extends \Test\Files\Storage\Storage { */ private $mountManager; + /** + * @var \OC\Group\Manager | \PHPUnit_Framework_MockObject_MockObject + */ + private $groupManager; + + /** + * @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject + */ + private $config; + + /** @var integer dummy unencrypted size */ private $dummySize = -1; @@ -84,14 +95,16 @@ class Encryption extends \Test\Files\Storage\Storage { ->method('getEncryptionModule') ->willReturn($mockModule); - $config = $this->getMockBuilder('\OCP\IConfig') + $this->config = $this->getMockBuilder('\OCP\IConfig') ->disableOriginalConstructor() ->getMock(); - $groupManager = $this->getMockBuilder('\OC\Group\Manager') + $this->groupManager = $this->getMockBuilder('\OC\Group\Manager') ->disableOriginalConstructor() ->getMock(); - $this->util = $this->getMock('\OC\Encryption\Util', ['getUidAndFilename', 'isFile', 'isExcluded'], [new View(), new \OC\User\Manager(), $groupManager, $config]); + $this->util = $this->getMock('\OC\Encryption\Util', + ['getUidAndFilename', 'isFile', 'isExcluded'], + [new View(), new \OC\User\Manager(), $this->groupManager, $this->config]); $this->util->expects($this->any()) ->method('getUidAndFilename') ->willReturnCallback(function ($path) { @@ -365,4 +378,48 @@ class Encryption extends \Test\Files\Storage\Storage { array(false, true), ); } + + /** + * @dataProvider dataTestGetHeader + * @param $path + * @param $strippedPath + */ + public function testGetHeader($path, $strippedPath) { + + $sourceStorage = $this->getMockBuilder('\OC\Files\Storage\Storage') + ->disableOriginalConstructor()->getMock(); + + $util = $this->getMockBuilder('\OC\Encryption\Util') + ->setConstructorArgs([new View(), new \OC\User\Manager(), $this->groupManager, $this->config]) + ->getMock(); + + $instance = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Encryption') + ->setConstructorArgs( + [ + [ + 'storage' => $sourceStorage, + 'root' => 'foo', + 'mountPoint' => '/', + 'mount' => $this->mount + ], + $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + ] + ) + ->getMock(); + + $util->expects($this->once())->method('stripPartialFileExtension') + ->with($path)->willReturn($strippedPath); + $sourceStorage->expects($this->once())->method('file_exists') + ->with($strippedPath)->willReturn(false); + + $this->invokePrivate($instance, 'getHeader', [$path]); + } + + public function dataTestGetHeader() { + return array( + array('/foo/bar.txt', '/foo/bar.txt'), + array('/foo/bar.txt.part', '/foo/bar.txt'), + array('/foo/bar.txt.ocTransferId7437493.part', '/foo/bar.txt'), + ); + } } diff --git a/tests/lib/preview.php b/tests/lib/preview.php index 27410187f43..ca7fa6987d6 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -210,6 +210,26 @@ class Preview extends TestCase { } /** + * Tests if unsupported previews return an empty object + */ + public function testUnsupportedPreviewsReturnEmptyObject() { + $width = 400; + $height = 200; + + // Previews for odt files are not enabled + $imgData = file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.odt'); + $imgPath = '/' . self::TEST_PREVIEW_USER1 . '/files/testimage.odt'; + $this->rootView->file_put_contents($imgPath, $imgData); + + $preview = + new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.odt', $width, $height); + $preview->getPreview(); + $image = $preview->getPreview(); + + $this->assertSame(false, $image->valid()); + } + + /** * We generate the data to use as it makes it easier to adjust in case we need to test * something different * |