diff options
197 files changed, 755 insertions, 290 deletions
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js index c1d13396b8a..5d97843f77c 100644 --- a/apps/encryption/l10n/da.js +++ b/apps/encryption/l10n/da.js @@ -8,22 +8,34 @@ OC.L10N.register( "Could not enable recovery key. Please check your recovery key password!" : "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!", "Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt", "Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!", + "Missing parameters" : "Manglende parametre", "Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen", "Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse", "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse", "Password successfully changed." : "Kodeordet blev ændret succesfuldt", "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.", + "Recovery Key disabled" : "Gendannelsesnøgle er slået fra", "Recovery Key enabled" : "Gendannalsesnøgle aktiv", "Could not enable the recovery key, please try again or contact your administrator" : "Kunne ikke aktivere gendannelsesnøglen, venligst prøv igen eller kontakt din administrator", "Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.", "The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.", "The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.", "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.", + "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.", + "Enable recovery key" : "Aktivér gendannelsesnøgle", + "Disable recovery key" : "Deaktivér gendannelsesnøgle", + "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.", "Recovery key password" : "Gendannelsesnøgle kodeord", + "Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle", "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:", + "Old recovery key password" : "Gammel adgangskode for gendannelsesnøgle", + "New recovery key password" : "Ny adgangskode for gendannelsesnøgle", + "Repeat new recovery key password" : "Gentag ny adgangskode for gendannelsesnøgle", "Change Password" : "Skift Kodeord", "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul", "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.", diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json index 0e66abbd862..d90d030f45b 100644 --- a/apps/encryption/l10n/da.json +++ b/apps/encryption/l10n/da.json @@ -6,22 +6,34 @@ "Could not enable recovery key. Please check your recovery key password!" : "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!", "Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt", "Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!", + "Missing parameters" : "Manglende parametre", "Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen", "Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse", "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse", "Password successfully changed." : "Kodeordet blev ændret succesfuldt", "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.", + "Recovery Key disabled" : "Gendannelsesnøgle er slået fra", "Recovery Key enabled" : "Gendannalsesnøgle aktiv", "Could not enable the recovery key, please try again or contact your administrator" : "Kunne ikke aktivere gendannelsesnøglen, venligst prøv igen eller kontakt din administrator", "Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.", "The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.", "The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.", "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.", + "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.", + "Enable recovery key" : "Aktivér gendannelsesnøgle", + "Disable recovery key" : "Deaktivér gendannelsesnøgle", + "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.", "Recovery key password" : "Gendannelsesnøgle kodeord", + "Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle", "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:", + "Old recovery key password" : "Gammel adgangskode for gendannelsesnøgle", + "New recovery key password" : "Ny adgangskode for gendannelsesnøgle", + "Repeat new recovery key password" : "Gentag ny adgangskode for gendannelsesnøgle", "Change Password" : "Skift Kodeord", "ownCloud basic encryption module" : "ownCloud basis krypteringsmodul", "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.", diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js index 823b4305c0e..13b103dee12 100644 --- a/apps/encryption/l10n/en_GB.js +++ b/apps/encryption/l10n/en_GB.js @@ -21,8 +21,10 @@ OC.L10N.register( "The old password was not correct, please try again." : "The old password was not correct, please try again.", "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.", "Private key password successfully updated." : "Private key password updated successfully.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again", + "Encryption App is enabled and ready" : "Encryption App is enabled and ready", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.", "Enable recovery key" : "Enable recovery key", diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json index 9d5b8b6e6b8..e1d20385f6e 100644 --- a/apps/encryption/l10n/en_GB.json +++ b/apps/encryption/l10n/en_GB.json @@ -19,8 +19,10 @@ "The old password was not correct, please try again." : "The old password was not correct, please try again.", "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.", "Private key password successfully updated." : "Private key password updated successfully.", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again", + "Encryption App is enabled and ready" : "Encryption App is enabled and ready", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.", "Enable recovery key" : "Enable recovery key", diff --git a/apps/encryption/l10n/vi.js b/apps/encryption/l10n/vi.js index 6ba7db83cb2..b9956551622 100644 --- a/apps/encryption/l10n/vi.js +++ b/apps/encryption/l10n/vi.js @@ -1,6 +1,8 @@ OC.L10N.register( "encryption", { + "Missing recovery key password" : "Thiếu khóa khôi phục mật khẩu", + "Please repeat the recovery key password" : "Nhập lại khóa khôi phục mật khẩu", "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công", "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!", "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công", diff --git a/apps/encryption/l10n/vi.json b/apps/encryption/l10n/vi.json index 8d3fd994129..eaaa3d1c038 100644 --- a/apps/encryption/l10n/vi.json +++ b/apps/encryption/l10n/vi.json @@ -1,4 +1,6 @@ { "translations": { + "Missing recovery key password" : "Thiếu khóa khôi phục mật khẩu", + "Please repeat the recovery key password" : "Nhập lại khóa khôi phục mật khẩu", "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công", "Could not enable recovery key. Please check your recovery key password!" : "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!", "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công", diff --git a/apps/encryption/tests/lib/HookManagerTest.php b/apps/encryption/tests/lib/HookManagerTest.php index 3da0bafb691..fb74c05546b 100644 --- a/apps/encryption/tests/lib/HookManagerTest.php +++ b/apps/encryption/tests/lib/HookManagerTest.php @@ -43,7 +43,7 @@ class HookManagerTest extends TestCase { $this->getMock('NotIHook') ]); - $hookInstances = \Test_Helper::invokePrivate(self::$instance, 'hookInstances'); + $hookInstances = self::invokePrivate(self::$instance, 'hookInstances'); // Make sure our type checking works $this->assertCount(2, $hookInstances); } @@ -66,7 +66,7 @@ class HookManagerTest extends TestCase { $mock = $this->getMockBuilder('OCA\Encryption\Hooks\Contracts\IHook')->disableOriginalConstructor()->getMock(); self::$instance->registerHook($mock); - $hookInstances = \Test_Helper::invokePrivate(self::$instance, 'hookInstances'); + $hookInstances = self::invokePrivate(self::$instance, 'hookInstances'); $this->assertCount(3, $hookInstances); } diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php index 6e9c6d15818..eb43d5a843f 100644 --- a/apps/encryption/tests/lib/KeyManagerTest.php +++ b/apps/encryption/tests/lib/KeyManagerTest.php @@ -285,7 +285,7 @@ class KeyManagerTest extends TestCase { ->with('user1', 'privateKey') ->willReturn(true); - $this->assertTrue(\Test_Helper::invokePrivate($this->instance, + $this->assertTrue(self::invokePrivate($this->instance, 'deletePrivateKey', [$this->userId])); } @@ -329,8 +329,8 @@ class KeyManagerTest extends TestCase { }); // set key IDs - \Test_Helper::invokePrivate($this->instance, 'publicShareKeyId', [$publicShareKeyId]); - \Test_Helper::invokePrivate($this->instance, 'recoveryKeyId', [$recoveryKeyId]); + self::invokePrivate($this->instance, 'publicShareKeyId', [$publicShareKeyId]); + self::invokePrivate($this->instance, 'recoveryKeyId', [$recoveryKeyId]); $result = $this->instance->addSystemKeys($accessList, $publicKeys, $uid); diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php index f56ff5cc2f7..c876cea05c9 100644 --- a/apps/encryption/tests/lib/MigrationTest.php +++ b/apps/encryption/tests/lib/MigrationTest.php @@ -292,7 +292,7 @@ class MigrationTest extends \Test\TestCase { public function testUpdateFileCache() { $this->prepareFileCache(); $m = new Migration(\OC::$server->getConfig(), new \OC\Files\View(), \OC::$server->getDatabaseConnection()); - \Test_Helper::invokePrivate($m, 'updateFileCache'); + self::invokePrivate($m, 'updateFileCache'); // check results diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/lib/RecoveryTest.php index 5bfafa3a98e..0b85192690b 100644 --- a/apps/encryption/tests/lib/RecoveryTest.php +++ b/apps/encryption/tests/lib/RecoveryTest.php @@ -180,7 +180,7 @@ class RecoveryTest extends TestCase { $this->keyManagerMock->expects($this->once()) ->method('setAllFileKeys'); - $this->assertNull(\Test_Helper::invokePrivate($this->instance, + $this->assertNull(self::invokePrivate($this->instance, 'recoverFile', ['/', 'testkey', 'admin'])); } diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php index 4114adb115a..f850725108b 100644 --- a/apps/encryption/tests/lib/crypto/cryptTest.php +++ b/apps/encryption/tests/lib/crypto/cryptTest.php @@ -70,7 +70,7 @@ class cryptTest extends TestCase { ->with($this->equalTo('openssl'), $this->equalTo([])) ->willReturn(array()); - $result = \Test_Helper::invokePrivate($this->crypt, 'getOpenSSLConfig'); + $result = self::invokePrivate($this->crypt, 'getOpenSSLConfig'); $this->assertSame(1, count($result)); $this->assertArrayHasKey('private_key_bits', $result); $this->assertSame(4096, $result['private_key_bits']); @@ -86,7 +86,7 @@ class cryptTest extends TestCase { ->with($this->equalTo('openssl'), $this->equalTo([])) ->willReturn(array('foo' => 'bar', 'private_key_bits' => 1028)); - $result = \Test_Helper::invokePrivate($this->crypt, 'getOpenSSLConfig'); + $result = self::invokePrivate($this->crypt, 'getOpenSSLConfig'); $this->assertSame(2, count($result)); $this->assertArrayHasKey('private_key_bits', $result); $this->assertArrayHasKey('foo', $result); @@ -146,7 +146,7 @@ class cryptTest extends TestCase { */ public function testConcatIV() { - $result = \Test_Helper::invokePrivate( + $result = self::invokePrivate( $this->crypt, 'concatIV', array('content', 'my_iv')); @@ -161,7 +161,7 @@ class cryptTest extends TestCase { */ public function testSplitIV() { $data = 'encryptedContent00iv001234567890123456'; - $result = \Test_Helper::invokePrivate($this->crypt, 'splitIV', array($data)); + $result = self::invokePrivate($this->crypt, 'splitIV', array($data)); $this->assertTrue(is_array($result)); $this->assertSame(2, count($result)); $this->assertArrayHasKey('encrypted', $result); @@ -174,7 +174,7 @@ class cryptTest extends TestCase { * test addPadding() */ public function testAddPadding() { - $result = \Test_Helper::invokePrivate($this->crypt, 'addPadding', array('data')); + $result = self::invokePrivate($this->crypt, 'addPadding', array('data')); $this->assertSame('dataxx', $result); } @@ -186,7 +186,7 @@ class cryptTest extends TestCase { * @param $expected */ public function testRemovePadding($data, $expected) { - $result = \Test_Helper::invokePrivate($this->crypt, 'removePadding', array($data)); + $result = self::invokePrivate($this->crypt, 'removePadding', array($data)); $this->assertSame($expected, $result); } @@ -208,7 +208,7 @@ class cryptTest extends TestCase { public function testParseHeader() { $header= 'HBEGIN:foo:bar:cipher:AES-256-CFB:HEND'; - $result = \Test_Helper::invokePrivate($this->crypt, 'parseHeader', array($header)); + $result = self::invokePrivate($this->crypt, 'parseHeader', array($header)); $this->assertTrue(is_array($result)); $this->assertSame(2, count($result)); @@ -227,12 +227,12 @@ class cryptTest extends TestCase { $decrypted = 'content'; $password = 'password'; - $iv = \Test_Helper::invokePrivate($this->crypt, 'generateIv'); + $iv = self::invokePrivate($this->crypt, 'generateIv'); $this->assertTrue(is_string($iv)); $this->assertSame(16, strlen($iv)); - $result = \Test_Helper::invokePrivate($this->crypt, 'encrypt', array($decrypted, $iv, $password)); + $result = self::invokePrivate($this->crypt, 'encrypt', array($decrypted, $iv, $password)); $this->assertTrue(is_string($result)); @@ -251,7 +251,7 @@ class cryptTest extends TestCase { */ public function testDecrypt($data) { - $result = \Test_Helper::invokePrivate( + $result = self::invokePrivate( $this->crypt, 'decrypt', array($data['encrypted'], $data['iv'], $data['password'])); diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php index d33aff877bf..c6c0d57eff5 100644 --- a/apps/encryption/tests/lib/crypto/encryptionTest.php +++ b/apps/encryption/tests/lib/crypto/encryptionTest.php @@ -103,8 +103,8 @@ class EncryptionTest extends TestCase { */ public function endTest() { // prepare internal variables - \Test_Helper::invokePrivate($this->instance, 'isWriteOperation', [true]); - \Test_Helper::invokePrivate($this->instance, 'writeCache', ['']); + self::invokePrivate($this->instance, 'isWriteOperation', [true]); + self::invokePrivate($this->instance, 'writeCache', ['']); $this->keyManagerMock->expects($this->any()) ->method('getPublicKey') @@ -142,7 +142,7 @@ class EncryptionTest extends TestCase { */ public function testGetPathToRealFile($path, $expected) { $this->assertSame($expected, - \Test_Helper::invokePrivate($this->instance, 'getPathToRealFile', array($path)) + self::invokePrivate($this->instance, 'getPathToRealFile', array($path)) ); } @@ -184,9 +184,9 @@ class EncryptionTest extends TestCase { $this->assertArrayHasKey('cipher', $result); $this->assertSame($expected, $result['cipher']); if ($mode === 'w') { - $this->assertTrue(\Test_Helper::invokePrivate($this->instance, 'isWriteOperation')); + $this->assertTrue(self::invokePrivate($this->instance, 'isWriteOperation')); } else { - $this->assertFalse(\Test_Helper::invokePrivate($this->instance, 'isWriteOperation')); + $this->assertFalse(self::invokePrivate($this->instance, 'isWriteOperation')); } } diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js index d0fda488921..c724f5f73ea 100644 --- a/apps/files/l10n/vi.js +++ b/apps/files/l10n/vi.js @@ -1,6 +1,8 @@ OC.L10N.register( "files", { + "Storage not available" : "Lưu trữ không có sẵn", + "Storage invalid" : "Lưu trữ không hợp lệ", "Unknown error" : "Lỗi chưa biết", "Could not move %s - File with this name already exists" : "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống", "Could not move %s" : "Không thể di chuyển %s", @@ -68,6 +70,7 @@ OC.L10N.register( "Upload" : "Tải lên", "Cancel upload" : "Hủy upload", "No entries found in this folder" : "Chưa có mục nào trong thư mục", + "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .", "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ." diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json index e6581323d89..5a4519cf84b 100644 --- a/apps/files/l10n/vi.json +++ b/apps/files/l10n/vi.json @@ -1,4 +1,6 @@ { "translations": { + "Storage not available" : "Lưu trữ không có sẵn", + "Storage invalid" : "Lưu trữ không hợp lệ", "Unknown error" : "Lỗi chưa biết", "Could not move %s - File with this name already exists" : "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống", "Could not move %s" : "Không thể di chuyển %s", @@ -66,6 +68,7 @@ "Upload" : "Tải lên", "Cancel upload" : "Hủy upload", "No entries found in this folder" : "Chưa có mục nào trong thư mục", + "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .", "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ." diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js index 54bf95a774a..bafebbbf879 100644 --- a/apps/files_external/l10n/da.js +++ b/apps/files_external/l10n/da.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Brugernavn som deling", "URL" : "URL", "Secure https://" : "Sikker https://", + "SFTP with secret key login" : "SFTP med hemmelig nøglelogin", "Public key" : "Offentlig nøgle", "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet", "Invalid mount point" : "Fokert monteringspunkt", @@ -53,6 +54,12 @@ OC.L10N.register( "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads", "Personal" : "Personligt", "System" : "System", + "Enable encryption" : "Slå kryptering til", + "Enable previews" : "Slå forhåndsvisninger til", + "Check for changes" : "Tjek for ændringer", + "Never" : "Aldrig", + "Once every direct access" : "Kun ved hver direkte tilgang", + "Every time the filesystem is used" : "Hver gang filsystemet benyttes", "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.", "(group)" : "(gruppe)", "Saved" : "Gemt", diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json index 885d9d63925..663cf93b6ff 100644 --- a/apps/files_external/l10n/da.json +++ b/apps/files_external/l10n/da.json @@ -41,6 +41,7 @@ "Username as share" : "Brugernavn som deling", "URL" : "URL", "Secure https://" : "Sikker https://", + "SFTP with secret key login" : "SFTP med hemmelig nøglelogin", "Public key" : "Offentlig nøgle", "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet", "Invalid mount point" : "Fokert monteringspunkt", @@ -51,6 +52,12 @@ "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads", "Personal" : "Personligt", "System" : "System", + "Enable encryption" : "Slå kryptering til", + "Enable previews" : "Slå forhåndsvisninger til", + "Check for changes" : "Tjek for ændringer", + "Never" : "Aldrig", + "Once every direct access" : "Kun ved hver direkte tilgang", + "Every time the filesystem is used" : "Hver gang filsystemet benyttes", "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.", "(group)" : "(gruppe)", "Saved" : "Gemt", diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js index 55f70ff8cb3..29c1eebb7e3 100644 --- a/apps/files_external/l10n/en_GB.js +++ b/apps/files_external/l10n/en_GB.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Username as share", "URL" : "URL", "Secure https://" : "Secure https://", + "SFTP with secret key login" : "SFTP with secret key login", "Public key" : "Public key", "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found", "Invalid mount point" : "Invalid mount point", @@ -54,6 +55,11 @@ OC.L10N.register( "Personal" : "Personal", "System" : "System", "Enable encryption" : "Enable encryption", + "Enable previews" : "Enable previews", + "Check for changes" : "Check for changes", + "Never" : "Never", + "Once every direct access" : "Once every direct access", + "Every time the filesystem is used" : "Every time the filesystem is used", "All users. Type to select user or group." : "All users. Type to select user or group.", "(group)" : "(group)", "Saved" : "Saved", diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json index 516156c3d91..af3950f8ef0 100644 --- a/apps/files_external/l10n/en_GB.json +++ b/apps/files_external/l10n/en_GB.json @@ -41,6 +41,7 @@ "Username as share" : "Username as share", "URL" : "URL", "Secure https://" : "Secure https://", + "SFTP with secret key login" : "SFTP with secret key login", "Public key" : "Public key", "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found", "Invalid mount point" : "Invalid mount point", @@ -52,6 +53,11 @@ "Personal" : "Personal", "System" : "System", "Enable encryption" : "Enable encryption", + "Enable previews" : "Enable previews", + "Check for changes" : "Check for changes", + "Never" : "Never", + "Once every direct access" : "Once every direct access", + "Every time the filesystem is used" : "Every time the filesystem is used", "All users. Type to select user or group." : "All users. Type to select user or group.", "(group)" : "(group)", "Saved" : "Saved", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index 7f607be5661..187ff2ab899 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -55,6 +55,11 @@ OC.L10N.register( "Personal" : "Personnel", "System" : "Système", "Enable encryption" : "Activer le chiffrement", + "Enable previews" : "Activer les prévisualisations", + "Check for changes" : "Vérifier les changements", + "Never" : "Jamais", + "Once every direct access" : "Une fois à chaque accès direct", + "Every time the filesystem is used" : "Chaque fois que le système de fichiers est utilisé", "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.", "(group)" : "(groupe)", "Saved" : "Sauvegardé", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index 865fbaf8398..fae33b3bea3 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -53,6 +53,11 @@ "Personal" : "Personnel", "System" : "Système", "Enable encryption" : "Activer le chiffrement", + "Enable previews" : "Activer les prévisualisations", + "Check for changes" : "Vérifier les changements", + "Never" : "Jamais", + "Once every direct access" : "Une fois à chaque accès direct", + "Every time the filesystem is used" : "Chaque fois que le système de fichiers est utilisé", "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.", "(group)" : "(groupe)", "Saved" : "Sauvegardé", diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js index 295f48f8f4e..dbfdb3bef6a 100644 --- a/apps/files_external/l10n/nl.js +++ b/apps/files_external/l10n/nl.js @@ -55,6 +55,11 @@ OC.L10N.register( "Personal" : "Persoonlijk", "System" : "Systeem", "Enable encryption" : "Versleuteling inschakelen", + "Enable previews" : "Activeren voorbeelden", + "Check for changes" : "Controleren op wijzigingen", + "Never" : "Nooit", + "Once every direct access" : "Een keer bij elke directe toegang", + "Every time the filesystem is used" : "Elke keer bij gebruik bestandssysteem", "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.", "(group)" : "(groep)", "Saved" : "Bewaard", diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json index 956e1dc638c..b3912b38a18 100644 --- a/apps/files_external/l10n/nl.json +++ b/apps/files_external/l10n/nl.json @@ -53,6 +53,11 @@ "Personal" : "Persoonlijk", "System" : "Systeem", "Enable encryption" : "Versleuteling inschakelen", + "Enable previews" : "Activeren voorbeelden", + "Check for changes" : "Controleren op wijzigingen", + "Never" : "Nooit", + "Once every direct access" : "Een keer bij elke directe toegang", + "Every time the filesystem is used" : "Elke keer bij gebruik bestandssysteem", "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.", "(group)" : "(groep)", "Saved" : "Bewaard", diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js index 789a641114d..1609ac0191c 100644 --- a/apps/files_external/l10n/sr.js +++ b/apps/files_external/l10n/sr.js @@ -55,6 +55,11 @@ OC.L10N.register( "Personal" : "Лично", "System" : "Систем", "Enable encryption" : "Укључи шифровање", + "Enable previews" : "Укључи прегледе", + "Check for changes" : "Провери измене", + "Never" : "никад", + "Once every direct access" : "једном при сваком директном приступу", + "Every time the filesystem is used" : "сваки пут кад се фајл-систем користи", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", "(group)" : "(група)", "Saved" : "Сачувано", diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json index bdb46575fc6..b6a85b1e1b7 100644 --- a/apps/files_external/l10n/sr.json +++ b/apps/files_external/l10n/sr.json @@ -53,6 +53,11 @@ "Personal" : "Лично", "System" : "Систем", "Enable encryption" : "Укључи шифровање", + "Enable previews" : "Укључи прегледе", + "Check for changes" : "Провери измене", + "Never" : "никад", + "Once every direct access" : "једном при сваком директном приступу", + "Every time the filesystem is used" : "сваки пут кад се фајл-систем користи", "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.", "(group)" : "(група)", "Saved" : "Сачувано", diff --git a/apps/files_external/l10n/vi.js b/apps/files_external/l10n/vi.js index 096ab0713cd..9c9405ba2b0 100644 --- a/apps/files_external/l10n/vi.js +++ b/apps/files_external/l10n/vi.js @@ -1,6 +1,8 @@ OC.L10N.register( "files_external", { + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.", "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.", "External storage" : "Lưu trữ ngoài", "Location" : "Vị trí", @@ -16,6 +18,7 @@ OC.L10N.register( "Grant access" : "Cấp quyền truy cập", "Error configuring Google Drive storage" : "Lỗi cấu hình lưu trữ Google Drive", "Personal" : "Cá nhân", + "Saved" : "Đã lưu", "Name" : "Tên", "External Storage" : "Lưu trữ ngoài", "Folder name" : "Tên thư mục", diff --git a/apps/files_external/l10n/vi.json b/apps/files_external/l10n/vi.json index 135f9cffdf4..fa45495d07b 100644 --- a/apps/files_external/l10n/vi.json +++ b/apps/files_external/l10n/vi.json @@ -1,4 +1,6 @@ { "translations": { + "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.", + "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.", "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.", "External storage" : "Lưu trữ ngoài", "Location" : "Vị trí", @@ -14,6 +16,7 @@ "Grant access" : "Cấp quyền truy cập", "Error configuring Google Drive storage" : "Lỗi cấu hình lưu trữ Google Drive", "Personal" : "Cá nhân", + "Saved" : "Đã lưu", "Name" : "Tên", "External Storage" : "Lưu trữ ngoài", "Folder name" : "Tên thư mục", diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index 6e1dbc35fbd..07e76f79c87 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -59,6 +59,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Sammensluttet Cloud deling", "Open documentation" : "Åben dokumentation", "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID: %s" : "Dit ID til Federated Cloud: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index c154b1dd90d..2dcfa35deec 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -57,6 +57,8 @@ "Federated Cloud Sharing" : "Sammensluttet Cloud deling", "Open documentation" : "Åben dokumentation", "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere" + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID: %s" : "Dit ID til Federated Cloud: %s" },"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 9e3cbf9621a..099b0d0bb9c 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -59,6 +59,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", - "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID: %s" : "Το ID σας στο Federated σύννεφο: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 3a796c25ae4..a426c1f9a4d 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -57,6 +57,8 @@ "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", - "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές" + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID: %s" : "Το ID σας στο Federated σύννεφο: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 75956e85025..7f6637fe651 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -59,6 +59,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentation", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", - "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID: %s" : "Your Federated Cloud ID: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index 85d6ac5a2f8..5ec663df415 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -57,6 +57,8 @@ "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentation", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", - "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers" + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID: %s" : "Your Federated Cloud ID: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index e77217a8427..23b437fb128 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -59,6 +59,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Compartido en Cloud Federado", "Open documentation" : "Documentación abierta", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Federated Cloud" : "Nube Federada", + "Your Federated Cloud ID: %s" : "Su ID de nube federada: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index c3c414dcaba..8617fdff5c6 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -57,6 +57,8 @@ "Federated Cloud Sharing" : "Compartido en Cloud Federado", "Open documentation" : "Documentación abierta", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Federated Cloud" : "Nube Federada", + "Your Federated Cloud ID: %s" : "Su ID de nube federada: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 7d9cc87dcba..d4a10b08a5f 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -59,6 +59,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federoitu pilvijakaminen", "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", - "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID: %s" : "Tunnisteesi federoituun pilveen: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index 3c7f40bd76c..c1aef367a20 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -57,6 +57,8 @@ "Federated Cloud Sharing" : "Federoitu pilvijakaminen", "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", - "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta" + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID: %s" : "Tunnisteesi federoituun pilveen: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 11cc0348f34..3b1a3e9586a 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -59,6 +59,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Compartición de nube federada", "Open documentation" : "Abrir a documentación", "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID: %s" : "ID da súa nube federada: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index 01972ddee16..7257898158c 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -57,6 +57,8 @@ "Federated Cloud Sharing" : "Compartición de nube federada", "Open documentation" : "Abrir a documentación", "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID: %s" : "ID da súa nube federada: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 5bebbcfdae0..a602a52bb76 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -59,6 +59,8 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentatie", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", - "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID: %s" : "Uw gefedereerde Cloud ID: %s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index e5d1d7c3a7f..66a38414183 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -57,6 +57,8 @@ "Federated Cloud Sharing" : "Federated Cloud Sharing", "Open documentation" : "Open documentatie", "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", - "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers" + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID: %s" : "Uw gefedereerde Cloud ID: %s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 308cdc4a161..46c16583337 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -56,9 +56,11 @@ OC.L10N.register( "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada", + "Federated Cloud Sharing" : "Compartilhamento de Nuvem Conglomerada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", + "Federated Cloud" : "Nuvem Conglomerada", + "Your Federated Cloud ID: %s" : "ID de sua Nuvem Conglomerada: %s" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 9941074430a..534fe20991e 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -54,9 +54,11 @@ "Download" : "Baixar", "Download %s" : "Baixar %s", "Direct link" : "Link direto", - "Federated Cloud Sharing" : "Núvem de Compartilhamento Federada", + "Federated Cloud Sharing" : "Compartilhamento de Nuvem Conglomerada", "Open documentation" : "Abrir documentação", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores" + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", + "Federated Cloud" : "Nuvem Conglomerada", + "Your Federated Cloud ID: %s" : "ID de sua Nuvem Conglomerada: %s" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/vi.js b/apps/files_sharing/l10n/vi.js index ccefbfacda3..a96969df222 100644 --- a/apps/files_sharing/l10n/vi.js +++ b/apps/files_sharing/l10n/vi.js @@ -1,6 +1,9 @@ OC.L10N.register( "files_sharing", { + "Server to server sharing is not enabled on this server" : "Máy chủ để chia sẻ máy chủ không được kích hoạt trên máy chủ này", + "The mountpoint name contains invalid characters." : "Tên mountpoint chứa các ký tự không hợp lệ.", + "Invalid or untrusted SSL certificate" : "Chứng chỉ SSL không hợp lệ hoặc không đáng tin cậy", "Shared with you" : "Chia sẻ với bạn", "Shared with others" : "Chia sẻ với người khác", "Shared by link" : "Chia sẻ theo liên kết", diff --git a/apps/files_sharing/l10n/vi.json b/apps/files_sharing/l10n/vi.json index 6140ca95cd9..a53d3c9e386 100644 --- a/apps/files_sharing/l10n/vi.json +++ b/apps/files_sharing/l10n/vi.json @@ -1,4 +1,7 @@ { "translations": { + "Server to server sharing is not enabled on this server" : "Máy chủ để chia sẻ máy chủ không được kích hoạt trên máy chủ này", + "The mountpoint name contains invalid characters." : "Tên mountpoint chứa các ký tự không hợp lệ.", + "Invalid or untrusted SSL certificate" : "Chứng chỉ SSL không hợp lệ hoặc không đáng tin cậy", "Shared with you" : "Chia sẻ với bạn", "Shared with others" : "Chia sẻ với người khác", "Shared by link" : "Chia sẻ theo liên kết", diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php index f7b216530d5..df01ea0f738 100644 --- a/apps/files_sharing/tests/external/managertest.php +++ b/apps/files_sharing/tests/external/managertest.php @@ -76,7 +76,7 @@ class ManagerTest extends TestCase { $this->assertCount(1, $openShares); $this->assertExternalShareEntry($shareData1, $openShares[0], 1, '{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertNotMount('SharedFolder'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); @@ -88,7 +88,7 @@ class ManagerTest extends TestCase { // New share falls back to "-1" appendix, because the name is already taken $this->assertExternalShareEntry($shareData2, $openShares[1], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertNotMount('SharedFolder'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -101,7 +101,7 @@ class ManagerTest extends TestCase { $this->manager->acceptShare($openShares[0]['id']); // Check remaining shares - Accepted - $acceptedShares = \Test_Helper::invokePrivate($this->manager, 'getShares', [true]); + $acceptedShares = self::invokePrivate($this->manager, 'getShares', [true]); $this->assertCount(1, $acceptedShares); $shareData1['accepted'] = true; $this->assertExternalShareEntry($shareData1, $acceptedShares[0], 1, $shareData1['name']); @@ -110,7 +110,7 @@ class ManagerTest extends TestCase { $this->assertCount(1, $openShares); $this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -123,7 +123,7 @@ class ManagerTest extends TestCase { // New share falls back to the original name (no "-\d", because the name is not taken) $this->assertExternalShareEntry($shareData3, $openShares[1], 3, '{{TemporaryMountPointName#' . $shareData3['name'] . '}}'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -135,13 +135,13 @@ class ManagerTest extends TestCase { // Decline the third share $this->manager->declineShare($openShares[1]['id']); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); // Check remaining shares - Accepted - $acceptedShares = \Test_Helper::invokePrivate($this->manager, 'getShares', [true]); + $acceptedShares = self::invokePrivate($this->manager, 'getShares', [true]); $this->assertCount(1, $acceptedShares); $shareData1['accepted'] = true; $this->assertExternalShareEntry($shareData1, $acceptedShares[0], 1, $shareData1['name']); @@ -150,7 +150,7 @@ class ManagerTest extends TestCase { $this->assertCount(1, $openShares); $this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1'); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); @@ -163,10 +163,10 @@ class ManagerTest extends TestCase { ->with($this->stringStartsWith('http://localhost/ocs/v1.php/cloud/shares/' . $acceptedShares[0]['remote_id'] . '/decline'), $this->anything()); $this->manager->removeUserShares($this->uid); - $this->assertEmpty(\Test_Helper::invokePrivate($this->manager, 'getShares', [null]), 'Asserting all shares for the user have been deleted'); + $this->assertEmpty(self::invokePrivate($this->manager, 'getShares', [null]), 'Asserting all shares for the user have been deleted'); $this->mountManager->clear(); - \Test_Helper::invokePrivate($this->manager, 'setupMounts'); + self::invokePrivate($this->manager, 'setupMounts'); $this->assertNotMount($shareData1['name']); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}'); $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1'); diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php index b1113e7a455..c52036e6f5b 100644 --- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php +++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php @@ -58,7 +58,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { ->with('core', 'shareapi_allow_links', 'yes') ->will($this->returnValue('yes')); - $this->assertTrue(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); + $this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); } public function testIsSharingEnabledWithAppDisabled() { @@ -68,7 +68,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { ->with('files_sharing') ->will($this->returnValue(false)); - $this->assertFalse(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); + $this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); } public function testIsSharingEnabledWithSharingDisabled() { @@ -84,6 +84,6 @@ class SharingCheckMiddlewareTest extends \Test\TestCase { ->with('core', 'shareapi_allow_links', 'yes') ->will($this->returnValue('no')); - $this->assertFalse(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); + $this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled')); } } diff --git a/apps/files_trashbin/l10n/vi.js b/apps/files_trashbin/l10n/vi.js index 718fb9b9edb..c0ff36d90c3 100644 --- a/apps/files_trashbin/l10n/vi.js +++ b/apps/files_trashbin/l10n/vi.js @@ -8,7 +8,10 @@ OC.L10N.register( "Delete permanently" : "Xóa vĩnh vễn", "Error" : "Lỗi", "restored" : "khôi phục", + "No deleted files" : "Không có tập tin bị xóa", + "You will be able to recover deleted files from here" : "Bạn có thể phục hồi các file đã bị xóa từ đây", "No entries found in this folder" : "Chưa có mục nào trong thư mục", + "Select all" : "Chọn tất cả", "Name" : "Tên", "Deleted" : "Đã xóa", "Delete" : "Xóa" diff --git a/apps/files_trashbin/l10n/vi.json b/apps/files_trashbin/l10n/vi.json index b23cd2be244..a8b2c4a055e 100644 --- a/apps/files_trashbin/l10n/vi.json +++ b/apps/files_trashbin/l10n/vi.json @@ -6,7 +6,10 @@ "Delete permanently" : "Xóa vĩnh vễn", "Error" : "Lỗi", "restored" : "khôi phục", + "No deleted files" : "Không có tập tin bị xóa", + "You will be able to recover deleted files from here" : "Bạn có thể phục hồi các file đã bị xóa từ đây", "No entries found in this folder" : "Chưa có mục nào trong thư mục", + "Select all" : "Chọn tất cả", "Name" : "Tên", "Deleted" : "Đã xóa", "Delete" : "Xóa" diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index baa0c4cbe71..853bc1eda69 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -175,6 +175,10 @@ class Trashbin { } self::setUpTrash($user); + if ($owner !== $user) { + // also setup for owner + self::setUpTrash($owner); + } $path_parts = pathinfo($file_path); @@ -222,7 +226,7 @@ class Trashbin { \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path), 'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp))); - $size += self::retainVersions($file_path, $filename, $timestamp); + $size += self::retainVersions($file_path, $filename, $owner, $ownerPath, $timestamp); // if owner !== user we need to also add a copy to the owners trash if ($user !== $owner) { @@ -248,23 +252,19 @@ class Trashbin { * * @param string $file_path path to original file * @param string $filename of deleted file + * @param string $owner owner user id + * @param string $ownerPath path relative to the owner's home storage * @param integer $timestamp when the file was deleted * * @return int size of stored versions */ - private static function retainVersions($file_path, $filename, $timestamp) { + private static function retainVersions($file_path, $filename, $owner, $ownerPath, $timestamp) { $size = 0; - if (\OCP\App::isEnabled('files_versions')) { + if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) { $user = \OCP\User::getUser(); $rootView = new \OC\Files\View('/'); - list($owner, $ownerPath) = self::getUidAndFilename($file_path); - // file has been deleted in between - if (empty($ownerPath)) { - return 0; - } - if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) { $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath)); if ($owner !== $user) { diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php index f99bc91dd26..637543683dc 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/storage.php @@ -192,6 +192,10 @@ class Storage extends \Test\TestCase { $this->assertEquals(1, count($results)); $name = $results[0]->getName(); $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v'))); + + // versions deleted + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/'); + $this->assertEquals(0, count($results)); } /** @@ -223,6 +227,118 @@ class Storage extends \Test\TestCase { $this->assertEquals(1, count($results)); $name = $results[0]->getName(); $this->assertEquals('inside.txt.v', substr($name, 0, strlen('inside.txt.v'))); + + // versions deleted + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/folder/'); + $this->assertEquals(0, count($results)); + } + + /** + * Test that deleted versions properly land in the trashbin when deleting as share recipient. + */ + public function testDeleteVersionsOfFileAsRecipient() { + \OCA\Files_Versions\Hooks::connectHooks(); + + $this->userView->mkdir('share'); + // trigger a version (multiple would not work because of the expire logic) + $this->userView->file_put_contents('share/test.txt', 'v1'); + $this->userView->file_put_contents('share/test.txt', 'v2'); + + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/share/'); + $this->assertEquals(1, count($results)); + + $recipientUser = $this->getUniqueId('recipient_'); + \OC::$server->getUserManager()->createUser($recipientUser, $recipientUser); + + $fileinfo = $this->userView->getFileInfo('share'); + $this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, + $recipientUser, 31)); + + $this->loginAsUser($recipientUser); + + // delete as recipient + $recipientView = new \OC\Files\View('/' . $recipientUser . '/files'); + $recipientView->unlink('share/test.txt'); + + // rescan trash storage for both users + list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin'); + $rootStorage->getScanner()->scan(''); + + // check if versions are in trashbin for both users + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions'); + $this->assertEquals(1, count($results), 'Versions in owner\'s trashbin'); + $name = $results[0]->getName(); + $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v'))); + + $results = $this->rootView->getDirectoryContent($recipientUser . '/files_trashbin/versions'); + $this->assertEquals(1, count($results), 'Versions in recipient\'s trashbin'); + $name = $results[0]->getName(); + $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v'))); + + // versions deleted + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/share/'); + $this->assertEquals(0, count($results)); + } + + /** + * Test that deleted versions properly land in the trashbin when deleting as share recipient. + */ + public function testDeleteVersionsOfFolderAsRecipient() { + \OCA\Files_Versions\Hooks::connectHooks(); + + $this->userView->mkdir('share'); + $this->userView->mkdir('share/folder'); + // trigger a version (multiple would not work because of the expire logic) + $this->userView->file_put_contents('share/folder/test.txt', 'v1'); + $this->userView->file_put_contents('share/folder/test.txt', 'v2'); + + $results = $this->rootView->getDirectoryContent($this->user . '/files_versions/share/folder/'); + $this->assertEquals(1, count($results)); + + $recipientUser = $this->getUniqueId('recipient_'); + \OC::$server->getUserManager()->createUser($recipientUser, $recipientUser); + + $fileinfo = $this->userView->getFileInfo('share'); + $this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, + $recipientUser, 31)); + + $this->loginAsUser($recipientUser); + + // delete as recipient + $recipientView = new \OC\Files\View('/' . $recipientUser . '/files'); + $recipientView->rmdir('share/folder'); + + // rescan trash storage + list($rootStorage,) = $this->rootView->resolvePath($this->user . '/files_trashbin'); + $rootStorage->getScanner()->scan(''); + + // check if versions are in trashbin for owner + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions'); + $this->assertEquals(1, count($results)); + $name = $results[0]->getName(); + $this->assertEquals('folder.d', substr($name, 0, strlen('folder.d'))); + + // check if file versions are in trashbin for owner + $results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/versions/' . $name . '/'); + $this->assertEquals(1, count($results)); + $name = $results[0]->getName(); + $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v'))); + + // check if versions are in trashbin for recipient + $results = $this->rootView->getDirectoryContent($recipientUser . '/files_trashbin/versions'); + $this->assertEquals(1, count($results)); + $name = $results[0]->getName(); + $this->assertEquals('folder.d', substr($name, 0, strlen('folder.d'))); + + // check if file versions are in trashbin for recipient + $results = $this->rootView->getDirectoryContent($recipientUser . '/files_trashbin/versions/' . $name . '/'); + $this->assertEquals(1, count($results)); + $name = $results[0]->getName(); + $this->assertEquals('test.txt.v', substr($name, 0, strlen('test.txt.v'))); + + // versions deleted + $results = $this->rootView->getDirectoryContent($recipientUser . '/files_versions/share/folder/'); + $this->assertEquals(0, count($results)); } /** diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js index c9ec596ace8..21232e90ec2 100644 --- a/apps/user_ldap/l10n/da.js +++ b/apps/user_ldap/l10n/da.js @@ -78,6 +78,9 @@ OC.L10N.register( "Verify settings" : "Verificér indstillinger", "1. Server" : "1. server", "%s. Server:" : "%s. server:", + "Adds a new and blank configuration" : "Tilføjer en ny og blank konfiguration", + "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetildeling", + "Delete the current configuration" : "Slet den aktuelle konfiguration", "Host" : "Vært", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://", "Port" : "Port", diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json index 8ce67102932..8222590fdeb 100644 --- a/apps/user_ldap/l10n/da.json +++ b/apps/user_ldap/l10n/da.json @@ -76,6 +76,9 @@ "Verify settings" : "Verificér indstillinger", "1. Server" : "1. server", "%s. Server:" : "%s. server:", + "Adds a new and blank configuration" : "Tilføjer en ny og blank konfiguration", + "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetildeling", + "Delete the current configuration" : "Slet den aktuelle konfiguration", "Host" : "Vært", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://", "Port" : "Port", diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js index 6c4be9ec3f0..baeed9a85ea 100644 --- a/apps/user_ldap/l10n/en_GB.js +++ b/apps/user_ldap/l10n/en_GB.js @@ -12,6 +12,7 @@ OC.L10N.register( "No data specified" : "No data specified", " Could not set configuration %s" : " Could not set configuration %s", "Action does not exist" : "Action does not exist", + "The Base DN appears to be wrong" : "The Base DN appears to be wrong", "Configuration incorrect" : "Configuration incorrect", "Configuration incomplete" : "Configuration incomplete", "Configuration OK" : "Configuration OK", @@ -77,6 +78,9 @@ OC.L10N.register( "Verify settings" : "Verify settings", "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", + "Adds a new and blank configuration" : "Adds a new and blank configuration", + "Copy current configuration into new directory binding" : "Copy current configuration into new directory binding", + "Delete the current configuration" : "Delete the current configuration", "Host" : "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://", "Port" : "Port", diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json index 4b8bf5fc163..743ae2cd47f 100644 --- a/apps/user_ldap/l10n/en_GB.json +++ b/apps/user_ldap/l10n/en_GB.json @@ -10,6 +10,7 @@ "No data specified" : "No data specified", " Could not set configuration %s" : " Could not set configuration %s", "Action does not exist" : "Action does not exist", + "The Base DN appears to be wrong" : "The Base DN appears to be wrong", "Configuration incorrect" : "Configuration incorrect", "Configuration incomplete" : "Configuration incomplete", "Configuration OK" : "Configuration OK", @@ -75,6 +76,9 @@ "Verify settings" : "Verify settings", "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", + "Adds a new and blank configuration" : "Adds a new and blank configuration", + "Copy current configuration into new directory binding" : "Copy current configuration into new directory binding", + "Delete the current configuration" : "Delete the current configuration", "Host" : "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://", "Port" : "Port", diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 6c39f406e83..49cbe6d72bd 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -31,6 +31,8 @@ namespace OCA\user_ldap\lib; +use OC\ServerNotAvailableException; + class Wizard extends LDAPUtility { static protected $l; protected $access; @@ -1065,18 +1067,27 @@ class Wizard extends LDAPUtility { $this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3); $this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0); $this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT); - if($tls) { - $isTlsWorking = @$this->ldap->startTls($cr); - if(!$isTlsWorking) { - return false; + + try { + if($tls) { + $isTlsWorking = @$this->ldap->startTls($cr); + if(!$isTlsWorking) { + return false; + } } - } - \OCP\Util::writeLog('user_ldap', 'Wiz: Attemping to Bind ', \OCP\Util::DEBUG); - //interesting part: do the bind! - $login = $this->ldap->bind($cr, - $this->configuration->ldapAgentName, - $this->configuration->ldapAgentPassword); + \OCP\Util::writeLog('user_ldap', 'Wiz: Attemping to Bind ', \OCP\Util::DEBUG); + //interesting part: do the bind! + $login = $this->ldap->bind($cr, + $this->configuration->ldapAgentName, + $this->configuration->ldapAgentPassword + ); + $errNo = $this->ldap->errno($cr); + $error = ldap_error($cr); + $this->ldap->unbind($cr); + } catch(ServerNotAvailableException $e) { + return false; + } if($login === true) { $this->ldap->unbind($cr); @@ -1087,9 +1098,6 @@ class Wizard extends LDAPUtility { return true; } - $errNo = $this->ldap->errno($cr); - $error = ldap_error($cr); - $this->ldap->unbind($cr); if($errNo === -1 || ($errNo === 2 && $ncc)) { //host, port or TLS wrong return false; diff --git a/apps/user_webdavauth/l10n/th_TH.js b/apps/user_webdavauth/l10n/th_TH.js index 303af823112..4dd22b61ed5 100644 --- a/apps/user_webdavauth/l10n/th_TH.js +++ b/apps/user_webdavauth/l10n/th_TH.js @@ -1,7 +1,9 @@ OC.L10N.register( "user_webdavauth", { - "WebDAV Authentication" : "WebDAV Authentication", - "Save" : "บันทึก" + "WebDAV Authentication" : "ยืนยันตัวตน WebDAV", + "Address:" : "ที่อยู่:", + "Save" : "บันทึก", + "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "สิทธิของผู้ใช้จะถูกส่งไปยังที่อยู่นี้ ปลั๊กอินนี้จะตรวจสอบการตอบสนองและจะแปลรหัสสถานะ HTTP 401 และ 403 ข้อมูลประจำตัวที่ไม่ถูกต้องและการตอบสนองอื่นๆ ทั้งหมดให้เป็นข้อมูลประจำตัวที่ถูกต้อง" }, "nplurals=1; plural=0;"); diff --git a/apps/user_webdavauth/l10n/th_TH.json b/apps/user_webdavauth/l10n/th_TH.json index da4e255d6e1..cbbe7b60c36 100644 --- a/apps/user_webdavauth/l10n/th_TH.json +++ b/apps/user_webdavauth/l10n/th_TH.json @@ -1,5 +1,7 @@ { "translations": { - "WebDAV Authentication" : "WebDAV Authentication", - "Save" : "บันทึก" + "WebDAV Authentication" : "ยืนยันตัวตน WebDAV", + "Address:" : "ที่อยู่:", + "Save" : "บันทึก", + "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "สิทธิของผู้ใช้จะถูกส่งไปยังที่อยู่นี้ ปลั๊กอินนี้จะตรวจสอบการตอบสนองและจะแปลรหัสสถานะ HTTP 401 และ 403 ข้อมูลประจำตัวที่ไม่ถูกต้องและการตอบสนองอื่นๆ ทั้งหมดให้เป็นข้อมูลประจำตัวที่ถูกต้อง" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/user_webdavauth/l10n/vi.js b/apps/user_webdavauth/l10n/vi.js index 60ce096e7b2..7b8d7949ba5 100644 --- a/apps/user_webdavauth/l10n/vi.js +++ b/apps/user_webdavauth/l10n/vi.js @@ -2,6 +2,7 @@ OC.L10N.register( "user_webdavauth", { "WebDAV Authentication" : "Xác thực WebDAV", + "Address:" : "Địa chỉ:", "Save" : "Lưu", "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ." }, diff --git a/apps/user_webdavauth/l10n/vi.json b/apps/user_webdavauth/l10n/vi.json index 53163ca5310..ebe1725a929 100644 --- a/apps/user_webdavauth/l10n/vi.json +++ b/apps/user_webdavauth/l10n/vi.json @@ -1,5 +1,6 @@ { "translations": { "WebDAV Authentication" : "Xác thực WebDAV", + "Address:" : "Địa chỉ:", "Save" : "Lưu", "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ." },"pluralForm" :"nplurals=1; plural=0;" diff --git a/core/ajax/update.php b/core/ajax/update.php index 22133f9774c..6a29b5b1c33 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -44,12 +44,15 @@ if (OC::checkUpgrade(false)) { $incompatibleApps = []; $disabledThirdPartyApps = []; - $updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Turned on maintenance mode')); }); - $updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource, $l) { + $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Turned off maintenance mode')); }); + $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('Maintenance mode is kept active')); + }); $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Updated database')); }); diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 85bd430db58..2d6394fea85 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -118,12 +118,17 @@ class Upgrade extends Command { $updater->setUpdateStepEnabled($updateStepEnabled); $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable); - $updater->listen('\OC\Updater', 'maintenanceStart', function () use($output) { + $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) { $output->writeln('<info>Turned on maintenance mode</info>'); }); - $updater->listen('\OC\Updater', 'maintenanceEnd', + $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use($output) { + $output->writeln('<info>Turned off maintenance mode</info>'); + }); + $updater->listen('\OC\Updater', 'maintenanceActive', function () use($output) { + $output->writeln('<info>Maintenance mode is kept active</info>'); + }); + $updater->listen('\OC\Updater', 'updateEnd', function () use($output, $updateStepEnabled, $self) { - $output->writeln('<info>Turned off maintenance mode</info>'); $mode = $updateStepEnabled ? 'Update' : 'Update simulation'; $status = $self->upgradeFailed ? 'failed' : 'successful'; $message = "<info>$mode $status</info>"; diff --git a/core/css/fixes.css b/core/css/fixes.css index 894d9bc14a5..7ef44ba6909 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -64,6 +64,12 @@ select { visibility: hidden; } +/* fix installation screen rendering issue for IE8+9 */ +.lte9 #body-login { + min-height: 100%; + height: auto !important; +} + /* oc-dialog only uses box shadow which is not supported by ie8 */ .ie8 .oc-dialog { border: 1px solid #888888; diff --git a/core/l10n/da.js b/core/l10n/da.js index dff08031b98..69248a1d317 100644 --- a/core/l10n/da.js +++ b/core/l10n/da.js @@ -4,6 +4,7 @@ OC.L10N.register( "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s", "Turned on maintenance mode" : "Startede vedligeholdelsestilstand", "Turned off maintenance mode" : "standsede vedligeholdelsestilstand", + "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende", "Updated database" : "Opdaterede database", "Checked database schema update" : "Tjekket database schema opdatering", "Checked database schema update for apps" : "Tjekkede databaseskemaets opdatering for apps", @@ -149,6 +150,7 @@ OC.L10N.register( "New Password" : "Ny adgangskode", "Reset password" : "Nulstil kodeord", "Searching other places" : "Søger på andre steder", + "No search results in other places" : "Ingen søgeresultater fra andre steder", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søgeresultat fra andre steder","{count} søgeresultater fra andre steder"], "Personal" : "Personligt", "Users" : "Brugere", diff --git a/core/l10n/da.json b/core/l10n/da.json index b33aa380fec..1cb7b93f971 100644 --- a/core/l10n/da.json +++ b/core/l10n/da.json @@ -2,6 +2,7 @@ "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s", "Turned on maintenance mode" : "Startede vedligeholdelsestilstand", "Turned off maintenance mode" : "standsede vedligeholdelsestilstand", + "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende", "Updated database" : "Opdaterede database", "Checked database schema update" : "Tjekket database schema opdatering", "Checked database schema update for apps" : "Tjekkede databaseskemaets opdatering for apps", @@ -147,6 +148,7 @@ "New Password" : "Ny adgangskode", "Reset password" : "Nulstil kodeord", "Searching other places" : "Søger på andre steder", + "No search results in other places" : "Ingen søgeresultater fra andre steder", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søgeresultat fra andre steder","{count} søgeresultater fra andre steder"], "Personal" : "Personligt", "Users" : "Brugere", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 136efce46a7..a541ebae57d 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -73,6 +73,7 @@ OC.L10N.register( "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest enabling the Internet connection for this server.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>.", + "/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 is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>.", "Error occurred while checking server setup" : "Error occurred whilst 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." : "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.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting.", @@ -148,6 +149,7 @@ OC.L10N.register( "New Password" : "New Password", "Reset password" : "Reset password", "Searching other places" : "Searching other places", + "No search results in other places" : "No search results in other places", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} search result in other places","{count} search results in other places"], "Personal" : "Personal", "Users" : "Users", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index ac6e093ad9a..e56050101e6 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -71,6 +71,7 @@ "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest enabling the Internet connection for this server.", "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.", "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>.", + "/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 is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>.", "Error occurred while checking server setup" : "Error occurred whilst 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." : "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.", "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting.", @@ -146,6 +147,7 @@ "New Password" : "New Password", "Reset password" : "Reset password", "Searching other places" : "Searching other places", + "No search results in other places" : "No search results in other places", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} search result in other places","{count} search results in other places"], "Personal" : "Personal", "Users" : "Users", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 64034a39435..b7832a51c5b 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -2,8 +2,9 @@ OC.L10N.register( "core", { "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s", - "Turned on maintenance mode" : "Siirrytty ylläpitotilaan", - "Turned off maintenance mode" : "Ylläpitotila laitettu pois päältä", + "Turned on maintenance mode" : "Siirrytty huoltotilaan", + "Turned off maintenance mode" : "Huoltotila asetettu pois päältä", + "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena", "Updated database" : "Tietokanta ajan tasalla", "Checked database schema update" : "Tarkistettu tietokannan skeemapäivitys", "Checked database schema update for apps" : "Tarkistettu tietokannan skeemapäivitys sovelluksille", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index 8ca65e44ba3..190353d7c7a 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -1,7 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s", - "Turned on maintenance mode" : "Siirrytty ylläpitotilaan", - "Turned off maintenance mode" : "Ylläpitotila laitettu pois päältä", + "Turned on maintenance mode" : "Siirrytty huoltotilaan", + "Turned off maintenance mode" : "Huoltotila asetettu pois päältä", + "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena", "Updated database" : "Tietokanta ajan tasalla", "Checked database schema update" : "Tarkistettu tietokannan skeemapäivitys", "Checked database schema update for apps" : "Tarkistettu tietokannan skeemapäivitys sovelluksille", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index 795af443c96..83e5e8a8d71 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -4,6 +4,7 @@ OC.L10N.register( "Couldn't send mail to following users: %s " : "Non é posíbel enviar correo aos usuarios seguintes: %s", "Turned on maintenance mode" : "Modo de mantemento activado", "Turned off maintenance mode" : "Modo de mantemento desactivado", + "Maintenance mode is kept active" : "Mantense activo o modo de mantemento", "Updated database" : "Base de datos actualizada", "Checked database schema update" : "Comprobada a actualización do esquema da base de datos", "Checked database schema update for apps" : "Comprobada a actualización do esquema da base de datos para aplicacións", diff --git a/core/l10n/gl.json b/core/l10n/gl.json index 464db5691d9..50ae30c4b87 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -2,6 +2,7 @@ "Couldn't send mail to following users: %s " : "Non é posíbel enviar correo aos usuarios seguintes: %s", "Turned on maintenance mode" : "Modo de mantemento activado", "Turned off maintenance mode" : "Modo de mantemento desactivado", + "Maintenance mode is kept active" : "Mantense activo o modo de mantemento", "Updated database" : "Base de datos actualizada", "Checked database schema update" : "Comprobada a actualización do esquema da base de datos", "Checked database schema update for apps" : "Comprobada a actualización do esquema da base de datos para aplicacións", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index c9d79ab3212..9d5984eef19 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -4,6 +4,7 @@ OC.L10N.register( "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s", "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld", "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld", + "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief", "Updated database" : "Database bijgewerkt", "Checked database schema update" : "Database schema-update gecontroleerd", "Checked database schema update for apps" : "Database schema-update voor apps gecontroleerd", @@ -149,6 +150,7 @@ OC.L10N.register( "New Password" : "Nieuw wachtwoord", "Reset password" : "Reset wachtwoord", "Searching other places" : "Zoeken op andere plaatsen", + "No search results in other places" : "Geen zoekresultaten op andere plaatsen", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} zoekresultaat op andere plaatsen","{count} zoekresultaten op andere plaatsen"], "Personal" : "Persoonlijk", "Users" : "Gebruikers", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 71f7dbbc6f4..614ec4fa018 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -2,6 +2,7 @@ "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s", "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld", "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld", + "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief", "Updated database" : "Database bijgewerkt", "Checked database schema update" : "Database schema-update gecontroleerd", "Checked database schema update for apps" : "Database schema-update voor apps gecontroleerd", @@ -147,6 +148,7 @@ "New Password" : "Nieuw wachtwoord", "Reset password" : "Reset wachtwoord", "Searching other places" : "Zoeken op andere plaatsen", + "No search results in other places" : "Geen zoekresultaten op andere plaatsen", "_{count} search result in other places_::_{count} search results in other places_" : ["{count} zoekresultaat op andere plaatsen","{count} zoekresultaten op andere plaatsen"], "Personal" : "Persoonlijk", "Users" : "Gebruikers", diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index 651f8308255..42644a15d57 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -36,6 +36,7 @@ OC.L10N.register( "Error while changing permissions" : "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน", "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}", "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}", + "Share link" : "แชร์ลิงค์", "Password protect" : "ใส่รหัสผ่านไว้", "Password" : "รหัสผ่าน", "Email link to person" : "ส่งลิงก์ให้ทางอีเมล", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index 982e3e99f82..9260178acb5 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -34,6 +34,7 @@ "Error while changing permissions" : "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน", "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}", "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}", + "Share link" : "แชร์ลิงค์", "Password protect" : "ใส่รหัสผ่านไว้", "Password" : "รหัสผ่าน", "Email link to person" : "ส่งลิงก์ให้ทางอีเมล", diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js index 342f345033f..01817f5cde5 100644 --- a/lib/l10n/cs_CZ.js +++ b/lib/l10n/cs_CZ.js @@ -38,7 +38,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["před %n minutou","před %n minutami","před %n minutami"], "seconds ago" : "před pár sekundami", "web services under your control" : "webové služby pod Vaší kontrolou", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Modul s id: %s neexistuje. Povolte ho prosím ve svých nastaveních aplikací nebo kontaktujte svého administrátora.", "Empty filename is not allowed" : "Prázdné jméno souboru není povoleno", "Dot files are not allowed" : "Jména souborů začínající tečkou nejsou povolena", "4-byte characters are not supported in file names" : "4-bytové znaky nejsou podporovány ve jménech souborů", diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json index 73c05b89f37..ab5e4662633 100644 --- a/lib/l10n/cs_CZ.json +++ b/lib/l10n/cs_CZ.json @@ -36,7 +36,6 @@ "_%n minute ago_::_%n minutes ago_" : ["před %n minutou","před %n minutami","před %n minutami"], "seconds ago" : "před pár sekundami", "web services under your control" : "webové služby pod Vaší kontrolou", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Modul s id: %s neexistuje. Povolte ho prosím ve svých nastaveních aplikací nebo kontaktujte svého administrátora.", "Empty filename is not allowed" : "Prázdné jméno souboru není povoleno", "Dot files are not allowed" : "Jména souborů začínající tečkou nejsou povolena", "4-byte characters are not supported in file names" : "4-bytové znaky nejsou podporovány ve jménech souborů", diff --git a/lib/l10n/da.js b/lib/l10n/da.js index 20314fc018e..d0480637954 100644 --- a/lib/l10n/da.js +++ b/lib/l10n/da.js @@ -38,6 +38,7 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minut siden","%n minutter siden"], "seconds ago" : "sekunder siden", "web services under your control" : "Webtjenester under din kontrol", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulet med id'et %s findes ikke. Slå det venligst til i dine app-indstillinger eller kontakt din administrator.", "Empty filename is not allowed" : "Tomme filnavne er ikke tilladt", "Dot files are not allowed" : "Filer med punktummer er ikke tilladt", "4-byte characters are not supported in file names" : "Tegn med 4-byte understøttes ikke i filnavne", diff --git a/lib/l10n/da.json b/lib/l10n/da.json index ac6e0038a1e..e58de5789e7 100644 --- a/lib/l10n/da.json +++ b/lib/l10n/da.json @@ -36,6 +36,7 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minut siden","%n minutter siden"], "seconds ago" : "sekunder siden", "web services under your control" : "Webtjenester under din kontrol", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulet med id'et %s findes ikke. Slå det venligst til i dine app-indstillinger eller kontakt din administrator.", "Empty filename is not allowed" : "Tomme filnavne er ikke tilladt", "Dot files are not allowed" : "Filer med punktummer er ikke tilladt", "4-byte characters are not supported in file names" : "Tegn med 4-byte understøttes ikke i filnavne", diff --git a/lib/l10n/de.js b/lib/l10n/de.js index 32d4121a4a5..a01b987adc7 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -38,7 +38,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", "web services under your control" : "Web-Dienste unter Deiner Kontrolle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte aktiviere es in Deinen App-Einstellungen oder kontaktiere Deinen Administrator.", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "4-byte characters are not supported in file names" : "4-Byte Zeichen sind in Dateinamen nicht erlaubt", diff --git a/lib/l10n/de.json b/lib/l10n/de.json index c886a42dacb..df2a3f7f240 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -36,7 +36,6 @@ "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", "web services under your control" : "Web-Dienste unter Deiner Kontrolle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte aktiviere es in Deinen App-Einstellungen oder kontaktiere Deinen Administrator.", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "4-byte characters are not supported in file names" : "4-Byte Zeichen sind in Dateinamen nicht erlaubt", diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index 4007e21bffd..326c1546bdb 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -38,7 +38,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", "web services under your control" : "Web-Dienste unter Ihrer Kontrolle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte aktivieren Sie es in Ihren App-Einstellungen oder kontaktieren Sie Ihren Administrator.", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "4-byte characters are not supported in file names" : "4-Byte-Zeichen werden in Dateinamen nicht unterstützt", diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index 1e977f2be51..fbd164f572d 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -36,7 +36,6 @@ "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"], "seconds ago" : "Gerade eben", "web services under your control" : "Web-Dienste unter Ihrer Kontrolle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte aktivieren Sie es in Ihren App-Einstellungen oder kontaktieren Sie Ihren Administrator.", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt", "4-byte characters are not supported in file names" : "4-Byte-Zeichen werden in Dateinamen nicht unterstützt", diff --git a/lib/l10n/el.js b/lib/l10n/el.js index c6c794d154c..9d05e40e533 100644 --- a/lib/l10n/el.js +++ b/lib/l10n/el.js @@ -35,7 +35,6 @@ OC.L10N.register( "_%n year ago_::_%n years ago_" : ["%n χρόνο πριν","%n χρόνια πριν"], "seconds ago" : "δευτερόλεπτα πριν", "web services under your control" : "υπηρεσίες δικτύου υπό τον έλεγχό σας", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Η μονάδα με id: %s δεν υπάρχει. Παρακαλούμε ενεργοποιήστε τη στις ρυθμίσεις των εφαρμογών σας ή επικοινωνήστε με το διαχειριστή σας.", "Empty filename is not allowed" : "Δεν επιτρέπεται άδειο όνομα αρχείου", "Dot files are not allowed" : "Δεν επιτρέπονται αρχεία που ξεκινούν από τελεία - Dot ", "4-byte characters are not supported in file names" : "Χαρακτήρες 4-byte δεν υποστηρίζονται σε ονόματα αρχείων", diff --git a/lib/l10n/el.json b/lib/l10n/el.json index 4d8cd7e33a5..84d2b8f4925 100644 --- a/lib/l10n/el.json +++ b/lib/l10n/el.json @@ -33,7 +33,6 @@ "_%n year ago_::_%n years ago_" : ["%n χρόνο πριν","%n χρόνια πριν"], "seconds ago" : "δευτερόλεπτα πριν", "web services under your control" : "υπηρεσίες δικτύου υπό τον έλεγχό σας", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Η μονάδα με id: %s δεν υπάρχει. Παρακαλούμε ενεργοποιήστε τη στις ρυθμίσεις των εφαρμογών σας ή επικοινωνήστε με το διαχειριστή σας.", "Empty filename is not allowed" : "Δεν επιτρέπεται άδειο όνομα αρχείου", "Dot files are not allowed" : "Δεν επιτρέπονται αρχεία που ξεκινούν από τελεία - Dot ", "4-byte characters are not supported in file names" : "Χαρακτήρες 4-byte δεν υποστηρίζονται σε ονόματα αρχείων", diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js index 2e57ab56533..89fac8a92fe 100644 --- a/lib/l10n/en_GB.js +++ b/lib/l10n/en_GB.js @@ -132,7 +132,9 @@ OC.L10N.register( "PHP module %s not installed." : "PHP module %s not installed.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP setting \"%s\" is not set to \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Adjusting this setting in php.ini will make ownCloud run again", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?", "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.", diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json index 58d2eac6e6c..73f4e3030fb 100644 --- a/lib/l10n/en_GB.json +++ b/lib/l10n/en_GB.json @@ -130,7 +130,9 @@ "PHP module %s not installed." : "PHP module %s not installed.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP setting \"%s\" is not set to \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Adjusting this setting in php.ini will make ownCloud run again", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?", "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.", diff --git a/lib/l10n/es.js b/lib/l10n/es.js index dfa41b3a6f3..8eb15106ed1 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -38,7 +38,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"], "seconds ago" : "hace segundos", "web services under your control" : "Servicios web bajo su control", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Módulo con ID: %s no existe. Por favor habilítelo en los ajustes de sus aplicaciones o contáctese con su administrador.", "Empty filename is not allowed" : "No se puede dejar el nombre en blanco.", "Dot files are not allowed" : "Los archivos Dot no están permitidos", "4-byte characters are not supported in file names" : " No están permitidos caractéres de 4-bytes", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index de64cb113e3..81983ec11f4 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -36,7 +36,6 @@ "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"], "seconds ago" : "hace segundos", "web services under your control" : "Servicios web bajo su control", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Módulo con ID: %s no existe. Por favor habilítelo en los ajustes de sus aplicaciones o contáctese con su administrador.", "Empty filename is not allowed" : "No se puede dejar el nombre en blanco.", "Dot files are not allowed" : "Los archivos Dot no están permitidos", "4-byte characters are not supported in file names" : " No están permitidos caractéres de 4-bytes", diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js index 9531d13a91b..28d4556cc12 100644 --- a/lib/l10n/fi_FI.js +++ b/lib/l10n/fi_FI.js @@ -37,7 +37,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minuutti sitten","%n minuuttia sitten"], "seconds ago" : "sekuntia sitten", "web services under your control" : "verkkopalvelut hallinnassasi", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Moduulia tunnisteella %s ei ole olemassa. Ota se käyttöön sovellustesi asetuksista tai ota yhteys ylläpitoon.", "Empty filename is not allowed" : "Tiedostonimi ei voi olla tyhjä", "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", "4-byte characters are not supported in file names" : "4 tavun merkit eivät ole tuettuja tiedostojen nimissä", diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json index 07a058fecd4..d6842c69102 100644 --- a/lib/l10n/fi_FI.json +++ b/lib/l10n/fi_FI.json @@ -35,7 +35,6 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minuutti sitten","%n minuuttia sitten"], "seconds ago" : "sekuntia sitten", "web services under your control" : "verkkopalvelut hallinnassasi", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Moduulia tunnisteella %s ei ole olemassa. Ota se käyttöön sovellustesi asetuksista tai ota yhteys ylläpitoon.", "Empty filename is not allowed" : "Tiedostonimi ei voi olla tyhjä", "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", "4-byte characters are not supported in file names" : "4 tavun merkit eivät ole tuettuja tiedostojen nimissä", diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index 782573f40c8..819a4a76be2 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -37,7 +37,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["il y a %n minute","il y a %n minutes"], "seconds ago" : "il y a quelques secondes", "web services under your control" : "services web sous votre contrôle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Le module avec l'id: %s n'existe pas. Merci de l'activer dans les paramètres applications ou de contacter votre administrateur.", "Empty filename is not allowed" : "Le nom de fichier ne peut pas être vide", "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", "4-byte characters are not supported in file names" : "Les caractères sur 4 octets ne sont pas pris en charge dans les noms de fichiers", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index 73da8da4361..d0801954c1b 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -35,7 +35,6 @@ "_%n minute ago_::_%n minutes ago_" : ["il y a %n minute","il y a %n minutes"], "seconds ago" : "il y a quelques secondes", "web services under your control" : "services web sous votre contrôle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Le module avec l'id: %s n'existe pas. Merci de l'activer dans les paramètres applications ou de contacter votre administrateur.", "Empty filename is not allowed" : "Le nom de fichier ne peut pas être vide", "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", "4-byte characters are not supported in file names" : "Les caractères sur 4 octets ne sont pas pris en charge dans les noms de fichiers", diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js index e90aa96d21b..a26402aa062 100644 --- a/lib/l10n/gl.js +++ b/lib/l10n/gl.js @@ -38,7 +38,7 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["hai %n minuto","hai %n minutos"], "seconds ago" : "segundos atrás", "web services under your control" : "servizos web baixo o seu control", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Non existe o módulo co ID: %s. Actíveo nos axustes de aplicacións ou contacte co administrador.", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Non existe o módulo co ID: %s. Actíveo nos axustes das aplicacións ou contacte co administrador.", "Empty filename is not allowed" : "Non está permitido deixar baleiro o nome de ficheiro", "Dot files are not allowed" : "Non se admiten os ficheiros con punto", "4-byte characters are not supported in file names" : "Non se admiten os caracteres de 4 bytes nos nomes de ficheiro", diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json index e8c55d7451b..9dea5d004d0 100644 --- a/lib/l10n/gl.json +++ b/lib/l10n/gl.json @@ -36,7 +36,7 @@ "_%n minute ago_::_%n minutes ago_" : ["hai %n minuto","hai %n minutos"], "seconds ago" : "segundos atrás", "web services under your control" : "servizos web baixo o seu control", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Non existe o módulo co ID: %s. Actíveo nos axustes de aplicacións ou contacte co administrador.", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Non existe o módulo co ID: %s. Actíveo nos axustes das aplicacións ou contacte co administrador.", "Empty filename is not allowed" : "Non está permitido deixar baleiro o nome de ficheiro", "Dot files are not allowed" : "Non se admiten os ficheiros con punto", "4-byte characters are not supported in file names" : "Non se admiten os caracteres de 4 bytes nos nomes de ficheiro", diff --git a/lib/l10n/it.js b/lib/l10n/it.js index 131a8e53109..e16004cb95b 100644 --- a/lib/l10n/it.js +++ b/lib/l10n/it.js @@ -38,7 +38,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minuto fa","%n minuti fa"], "seconds ago" : "secondi fa", "web services under your control" : "servizi web nelle tue mani", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Il modulo con id: %s non esiste. Abilitalo nelle impostazioni delle applicazioni o contatta il tuo amministratore.", "Empty filename is not allowed" : "Un nome di file vuoto non è consentito", "Dot files are not allowed" : "I file con un punto iniziale non sono consentiti", "4-byte characters are not supported in file names" : "I caratteri di 4 byte non sono supportati nei nomi dei file", diff --git a/lib/l10n/it.json b/lib/l10n/it.json index 9574dd52c97..57f833529ef 100644 --- a/lib/l10n/it.json +++ b/lib/l10n/it.json @@ -36,7 +36,6 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minuto fa","%n minuti fa"], "seconds ago" : "secondi fa", "web services under your control" : "servizi web nelle tue mani", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Il modulo con id: %s non esiste. Abilitalo nelle impostazioni delle applicazioni o contatta il tuo amministratore.", "Empty filename is not allowed" : "Un nome di file vuoto non è consentito", "Dot files are not allowed" : "I file con un punto iniziale non sono consentiti", "4-byte characters are not supported in file names" : "I caratteri di 4 byte non sono supportati nei nomi dei file", diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js index b433375eff6..25503f21866 100644 --- a/lib/l10n/nb_NO.js +++ b/lib/l10n/nb_NO.js @@ -38,7 +38,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["for %n minutt siden","for %n minutter siden"], "seconds ago" : "for få sekunder siden", "web services under your control" : "webtjenester som du kontrollerer", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Modul med id: %s eksisterer ikke. Aktiver den i app-innstillingene eller kontakt en administrator.", "Empty filename is not allowed" : "Tomt filnavn er ikke tillatt", "Dot files are not allowed" : "Punktum-filer er ikke tillatt", "4-byte characters are not supported in file names" : "4-byte tegn er ikke tillatt i filnavn", diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json index 6abcc9cf841..e495dc5ac7b 100644 --- a/lib/l10n/nb_NO.json +++ b/lib/l10n/nb_NO.json @@ -36,7 +36,6 @@ "_%n minute ago_::_%n minutes ago_" : ["for %n minutt siden","for %n minutter siden"], "seconds ago" : "for få sekunder siden", "web services under your control" : "webtjenester som du kontrollerer", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Modul med id: %s eksisterer ikke. Aktiver den i app-innstillingene eller kontakt en administrator.", "Empty filename is not allowed" : "Tomt filnavn er ikke tillatt", "Dot files are not allowed" : "Punktum-filer er ikke tillatt", "4-byte characters are not supported in file names" : "4-byte tegn er ikke tillatt i filnavn", diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 881ebcacbd7..f98f194d233 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -38,7 +38,7 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minuut geleden","%n minuten geleden"], "seconds ago" : "seconden geleden", "web services under your control" : "Webdiensten in eigen beheer", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Module met id: %s bestaat niet. Activeer het in uw apps instellingen, of neem contact op met uw beheerder.", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module met id: %s bestaat niet. Activeer het in uw apps instellingen, of neem contact op met uw beheerder.", "Empty filename is not allowed" : "Een lege bestandsnaam is niet toegestaan", "Dot files are not allowed" : "Punt bestanden zijn niet toegestaan", "4-byte characters are not supported in file names" : "4-byte tekens in bestandsnamen worden niet ondersteund", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index f3ba6080677..7615a9dc851 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -36,7 +36,7 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minuut geleden","%n minuten geleden"], "seconds ago" : "seconden geleden", "web services under your control" : "Webdiensten in eigen beheer", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Module met id: %s bestaat niet. Activeer het in uw apps instellingen, of neem contact op met uw beheerder.", + "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module met id: %s bestaat niet. Activeer het in uw apps instellingen, of neem contact op met uw beheerder.", "Empty filename is not allowed" : "Een lege bestandsnaam is niet toegestaan", "Dot files are not allowed" : "Punt bestanden zijn niet toegestaan", "4-byte characters are not supported in file names" : "4-byte tekens in bestandsnamen worden niet ondersteund", diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js index a61e712bfa3..ffdbedb9660 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -35,7 +35,6 @@ OC.L10N.register( "_%n year ago_::_%n years ago_" : ["%n ano atrás","%n anos atrás"], "seconds ago" : "segundos atrás", "web services under your control" : "serviços web sob seu controle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Não existe módulo com id: %s. Por favor habilite na configuração de seus aplicativos ou faça contato com o seu administrador.", "Empty filename is not allowed" : "Um nome de arquivo vazio não é permitido.", "Dot files are not allowed" : "Dot arquivos não são permitidos", "4-byte characters are not supported in file names" : "Caracteres de 4-bytes não são suportados em nomes de arquivos", diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json index 3278a3e070d..50f61e2a627 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -33,7 +33,6 @@ "_%n year ago_::_%n years ago_" : ["%n ano atrás","%n anos atrás"], "seconds ago" : "segundos atrás", "web services under your control" : "serviços web sob seu controle", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Não existe módulo com id: %s. Por favor habilite na configuração de seus aplicativos ou faça contato com o seu administrador.", "Empty filename is not allowed" : "Um nome de arquivo vazio não é permitido.", "Dot files are not allowed" : "Dot arquivos não são permitidos", "4-byte characters are not supported in file names" : "Caracteres de 4-bytes não são suportados em nomes de arquivos", diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js index 7cfd77e9285..3543ce80a33 100644 --- a/lib/l10n/sr.js +++ b/lib/l10n/sr.js @@ -38,7 +38,6 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["пре %n минут","пре %n минута","пре %n минута"], "seconds ago" : "пре неколико секунди", "web services under your control" : "веб сервиси под вашом контролом", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Модул ИД-а: %s не постоји. Укључите га у поставкама апликација или контактирајте вашег администратора.", "Empty filename is not allowed" : "Празан назив није дозвољен", "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени", "4-byte characters are not supported in file names" : "4-бајтни знакови нису подржани у називу фајлова", diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json index f42b4303ed9..466b7382fac 100644 --- a/lib/l10n/sr.json +++ b/lib/l10n/sr.json @@ -36,7 +36,6 @@ "_%n minute ago_::_%n minutes ago_" : ["пре %n минут","пре %n минута","пре %n минута"], "seconds ago" : "пре неколико секунди", "web services under your control" : "веб сервиси под вашом контролом", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Модул ИД-а: %s не постоји. Укључите га у поставкама апликација или контактирајте вашег администратора.", "Empty filename is not allowed" : "Празан назив није дозвољен", "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени", "4-byte characters are not supported in file names" : "4-бајтни знакови нису подржани у називу фајлова", diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js index 8b209470ec3..0c6324ff041 100644 --- a/lib/l10n/uk.js +++ b/lib/l10n/uk.js @@ -35,7 +35,6 @@ OC.L10N.register( "_%n year ago_::_%n years ago_" : ["%n рік тому","%n років тому","%n років тому"], "seconds ago" : "секунди тому", "web services under your control" : "підконтрольні Вам веб-сервіси", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Модуль з id: %s не існує. Будь ласка, увімкніть його в налаштуваннях програми або зверніться до адміністратора.", "Empty filename is not allowed" : "Порожні імена файлів не допускаються", "Dot files are not allowed" : "Файли які починаються з крапки не допустимі", "4-byte characters are not supported in file names" : "4-х байтові символи в імені файлів не допустимі", diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json index 7126dec178d..e4b6b053dbc 100644 --- a/lib/l10n/uk.json +++ b/lib/l10n/uk.json @@ -33,7 +33,6 @@ "_%n year ago_::_%n years ago_" : ["%n рік тому","%n років тому","%n років тому"], "seconds ago" : "секунди тому", "web services under your control" : "підконтрольні Вам веб-сервіси", - "Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator." : "Модуль з id: %s не існує. Будь ласка, увімкніть його в налаштуваннях програми або зверніться до адміністратора.", "Empty filename is not allowed" : "Порожні імена файлів не допускаються", "Dot files are not allowed" : "Файли які починаються з крапки не допустимі", "4-byte characters are not supported in file names" : "4-х байтові символи в імені файлів не допустимі", diff --git a/lib/l10n/vi.js b/lib/l10n/vi.js index 393bf5170ef..e467f4383c4 100644 --- a/lib/l10n/vi.js +++ b/lib/l10n/vi.js @@ -1,6 +1,8 @@ OC.L10N.register( "lib", { + "Cannot write into \"config\" directory!" : "Không thể ghi vào thư mục \"config\"!", + "See %s" : "Xem %s", "Help" : "Giúp đỡ", "Personal" : "Cá nhân", "Users" : "Người dùng", diff --git a/lib/l10n/vi.json b/lib/l10n/vi.json index 5800ee4d97a..f3dd43a290a 100644 --- a/lib/l10n/vi.json +++ b/lib/l10n/vi.json @@ -1,4 +1,6 @@ { "translations": { + "Cannot write into \"config\" directory!" : "Không thể ghi vào thư mục \"config\"!", + "See %s" : "Xem %s", "Help" : "Giúp đỡ", "Personal" : "Cá nhân", "Users" : "Người dùng", diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php index 82e1b55d763..58f16a2bd04 100644 --- a/lib/private/connector/sabre/directory.php +++ b/lib/private/connector/sabre/directory.php @@ -104,6 +104,8 @@ class Directory extends \OC\Connector\Sabre\Node return $node->put($data); } catch (\OCP\Files\StorageNotAvailableException $e) { throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage()); + } catch (\OCP\Files\InvalidPathException $ex) { + throw new InvalidPath($ex->getMessage()); } catch (LockedException $e) { throw new FileLocked($e->getMessage(), $e->getCode(), $e); } diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php index 692633f98da..fa317851a56 100644 --- a/lib/private/encryption/keys/storage.php +++ b/lib/private/encryption/keys/storage.php @@ -232,22 +232,8 @@ class Storage implements IStorage { */ public function renameKeys($source, $target) { - list($owner, $source) = $this->util->getUidAndFilename($source); - list(, $target) = $this->util->getUidAndFilename($target); - $systemWideSource = $this->util->isSystemWideMountPoint($source, $owner); - $systemWideTarget = $this->util->isSystemWideMountPoint($target, $owner); - - if ($systemWideSource) { - $sourcePath = $this->keys_base_dir . $source . '/'; - } else { - $sourcePath = '/' . $owner . $this->keys_base_dir . $source . '/'; - } - - if ($systemWideTarget) { - $targetPath = $this->keys_base_dir . $target . '/'; - } else { - $targetPath = '/' . $owner . $this->keys_base_dir . $target . '/'; - } + $sourcePath = $this->getPathToKeys($source); + $targetPath = $this->getPathToKeys($target); if ($this->view->file_exists($sourcePath)) { $this->keySetPreparation(dirname($targetPath)); @@ -259,6 +245,7 @@ class Storage implements IStorage { return false; } + /** * copy keys if a file was renamed * @@ -268,21 +255,8 @@ class Storage implements IStorage { */ public function copyKeys($source, $target) { - list($owner, $source) = $this->util->getUidAndFilename($source); - list(, $target) = $this->util->getUidAndFilename($target); - $systemWideTarget = $this->util->isSystemWideMountPoint($target, $owner); - $systemWideSource = $this->util->isSystemWideMountPoint($source, $owner); - - if ($systemWideSource) { - $sourcePath = $this->keys_base_dir . $source . '/'; - } else { - $sourcePath = '/' . $owner . $this->keys_base_dir . $source . '/'; - } - if ($systemWideTarget) { - $targetPath = $this->keys_base_dir . $target . '/'; - } else { - $targetPath = '/' . $owner . $this->keys_base_dir . $target . '/'; - } + $sourcePath = $this->getPathToKeys($source); + $targetPath = $this->getPathToKeys($target); if ($this->view->file_exists($sourcePath)) { $this->keySetPreparation(dirname($targetPath)); @@ -294,6 +268,25 @@ class Storage implements IStorage { } /** + * get system wide path and detect mount points + * + * @param string $path + * @return string + */ + protected function getPathToKeys($path) { + list($owner, $relativePath) = $this->util->getUidAndFilename($path); + $systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner); + + if ($systemWideMountPoint) { + $systemPath = $this->keys_base_dir . $relativePath . '/'; + } else { + $systemPath = '/' . $owner . $this->keys_base_dir . $relativePath . '/'; + } + + return $systemPath; + } + + /** * Make preparations to filesystem for saving a key file * * @param string $path relative to the views root diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index eeddea26b1a..4841533cac1 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -151,8 +151,8 @@ class Manager implements IManager { if (isset($this->encryptionModules[$moduleId])) { return call_user_func($this->encryptionModules[$moduleId]['callback']); } else { - $message = "Module with id: $moduleId does not exists."; - $hint = $this->l->t('Module with id: %s does not exists. Please enable it in your apps settings or contact your administrator.', [$moduleId]); + $message = "Module with id: $moduleId does not exist."; + $hint = $this->l->t('Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]); throw new Exceptions\ModuleDoesNotExistsException($message, $hint); } } else { diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 0ddfde15047..15f513585fe 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -682,7 +682,7 @@ class DAV extends Common { public function getPermissions($path) { $this->init(); $path = $this->cleanPath($path); - $response = $this->client->propfind($this->encodePath($path), array('{http://owncloud.org/ns}permissions')); + $response = $this->propfind($path); if (isset($response['{http://owncloud.org/ns}permissions'])) { return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']); } else if ($this->is_dir($path)) { @@ -694,6 +694,17 @@ class DAV extends Common { } } + /** {@inheritdoc} */ + public function getETag($path) { + $this->init(); + $path = $this->cleanPath($path); + $response = $this->propfind($path); + if (isset($response['{DAV:}getetag'])) { + return trim($response['{DAV:}getetag'], '"'); + } + return parent::getEtag($path); + } + /** * @param string $permissionsString * @return int @@ -733,8 +744,11 @@ class DAV extends Common { $response = $this->propfind($path); if (isset($response['{DAV:}getetag'])) { $cachedData = $this->getCache()->get($path); - $etag = trim($response['{DAV:}getetag'], '"'); - if ($cachedData['etag'] !== $etag) { + $etag = null; + if (isset($response['{DAV:}getetag'])) { + $etag = trim($response['{DAV:}getetag'], '"'); + } + if (!empty($etag) && $cachedData['etag'] !== $etag) { return true; } else if (isset($response['{http://owncloud.org/ns}permissions'])) { $permissions = $this->parsePermissions($response['{http://owncloud.org/ns}permissions']); diff --git a/lib/private/memcache/redis.php b/lib/private/memcache/redis.php index 78d061404ef..cfc35dcc377 100644 --- a/lib/private/memcache/redis.php +++ b/lib/private/memcache/redis.php @@ -151,7 +151,8 @@ class Redis extends Cache implements IMemcache { } static public function isAvailable() { - return extension_loaded('redis'); + return extension_loaded('redis') + && version_compare(phpversion('redis'), '2.2.5', '>='); } } diff --git a/lib/private/updater.php b/lib/private/updater.php index 8371193ef79..7f1a493d2a0 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -176,14 +176,18 @@ class Updater extends BasicEmitter { * @return bool true if the operation succeeded, false otherwise */ public function upgrade() { - $this->config->setSystemValue('maintenance', true); + $wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false); + + if(!$wasMaintenanceModeEnabled) { + $this->config->setSystemValue('maintenance', true); + $this->emit('\OC\Updater', 'maintenanceEnabled'); + } $installedVersion = $this->config->getSystemValue('version', '0.0.0'); $currentVersion = implode('.', \OC_Util::getVersion()); if ($this->log) { $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core')); } - $this->emit('\OC\Updater', 'maintenanceStart'); try { $this->doUpgrade($currentVersion, $installedVersion); @@ -191,8 +195,14 @@ class Updater extends BasicEmitter { $this->emit('\OC\Updater', 'failure', array($exception->getMessage())); } - $this->config->setSystemValue('maintenance', false); - $this->emit('\OC\Updater', 'maintenanceEnd'); + $this->emit('\OC\Updater', 'updateEnd'); + + if(!$wasMaintenanceModeEnabled) { + $this->config->setSystemValue('maintenance', false); + $this->emit('\OC\Updater', 'maintenanceDisabled'); + } else { + $this->emit('\OC\Updater', 'maintenanceActive'); + } } /** diff --git a/lib/public/app/iappmanager.php b/lib/public/app/iappmanager.php index 7be5c921841..208cd70f422 100644 --- a/lib/public/app/iappmanager.php +++ b/lib/public/app/iappmanager.php @@ -88,7 +88,7 @@ interface IAppManager { * List all installed apps * * @return string[] - * @since 8.0.0 + * @since 8.1.0 */ public function getInstalledApps(); diff --git a/settings/admin.php b/settings/admin.php index f2e01adab11..ee252ceb141 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -35,6 +35,7 @@ OC_Util::checkAdminUser(); OC_App::setActiveNavigationEntry("admin"); $template = new OC_Template('settings', 'admin', 'user'); +$l = OC_L10N::get('settings'); $showLog = (\OC::$server->getConfig()->getSystemValue('log_type', 'owncloud') === 'owncloud'); $numEntriesToLoad = 3; @@ -128,13 +129,23 @@ $template->assign('getenvServerNotWorking', empty($path)); // warn if Windows is used $template->assign('WindowsWarning', OC_Util::runningOnWindows()); -// warn if outdated version of APCu is used -$template->assign('ApcuOutdatedWarning', - extension_loaded('apcu') && version_compare(phpversion('apc'), '4.0.6') === -1); +// warn if outdated version of a memcache module is used +$caches = [ + 'apcu' => ['name' => $l->t('APCu'), 'version' => '4.0.6'], + 'redis' => ['name' => $l->t('Redis'), 'version' => '2.2.5'], +]; + +$outdatedCaches = []; +foreach ($caches as $php_module => $data) { + $isOutdated = extension_loaded($php_module) && version_compare(phpversion($php_module), $data['version'], '<'); + if ($isOutdated) { + $outdatedCaches[$php_module] = $data; + } +} +$template->assign('OutdatedCacheWarning', $outdatedCaches); // add hardcoded forms from the template $forms = OC_App::getForms('admin'); -$l = OC_L10N::get('settings'); $formsAndMore = array(); if ($request->getServerProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() || $suggestedOverwriteCliUrl || !OC_Util::isSetLocaleWorking() || diff --git a/settings/l10n/az.js b/settings/l10n/az.js index 9b5de07237d..6bf40131464 100644 --- a/settings/l10n/az.js +++ b/settings/l10n/az.js @@ -100,7 +100,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP göründüyü kimi, daxili doc bloklarının ayrılması işini görəcək. Bu bəzi özək proqramlarını əlçatılmaz edə bilər.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu ola bilər ki, cache/accelerator such tərəfindən cağırılıb hansi ki, Zend OPcache və eAccelerator-da olduğu kimidir.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sizin servef Microsoft Windows-da işləyir. Optimal istifadəçi təcrübəsi üçün, təkidlə Linux məsləhət görürük.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Yüklənmiş APCu versiyası 4.0.6-dır. Stabillik və məhsuldarlıq səbəblərinə görə, APCu-nu en son versiyaya yenilənməsini məsləhət görürük.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-nin modulu 'fileinfo' mövcud deyil. Mime-type təyin edilməsi üçün, modulun aktivləşdirilməsini təkidlə məsləhət görürük.", "System locale can not be set to a one which supports UTF-8." : "UTF-8 dsətklənən sistemdə daxili vaxt və dil təyinatı ola bilməz. ", "This means that there might be problems with certain characters in file names." : "Bu o deməkdir ki, orda faylın adında bəzi simvollarda problemlər var.", diff --git a/settings/l10n/az.json b/settings/l10n/az.json index 7b778b3d818..62244170115 100644 --- a/settings/l10n/az.json +++ b/settings/l10n/az.json @@ -98,7 +98,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP göründüyü kimi, daxili doc bloklarının ayrılması işini görəcək. Bu bəzi özək proqramlarını əlçatılmaz edə bilər.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu ola bilər ki, cache/accelerator such tərəfindən cağırılıb hansi ki, Zend OPcache və eAccelerator-da olduğu kimidir.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sizin servef Microsoft Windows-da işləyir. Optimal istifadəçi təcrübəsi üçün, təkidlə Linux məsləhət görürük.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Yüklənmiş APCu versiyası 4.0.6-dır. Stabillik və məhsuldarlıq səbəblərinə görə, APCu-nu en son versiyaya yenilənməsini məsləhət görürük.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-nin modulu 'fileinfo' mövcud deyil. Mime-type təyin edilməsi üçün, modulun aktivləşdirilməsini təkidlə məsləhət görürük.", "System locale can not be set to a one which supports UTF-8." : "UTF-8 dsətklənən sistemdə daxili vaxt və dil təyinatı ola bilməz. ", "This means that there might be problems with certain characters in file names." : "Bu o deməkdir ki, orda faylın adında bəzi simvollarda problemlər var.", diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js index 722f9799fb9..fbfcee89868 100644 --- a/settings/l10n/ca.js +++ b/settings/l10n/ca.js @@ -101,7 +101,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "El seu servidor està funcionant amb Microsoft Windows. Li recomanem Linux encaridament per gaudir una experiència òptima com a usuari.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Està instal·lada una versió de APCu inferior a 4.0.6; per raons d'estabilitat i rendiment, recomanem actualitzar a una nova versió de APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.", "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.", "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.", diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json index e7738f2ad32..b873368c93b 100644 --- a/settings/l10n/ca.json +++ b/settings/l10n/ca.json @@ -99,7 +99,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "El seu servidor està funcionant amb Microsoft Windows. Li recomanem Linux encaridament per gaudir una experiència òptima com a usuari.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Està instal·lada una versió de APCu inferior a 4.0.6; per raons d'estabilitat i rendiment, recomanem actualitzar a una nova versió de APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.", "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.", "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.", diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index b8e58315b69..4a328df2fd0 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server běží v prostředí Microsoft Windows. Pro optimální uživatelské pohodlí doporučujeme přejít na Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Nainstalováno APCu ve verzi nižší než 4.0.6, doporučujeme aktualizovat na novější verzi APCu pro lepší stabilitu a výkon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.", "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.", "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 49071c3ba88..58ef1a9523f 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server běží v prostředí Microsoft Windows. Pro optimální uživatelské pohodlí doporučujeme přejít na Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Nainstalováno APCu ve verzi nižší než 4.0.6, doporučujeme aktualizovat na novější verzi APCu pro lepší stabilitu a výkon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.", "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.", "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.", diff --git a/settings/l10n/da.js b/settings/l10n/da.js index acfcbc99f30..392b014631e 100644 --- a/settings/l10n/da.js +++ b/settings/l10n/da.js @@ -1,11 +1,16 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Advarsler om sikkerhed og opsætning", "Sharing" : "Deling", + "Server-side encryption" : "Kryptering på serversiden", "External Storage" : "Ekstern opbevaring", "Cron" : "Cron", + "Email server" : "E-mailserver", "Log" : "Log", + "Server Status" : "Serverstatus", "Tips & tricks" : "Tips & tricks", "Updates" : "Opdateringer", "Authentication error" : "Adgangsfejl", @@ -26,6 +31,8 @@ OC.L10N.register( "Unable to change password" : "Kunne ikke ændre kodeord", "Enabled" : "Aktiveret", "Not enabled" : "Slået fra", + "A problem occurred, please check your log files (Error: %s)" : "Der opstod en fejl - tjek venligst dine logfiler (fejl: %s)", + "Migration Completed" : "Overflytning blev fuldført", "Group already exists." : "Gruppen findes allerede.", "Unable to add group." : "Kan ikke tilføje gruppen.", "Unable to delete group." : "Kan ikke slette gruppen.", @@ -46,7 +53,12 @@ OC.L10N.register( "Email saved" : "E-mailadressen er gemt", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?", "Add trusted domain" : "Tilføj et domæne som du har tillid til", + "Migration in progress. Please wait until the migration is finished" : "Overflytning er i gang. Vent venligst indtil overflytningen er afsluttet", + "Migration started …" : "Overflytning er påbegyndt...", "Sending..." : "Sender...", + "Official" : "Officiel", + "Approved" : "Godkendt", + "Experimental" : "Eksperimentel", "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.", @@ -70,6 +82,7 @@ OC.L10N.register( "Strong password" : "Stærkt kodeord", "Valid until {date}" : "Gyldig indtil {date}", "Delete" : "Slet", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunne ikke slette {objName}", "Error creating group" : "Fejl ved oprettelse af gruppe", @@ -100,11 +113,13 @@ OC.L10N.register( "NT LAN Manager" : "NT LAN Manager", "SSL" : "SSL", "TLS" : "TLS", + "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.", + "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tjek venligst dokumentationen til installation for noterne til konfiguration af php og konfigurationen af php for din server, særligt når php-fpm anvendes.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server kører på Microsoft Windows. Vi anbefaler stærkt at anvende Linux for en optimal brugeroplevelse.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu er installeret i en version, der er lavere end 4.0.6. Af hensyn til stabilitet og ydelsesmæssige grunde, anbefaler vi at opdatere til en nyere version af APCu.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Der er installeret %1$s med lavere end version %2$s - af hensyn til stabiliteten og ydelsen, så anbefaler vi at opdatere til en nyere %1$s-version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.", "System locale can not be set to a one which supports UTF-8." : "Systemets lokalitet kan ikke sættes til et der bruger UTF-8.", "This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.", @@ -133,6 +148,14 @@ OC.L10N.register( "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut", + "Enable server-side encryption" : "Slå kryptering til på serversiden", + "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Kryptering er en ensrettet proces. Når krypteringen er slået til, så vil alle filer fra dette punkt og fremefter blive krypteret på serveren, og det vil ikke være muligt at slå krypteringen fra på et senere tidspunkt. Dette er den sidste advarsel: Er du sikker på, at du vil slå kryptering til?", + "Enable encryption" : "Slå kryptering til", + "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.", + "Select default encryption module:" : "Vælg standardmodulet til kryptering:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Slå venligst \"Standardmodul til kryptering\" til, og kør \"occ encryption:migrate\"", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen.", + "Start migration" : "Påbegynd overflytning", "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.", "Send mode" : "Tilstand for afsendelse", "Encryption" : "Kryptering", @@ -162,6 +185,8 @@ OC.L10N.register( "Improving the config.php" : "Forbedring af config.php", "Theming" : "Temaer", "Hardening and security guidance" : "Modstanddygtighed og sikkerheds vejledning", + "Experimental File Lock is enabled." : "Eksperimentel fillås er slået til.", + "Experimental File Lock is disabled." : "Eksperimentel fillås er slået fra.", "Version" : "Version", "Developer documentation" : "Dokumentation for udviklere", "Experimental applications ahead" : "Kommende eksperimentale programmer", diff --git a/settings/l10n/da.json b/settings/l10n/da.json index ecb240b0603..1532d401768 100644 --- a/settings/l10n/da.json +++ b/settings/l10n/da.json @@ -1,9 +1,14 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Advarsler om sikkerhed og opsætning", "Sharing" : "Deling", + "Server-side encryption" : "Kryptering på serversiden", "External Storage" : "Ekstern opbevaring", "Cron" : "Cron", + "Email server" : "E-mailserver", "Log" : "Log", + "Server Status" : "Serverstatus", "Tips & tricks" : "Tips & tricks", "Updates" : "Opdateringer", "Authentication error" : "Adgangsfejl", @@ -24,6 +29,8 @@ "Unable to change password" : "Kunne ikke ændre kodeord", "Enabled" : "Aktiveret", "Not enabled" : "Slået fra", + "A problem occurred, please check your log files (Error: %s)" : "Der opstod en fejl - tjek venligst dine logfiler (fejl: %s)", + "Migration Completed" : "Overflytning blev fuldført", "Group already exists." : "Gruppen findes allerede.", "Unable to add group." : "Kan ikke tilføje gruppen.", "Unable to delete group." : "Kan ikke slette gruppen.", @@ -44,7 +51,12 @@ "Email saved" : "E-mailadressen er gemt", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?", "Add trusted domain" : "Tilføj et domæne som du har tillid til", + "Migration in progress. Please wait until the migration is finished" : "Overflytning er i gang. Vent venligst indtil overflytningen er afsluttet", + "Migration started …" : "Overflytning er påbegyndt...", "Sending..." : "Sender...", + "Official" : "Officiel", + "Approved" : "Godkendt", + "Experimental" : "Eksperimentel", "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.", @@ -68,6 +80,7 @@ "Strong password" : "Stærkt kodeord", "Valid until {date}" : "Gyldig indtil {date}", "Delete" : "Slet", + "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.", "Groups" : "Grupper", "Unable to delete {objName}" : "Kunne ikke slette {objName}", "Error creating group" : "Fejl ved oprettelse af gruppe", @@ -98,11 +111,13 @@ "NT LAN Manager" : "NT LAN Manager", "SSL" : "SSL", "TLS" : "TLS", + "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.", + "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tjek venligst dokumentationen til installation for noterne til konfiguration af php og konfigurationen af php for din server, særligt når php-fpm anvendes.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server kører på Microsoft Windows. Vi anbefaler stærkt at anvende Linux for en optimal brugeroplevelse.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu er installeret i en version, der er lavere end 4.0.6. Af hensyn til stabilitet og ydelsesmæssige grunde, anbefaler vi at opdatere til en nyere version af APCu.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Der er installeret %1$s med lavere end version %2$s - af hensyn til stabiliteten og ydelsen, så anbefaler vi at opdatere til en nyere %1$s-version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.", "System locale can not be set to a one which supports UTF-8." : "Systemets lokalitet kan ikke sættes til et der bruger UTF-8.", "This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.", @@ -131,6 +146,14 @@ "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut", + "Enable server-side encryption" : "Slå kryptering til på serversiden", + "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Kryptering er en ensrettet proces. Når krypteringen er slået til, så vil alle filer fra dette punkt og fremefter blive krypteret på serveren, og det vil ikke være muligt at slå krypteringen fra på et senere tidspunkt. Dette er den sidste advarsel: Er du sikker på, at du vil slå kryptering til?", + "Enable encryption" : "Slå kryptering til", + "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.", + "Select default encryption module:" : "Vælg standardmodulet til kryptering:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Slå venligst \"Standardmodul til kryptering\" til, og kør \"occ encryption:migrate\"", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen.", + "Start migration" : "Påbegynd overflytning", "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.", "Send mode" : "Tilstand for afsendelse", "Encryption" : "Kryptering", @@ -160,6 +183,8 @@ "Improving the config.php" : "Forbedring af config.php", "Theming" : "Temaer", "Hardening and security guidance" : "Modstanddygtighed og sikkerheds vejledning", + "Experimental File Lock is enabled." : "Eksperimentel fillås er slået til.", + "Experimental File Lock is disabled." : "Eksperimentel fillås er slået fra.", "Version" : "Version", "Developer documentation" : "Dokumentation for udviklere", "Experimental applications ahead" : "Kommende eksperimentale programmer", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 10563cf0c3f..a37fd9e2d61 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu ist in einer Version kleiner als 4.0.6 installiert. Aus Stabilitäts- und Geschwindigkeitsgründen wird die Aktualisierung auf eine neuere APCu-Version empfohlen.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 6db4eabf736..d7296996319 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu ist in einer Version kleiner als 4.0.6 installiert. Aus Stabilitäts- und Geschwindigkeitsgründen wird die Aktualisierung auf eine neuere APCu-Version empfohlen.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index a5d05a3084e..8670f87ba1d 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu ist in einer Version kleiner als 4.0.6 installiert. Aus Stabilitäts- und Geschwindigkeitsgründen wird die Aktualisierung auf eine neuere APCu-Version empfohlen.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 42758546e93..5f613faeb04 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu ist in einer Version kleiner als 4.0.6 installiert. Aus Stabilitäts- und Geschwindigkeitsgründen wird die Aktualisierung auf eine neuere APCu-Version empfohlen.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", "System locale can not be set to a one which supports UTF-8." : "Es kann kein Systemgebietsschema gesetzt werden, das UTF-8 unterstützt.", "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass es zu Problemen mit bestimmten Zeichen in Dateinamen kommen kann.", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index b6ee7c5ac48..3f9f0d552f9 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -117,7 +117,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ο διακομιστής σας τρέχει σε Microsoft Windows. Συστήνουμε ιδιαίτερα Linux για τη βέλτιστη εμπειρία του χρήστη.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Είναι εγκατεστημένη APCu παλαιότερη της έκδοσης 4.0.6. Για λόγους σταθερότητας και απόδοσης συνιστούμε να εγκατασταθεί ενημερωμένη έκδοση APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ", "System locale can not be set to a one which supports UTF-8." : "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8.", "This means that there might be problems with certain characters in file names." : "Αυτό σημαίνει ότι μπορεί να υπάρχουν προβλήματα με κάποιους χαρακτήρες στα ονόματα αρχείων.", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index 7cabf7f8a92..c4c3caffabc 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -115,7 +115,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ο διακομιστής σας τρέχει σε Microsoft Windows. Συστήνουμε ιδιαίτερα Linux για τη βέλτιστη εμπειρία του χρήστη.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Είναι εγκατεστημένη APCu παλαιότερη της έκδοσης 4.0.6. Για λόγους σταθερότητας και απόδοσης συνιστούμε να εγκατασταθεί ενημερωμένη έκδοση APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ", "System locale can not be set to a one which supports UTF-8." : "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8.", "This means that there might be problems with certain characters in file names." : "Αυτό σημαίνει ότι μπορεί να υπάρχουν προβλήματα με κάποιους χαρακτήρες στα ονόματα αρχείων.", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index 361600bf05b..14a96c3ddb1 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -8,6 +8,7 @@ OC.L10N.register( "Cron" : "Cron", "Email server" : "Email server", "Log" : "Log", + "Server Status" : "Server Status", "Tips & tricks" : "Tips & tricks", "Updates" : "Updates", "Authentication error" : "Authentication error", @@ -53,6 +54,9 @@ OC.L10N.register( "Migration in progress. Please wait until the migration is finished" : "Migration in progress. Please wait until the migration is finished", "Migration started …" : "Migration started …", "Sending..." : "Sending...", + "Official" : "Official", + "Approved" : "Approved", + "Experimental" : "Experimental", "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.", @@ -113,7 +117,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend updating to a newer APCu version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.", "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.", "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.", @@ -179,6 +182,8 @@ OC.L10N.register( "Improving the config.php" : "Improving the config.php", "Theming" : "Theming", "Hardening and security guidance" : "Hardening and security guidance", + "Experimental File Lock is enabled." : "Experimental File Lock is enabled.", + "Experimental File Lock is disabled." : "Experimental File Lock is disabled.", "Version" : "Version", "Developer documentation" : "Developer documentation", "Experimental applications ahead" : "Experimental applications ahead", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index 8fa70ce9bc0..cd91b5abe82 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -6,6 +6,7 @@ "Cron" : "Cron", "Email server" : "Email server", "Log" : "Log", + "Server Status" : "Server Status", "Tips & tricks" : "Tips & tricks", "Updates" : "Updates", "Authentication error" : "Authentication error", @@ -51,6 +52,9 @@ "Migration in progress. Please wait until the migration is finished" : "Migration in progress. Please wait until the migration is finished", "Migration started …" : "Migration started …", "Sending..." : "Sending...", + "Official" : "Official", + "Approved" : "Approved", + "Experimental" : "Experimental", "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.", @@ -111,7 +115,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend updating to a newer APCu version.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.", "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.", "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.", @@ -177,6 +180,8 @@ "Improving the config.php" : "Improving the config.php", "Theming" : "Theming", "Hardening and security guidance" : "Hardening and security guidance", + "Experimental File Lock is enabled." : "Experimental File Lock is enabled.", + "Experimental File Lock is disabled." : "Experimental File Lock is disabled.", "Version" : "Version", "Developer documentation" : "Developer documentation", "Experimental applications ahead" : "Experimental applications ahead", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 55f085f5fe7..3a478413eaa 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Está instalada una versión de APCu inferior a 4.0.6; por razones de estabilidad y rendimiento, recomendamos actualizar a una nueva versión de APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 4b67f7aad14..f1b8b8bcde2 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Está instalada una versión de APCu inferior a 4.0.6; por razones de estabilidad y rendimiento, recomendamos actualizar a una nueva versión de APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.", "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.", "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index b0cea5a0e12..14003938c66 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -1,6 +1,8 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset", "Sharing" : "Jakaminen", "Server-side encryption" : "Palvelinpään salaus", @@ -111,7 +113,6 @@ OC.L10N.register( "TLS" : "TLS", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu alta version 4.0.6 on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään APCu:n uudempaan versioon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.", "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.", "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index 00baee63267..fb1e886a94c 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -1,4 +1,6 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Turvallisuus- ja asetusvaroitukset", "Sharing" : "Jakaminen", "Server-side encryption" : "Palvelinpään salaus", @@ -109,7 +111,6 @@ "TLS" : "TLS", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu alta version 4.0.6 on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään APCu:n uudempaan versioon.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.", "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.", "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index 0caa92edda7..6517c8e7abb 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu est installé en version inférieure à 4.0.6. Pour des raisons de stabilité et de performances, nous recommandons de mettre à jour vers une version d'APCu plus récente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.", "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec prise en charge d'UTF-8.", "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 34bbc96abe9..091ed71783c 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu est installé en version inférieure à 4.0.6. Pour des raisons de stabilité et de performances, nous recommandons de mettre à jour vers une version d'APCu plus récente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.", "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec prise en charge d'UTF-8.", "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.", diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js index 56a7b351d27..4d2865b3c9b 100644 --- a/settings/l10n/gl.js +++ b/settings/l10n/gl.js @@ -1,6 +1,8 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Avisos de seguridade e configuración", "Sharing" : "Compartindo", "Server-side encryption" : "Cifrado na parte do servidor", @@ -117,7 +119,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor funciona baixo Windows de Microsoft. Recomendámoslle encarecidamente que empregue Linux para obter unha perfecta experiencia de usuario.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Está instalada a APCu baixo a versión 4.0.6, por razóns de estabilidade e rendemento, recomendamos actualizar a unha nova versión da APCu.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Está instalada a %1$s baixo a versión %2$s, por razóns de estabilidade e rendemento, recomendamos actualizar a unha nova versión da %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.", "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.", "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.", diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json index 0546f5f0f57..d41543aafbc 100644 --- a/settings/l10n/gl.json +++ b/settings/l10n/gl.json @@ -1,4 +1,6 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Avisos de seguridade e configuración", "Sharing" : "Compartindo", "Server-side encryption" : "Cifrado na parte do servidor", @@ -115,7 +117,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor funciona baixo Windows de Microsoft. Recomendámoslle encarecidamente que empregue Linux para obter unha perfecta experiencia de usuario.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Está instalada a APCu baixo a versión 4.0.6, por razóns de estabilidade e rendemento, recomendamos actualizar a unha nova versión da APCu.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Está instalada a %1$s baixo a versión %2$s, por razóns de estabilidade e rendemento, recomendamos actualizar a unha nova versión da %1$s.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.", "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.", "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index 3a542c05f84..810141a10c4 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu dibawah versi 4.0.6 terinstal, untuk alasan stabilitas dan kinerja, kami menyarankan untuk memperbarui ke versi APCu yang lebih baru.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.", "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.", "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index cebcad27207..c8b819a6eb0 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu dibawah versi 4.0.6 terinstal, untuk alasan stabilitas dan kinerja, kami menyarankan untuk memperbarui ke versi APCu yang lebih baru.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.", "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.", "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index c62bde67223..1acec51ea90 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -117,7 +117,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "La versione di APCu installata è anteriore alla 4.0.6, per motivi di stabilità e prestazioni, consigliamo di aggiornare una una versione di APCu più recente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.", "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.", "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index dc7a563e9f6..309d7baf015 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -115,7 +115,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "La versione di APCu installata è anteriore alla 4.0.6, per motivi di stabilità e prestazioni, consigliamo di aggiornare una una versione di APCu più recente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.", "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.", "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index 98c2d57b8df..bbd9f75a124 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -103,7 +103,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレーターが原因かもしれません。", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "バージョン4.0.6より古いAPCuがインストールされています、安定性とパフォーマンスのために新しいバージョンのAPCuにアップデートすることをお勧めします。", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。", "System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。", "This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index 349ec6dc0f2..065c0fcd43f 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -101,7 +101,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレーターが原因かもしれません。", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "サーバーがMicrosoft Windowsで動いています。ユーザーに最適なサービスを提供するためには、Linuxを利用することを強くお勧めします。", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "バージョン4.0.6より古いAPCuがインストールされています、安定性とパフォーマンスのために新しいバージョンのAPCuにアップデートすることをお勧めします。", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。", "System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。", "This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。", diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js index 74d80b62413..ed045a87e03 100644 --- a/settings/l10n/ko.js +++ b/settings/l10n/ko.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "서버가 Microsoft Windows 환경에서 동작하고 있습니다. 최적의 사용자 경험을 위해서는 리눅스를 사용할 것을 권장합니다.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu 버전 4.0.6 이하가 설치되어 있습니다. 안정성 및 성능 문제가 발생할 수 있으므로 더 새로운 APCu 버전을 사용하는 것을 추천합니다.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.", "System locale can not be set to a one which supports UTF-8." : "UTF-8을 지원하는 시스템 로캘을 사용할 수 없습니다.", "This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.", diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json index 98f7519598a..d109840b2a9 100644 --- a/settings/l10n/ko.json +++ b/settings/l10n/ko.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "서버가 Microsoft Windows 환경에서 동작하고 있습니다. 최적의 사용자 경험을 위해서는 리눅스를 사용할 것을 권장합니다.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu 버전 4.0.6 이하가 설치되어 있습니다. 안정성 및 성능 문제가 발생할 수 있으므로 더 새로운 APCu 버전을 사용하는 것을 추천합니다.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.", "System locale can not be set to a one which supports UTF-8." : "UTF-8을 지원하는 시스템 로캘을 사용할 수 없습니다.", "This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.", diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js index 4c85e589ad9..2f219d3cce0 100644 --- a/settings/l10n/nb_NO.js +++ b/settings/l10n/nb_NO.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu lavere enn versjon 4.0.6 er installert. Vi anbefaler å oppdatere til en nyere APCu-versjon for bedre stabilitet og ytelse.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.", "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.", "This means that there might be problems with certain characters in file names." : "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.", diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json index 30dfcec7418..710c6882387 100644 --- a/settings/l10n/nb_NO.json +++ b/settings/l10n/nb_NO.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu lavere enn versjon 4.0.6 er installert. Vi anbefaler å oppdatere til en nyere APCu-versjon for bedre stabilitet og ytelse.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.", "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.", "This means that there might be problems with certain characters in file names." : "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index 2dc2722e9f4..ee2597159a1 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -1,6 +1,8 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen", "Sharing" : "Delen", "Server-side encryption" : "Server-side versleuteling", @@ -8,6 +10,7 @@ OC.L10N.register( "Cron" : "Cron", "Email server" : "E-mailserver", "Log" : "Log", + "Server Status" : "Server Status", "Tips & tricks" : "Tips & trucs", "Updates" : "Updates", "Authentication error" : "Authenticatie fout", @@ -53,6 +56,9 @@ OC.L10N.register( "Migration in progress. Please wait until the migration is finished" : "Migratie bezig. Wacht tot het proces klaar is.", "Migration started …" : "Migratie gestart...", "Sending..." : "Versturen...", + "Official" : "Officieel", + "Approved" : "Goedgekeurd", + "Experimental" : "Experimenteel", "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.", @@ -113,7 +119,7 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu lager dan versie 4.0.6 geïnstalleerd, voor betere stabiliteit en prestaties adviseren we bij te werken naar een nieuwere APCu versie.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren we bij te werken naar een nieuwere %1$s versie.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.", @@ -179,6 +185,8 @@ OC.L10N.register( "Improving the config.php" : "config.php verbeteren", "Theming" : "Thema's", "Hardening and security guidance" : "Hardening en security advies", + "Experimental File Lock is enabled." : "Experimentele bestandsblokkade is geactiveerd", + "Experimental File Lock is disabled." : "Experimentele bestandsblokkade is gedeactiveerd", "Version" : "Versie", "Developer documentation" : "Ontwikkelaarsdocumentatie", "Experimental applications ahead" : "Experimentele applicaties vooraan", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index f6a14025985..61239b8f61b 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -1,4 +1,6 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Beveiligings- en instellingswaarschuwingen", "Sharing" : "Delen", "Server-side encryption" : "Server-side versleuteling", @@ -6,6 +8,7 @@ "Cron" : "Cron", "Email server" : "E-mailserver", "Log" : "Log", + "Server Status" : "Server Status", "Tips & tricks" : "Tips & trucs", "Updates" : "Updates", "Authentication error" : "Authenticatie fout", @@ -51,6 +54,9 @@ "Migration in progress. Please wait until the migration is finished" : "Migratie bezig. Wacht tot het proces klaar is.", "Migration started …" : "Migratie gestart...", "Sending..." : "Versturen...", + "Official" : "Officieel", + "Approved" : "Goedgekeurd", + "Experimental" : "Experimenteel", "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.", @@ -111,7 +117,7 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu lager dan versie 4.0.6 geïnstalleerd, voor betere stabiliteit en prestaties adviseren we bij te werken naar een nieuwere APCu versie.", + "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren we bij te werken naar een nieuwere %1$s versie.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.", "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.", "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.", @@ -177,6 +183,8 @@ "Improving the config.php" : "config.php verbeteren", "Theming" : "Thema's", "Hardening and security guidance" : "Hardening en security advies", + "Experimental File Lock is enabled." : "Experimentele bestandsblokkade is geactiveerd", + "Experimental File Lock is disabled." : "Experimentele bestandsblokkade is gedeactiveerd", "Version" : "Versie", "Developer documentation" : "Ontwikkelaarsdocumentatie", "Experimental applications ahead" : "Experimentele applicaties vooraan", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index cf0bc409318..05e912aedc4 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -117,7 +117,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Instalada APCu abaixo da versão 4.0.6, por razões de estabilidade e performance nós recomendamos atualizar para a nova versão APCu", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).", "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.", "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index ad62c0afced..9818511263d 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -115,7 +115,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Instalada APCu abaixo da versão 4.0.6, por razões de estabilidade e performance nós recomendamos atualizar para a nova versão APCu", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).", "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.", "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.", diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js index 1c9e5a1a860..f294e997812 100644 --- a/settings/l10n/pt_PT.js +++ b/settings/l10n/pt_PT.js @@ -106,7 +106,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor está a correr Microsoft Windows. Nós recomendamos Linux para uma experiência de utilizador optimizada.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Uma versão do APCu abaixo de 4.0.6 instalada, por motivos de estabilidade e desempenho é recomendado que actualize para uma versão do APCu mais recente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.", "System locale can not be set to a one which supports UTF-8." : "Não é possível definir a internacionalização do sistema para um que suporte o UTF-8.", "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.", diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json index 16f515dae3d..a3c20fec3d2 100644 --- a/settings/l10n/pt_PT.json +++ b/settings/l10n/pt_PT.json @@ -104,7 +104,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O seu servidor está a correr Microsoft Windows. Nós recomendamos Linux para uma experiência de utilizador optimizada.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Uma versão do APCu abaixo de 4.0.6 instalada, por motivos de estabilidade e desempenho é recomendado que actualize para uma versão do APCu mais recente.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.", "System locale can not be set to a one which supports UTF-8." : "Não é possível definir a internacionalização do sistema para um que suporte o UTF-8.", "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 8e53b7e725c..c19118bea6a 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -112,7 +112,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер работает на ОС Microsoft Windows. Мы настоятельно рекомендуем использовать ОС семейства Linux для достижения наилучших условий использования.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Установлена APCu, версия 4.0.6. В целях стабильности мы рекомендуем обновить на более новую версию APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.", "System locale can not be set to a one which supports UTF-8." : "Невозможно установить системную локаль, поддерживающую UTF-8", "This means that there might be problems with certain characters in file names." : "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.", diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index f41c4df5243..0d622fc787d 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -110,7 +110,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер работает на ОС Microsoft Windows. Мы настоятельно рекомендуем использовать ОС семейства Linux для достижения наилучших условий использования.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Установлена APCu, версия 4.0.6. В целях стабильности мы рекомендуем обновить на более новую версию APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.", "System locale can not be set to a one which supports UTF-8." : "Невозможно установить системную локаль, поддерживающую UTF-8", "This means that there might be problems with certain characters in file names." : "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.", diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js index 0694712c0e9..47593387c8f 100644 --- a/settings/l10n/sk_SK.js +++ b/settings/l10n/sk_SK.js @@ -97,7 +97,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server je spustený s Microsoft Windows. Pre optimálne používanie odporúčame Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Je nainštalované APCu verzie nižšej ako 4.0.6. Z dôvodu stability a výkonnosti odporúčame aktualizovať ho na novšiu verziu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.", "System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.", "This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.", diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json index 002a3c49816..b5f94b36612 100644 --- a/settings/l10n/sk_SK.json +++ b/settings/l10n/sk_SK.json @@ -95,7 +95,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server je spustený s Microsoft Windows. Pre optimálne používanie odporúčame Linux.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Je nainštalované APCu verzie nižšej ako 4.0.6. Z dôvodu stability a výkonnosti odporúčame aktualizovať ho na novšiu verziu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.", "System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.", "This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.", diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js index e402559f602..bb28ebf16be 100644 --- a/settings/l10n/sr.js +++ b/settings/l10n/sr.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер ради под оперативним системом Microsoft Windows. Препоручујемо оперативни систем Linux за оптималaн кориснички доживљај.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Инсталиран је АПЦу испод верзије 4.0.6, за повећање стабилности и перформанси препоручујемо да инсталирате новију АПЦу верзију.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Недостаје ПХП модул „fileinfo“. Препоручујемо вам да га укључите да бисте добили најбоље резултате с откривањем МИМЕ врста.", "System locale can not be set to a one which supports UTF-8." : "Системски локалитет се не може поставити на неки који подржава УТФ-8", "This means that there might be problems with certain characters in file names." : "То значи да може доћи до проблема са неким знаковима у називима фајлова.", diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json index 69f6b327fbe..cf6c25d77ff 100644 --- a/settings/l10n/sr.json +++ b/settings/l10n/sr.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер ради под оперативним системом Microsoft Windows. Препоручујемо оперативни систем Linux за оптималaн кориснички доживљај.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Инсталиран је АПЦу испод верзије 4.0.6, за повећање стабилности и перформанси препоручујемо да инсталирате новију АПЦу верзију.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Недостаје ПХП модул „fileinfo“. Препоручујемо вам да га укључите да бисте добили најбоље резултате с откривањем МИМЕ врста.", "System locale can not be set to a one which supports UTF-8." : "Системски локалитет се не може поставити на неки који подржава УТФ-8", "This means that there might be problems with certain characters in file names." : "То значи да може доћи до проблема са неким знаковима у називима фајлова.", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index 05110cb7046..f25eec78ce4 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -12,6 +12,7 @@ OC.L10N.register( "Unable to add user to group %s" : "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้", "Unable to remove user from group %s" : "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้", "Couldn't update app." : "ไม่สามารถอัพเดทแอปฯ", + "Wrong password" : "รหัสผ่านไม่ถูกต้อง", "Saved" : "บันทึกแล้ว", "Email sent" : "ส่งอีเมล์แล้ว", "Email saved" : "อีเมลถูกบันทึกแล้ว", @@ -34,6 +35,7 @@ OC.L10N.register( "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้", "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ", "Encryption" : "การเข้ารหัส", + "Authentication required" : "ตรวจสอบความถูกต้อง", "Server address" : "ที่อยู่เซิร์ฟเวอร์", "Port" : "พอร์ต", "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index 5b3ba2b98ed..7398a4a95df 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -10,6 +10,7 @@ "Unable to add user to group %s" : "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้", "Unable to remove user from group %s" : "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้", "Couldn't update app." : "ไม่สามารถอัพเดทแอปฯ", + "Wrong password" : "รหัสผ่านไม่ถูกต้อง", "Saved" : "บันทึกแล้ว", "Email sent" : "ส่งอีเมล์แล้ว", "Email saved" : "อีเมลถูกบันทึกแล้ว", @@ -32,6 +33,7 @@ "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้", "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ", "Encryption" : "การเข้ารหัส", + "Authentication required" : "ตรวจสอบความถูกต้อง", "Server address" : "ที่อยู่เซิร์ฟเวอร์", "Port" : "พอร์ต", "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index d3d9485c39d..02dd3f3c1aa 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -113,7 +113,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu 4.0.6 sürümünden eskisi yüklü. Kararlılık ve performans nedenleri ile daha yeni bir APCu sürümüne güncellemenizi öneriyoruz.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.", "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.", "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index b2a2c6bf936..1bbe08c4e86 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -111,7 +111,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu 4.0.6 sürümünden eskisi yüklü. Kararlılık ve performans nedenleri ile daha yeni bir APCu sürümüne güncellemenizi öneriyoruz.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.", "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.", "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.", diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js index 0456525d452..9f9d525c787 100644 --- a/settings/l10n/uk.js +++ b/settings/l10n/uk.js @@ -111,7 +111,6 @@ OC.L10N.register( "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер працює на ОС Microsoft Windows. Ми настійно рекомендуємо використовувати ОС сімейства Linux для досягнення найкращих умов використання.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Встановлена APCu, версія 4.0.6. З метою стабільності ми рекомендуємо оновити на більш нову версію APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.", "System locale can not be set to a one which supports UTF-8." : "Неможливо встановити системну локаль, яка б підтримувала UTF-8.", "This means that there might be problems with certain characters in file names." : "Це означає, що можуть виникати проблеми з деякими символами в іменах файлів.", diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json index 693c051ef7c..413ad8f13f2 100644 --- a/settings/l10n/uk.json +++ b/settings/l10n/uk.json @@ -109,7 +109,6 @@ "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.", "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер працює на ОС Microsoft Windows. Ми настійно рекомендуємо використовувати ОС сімейства Linux для досягнення найкращих умов використання.", - "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "Встановлена APCu, версія 4.0.6. З метою стабільності ми рекомендуємо оновити на більш нову версію APCu.", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.", "System locale can not be set to a one which supports UTF-8." : "Неможливо встановити системну локаль, яка б підтримувала UTF-8.", "This means that there might be problems with certain characters in file names." : "Це означає, що можуть виникати проблеми з деякими символами в іменах файлів.", diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js index cb3bd6c6670..5274c12fd9c 100644 --- a/settings/l10n/vi.js +++ b/settings/l10n/vi.js @@ -1,6 +1,7 @@ OC.L10N.register( "settings", { + "Security & setup warnings" : "Bảo mật và thiết lập cảnh báo", "Sharing" : "Chia sẻ", "External Storage" : "Lưu trữ ngoài", "Cron" : "Cron", @@ -15,6 +16,7 @@ OC.L10N.register( "Unable to remove user from group %s" : "Không thể xóa người dùng từ nhóm %s", "Couldn't update app." : "Không thể cập nhật ứng dụng", "Enabled" : "Bật", + "Saved" : "Đã lưu", "Email sent" : "Email đã được gửi", "Email saved" : "Lưu email", "All" : "Tất cả", diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json index f6ffc475ee2..557bb8d2e91 100644 --- a/settings/l10n/vi.json +++ b/settings/l10n/vi.json @@ -1,4 +1,5 @@ { "translations": { + "Security & setup warnings" : "Bảo mật và thiết lập cảnh báo", "Sharing" : "Chia sẻ", "External Storage" : "Lưu trữ ngoài", "Cron" : "Cron", @@ -13,6 +14,7 @@ "Unable to remove user from group %s" : "Không thể xóa người dùng từ nhóm %s", "Couldn't update app." : "Không thể cập nhật ứng dụng", "Enabled" : "Bật", + "Saved" : "Đã lưu", "Email sent" : "Email đã được gửi", "Email saved" : "Lưu email", "All" : "Tất cả", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 3d253d4cbbd..fb6ef9b3e77 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -106,11 +106,11 @@ if ($_['WindowsWarning']) { <?php } -// APCU Warning if outdated -if ($_['ApcuOutdatedWarning']) { +// Warning if memcache is outdated +foreach ($_['OutdatedCacheWarning'] as $php_module => $data) { ?> <li> - <?php p($l->t('APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version.')); ?> + <?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version.', $data)); ?> </li> <?php } diff --git a/tests/core/command/encryption/disabletest.php b/tests/core/command/encryption/disabletest.php index 26c814a9c4e..dfd06e2e26e 100644 --- a/tests/core/command/encryption/disabletest.php +++ b/tests/core/command/encryption/disabletest.php @@ -80,6 +80,6 @@ class DisableTest extends TestCase { ->with('core', 'encryption_enabled', 'no'); } - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } } diff --git a/tests/core/command/encryption/enabletest.php b/tests/core/command/encryption/enabletest.php index 377d0e2a528..e2357464aa1 100644 --- a/tests/core/command/encryption/enabletest.php +++ b/tests/core/command/encryption/enabletest.php @@ -114,6 +114,6 @@ class EnableTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedDefaultModuleString)); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } } diff --git a/tests/core/command/encryption/setdefaultmoduletest.php b/tests/core/command/encryption/setdefaultmoduletest.php index e2a61dd10f6..3230a57db07 100644 --- a/tests/core/command/encryption/setdefaultmoduletest.php +++ b/tests/core/command/encryption/setdefaultmoduletest.php @@ -87,6 +87,6 @@ class SetDefaultModuleTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedString)); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } } diff --git a/tests/core/command/user/deletetest.php b/tests/core/command/user/deletetest.php index bfcf031b719..99822ec6589 100644 --- a/tests/core/command/user/deletetest.php +++ b/tests/core/command/user/deletetest.php @@ -83,7 +83,7 @@ class DeleteTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedString)); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } public function testInvalidUser() { @@ -101,6 +101,6 @@ class DeleteTest extends TestCase { ->method('writeln') ->with($this->stringContains('User does not exist')); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } } diff --git a/tests/core/command/user/lastseentest.php b/tests/core/command/user/lastseentest.php index 7eda6fb27ed..84805f5c072 100644 --- a/tests/core/command/user/lastseentest.php +++ b/tests/core/command/user/lastseentest.php @@ -82,7 +82,7 @@ class LastSeenTest extends TestCase { ->method('writeln') ->with($this->stringContains($expectedString)); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } public function testInvalidUser() { @@ -100,6 +100,6 @@ class LastSeenTest extends TestCase { ->method('writeln') ->with($this->stringContains('User does not exist')); - \Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); + self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]); } } diff --git a/tests/lib/activitymanager.php b/tests/lib/activitymanager.php index d3263fa2ede..a35daeaf494 100644 --- a/tests/lib/activitymanager.php +++ b/tests/lib/activitymanager.php @@ -156,7 +156,7 @@ class Test_ActivityManager extends \Test\TestCase { */ public function testGetUserFromTokenThrowInvalidToken($token, $users) { $this->mockRSSToken($token, $token, $users); - \Test_Helper::invokePrivate($this->activityManager, 'getUserFromToken'); + self::invokePrivate($this->activityManager, 'getUserFromToken'); } public function getUserFromTokenData() { diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php index 282d13a3397..a4bf3519bfc 100644 --- a/tests/lib/appframework/http/RequestTest.php +++ b/tests/lib/appframework/http/RequestTest.php @@ -797,7 +797,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertNull(\Test_Helper::invokePrivate($request, 'getOverwriteHost')); + $this->assertNull(self::invokePrivate($request, 'getOverwriteHost')); } public function testGetOverwriteHostWithOverwrite() { @@ -824,7 +824,7 @@ class RequestTest extends \Test\TestCase { $this->stream ); - $this->assertSame('www.owncloud.org', \Test_Helper::invokePrivate($request, 'getOverwriteHost')); + $this->assertSame('www.owncloud.org', self::invokePrivate($request, 'getOverwriteHost')); } public function testGetPathInfoWithSetEnv() { diff --git a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php index 92ea5450ab9..5c93c95e188 100644 --- a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php @@ -121,6 +121,13 @@ class CORSMiddlewareTest extends \Test\TestCase { ); $this->reflector->reflect($this, __FUNCTION__); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); + $this->session->expects($this->never()) + ->method('logout'); + $this->session->expects($this->never()) + ->method('login') + ->with($this->equalTo('user'), $this->equalTo('pass')) + ->will($this->returnValue(true)); + $this->reflector->reflect($this, __FUNCTION__); $middleware->beforeController($this, __FUNCTION__, new Response()); } diff --git a/tests/lib/encryption/keys/storage.php b/tests/lib/encryption/keys/storage.php index 45cd272cca0..8af3821dc93 100644 --- a/tests/lib/encryption/keys/storage.php +++ b/tests/lib/encryption/keys/storage.php @@ -361,7 +361,46 @@ class StorageTest extends TestCase { array('/user1/files/source.txt', '/user1/files/target.txt', true, false, '/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'), + array('/user2/files/source.txt', '/user1/files/target.txt', false, false, + '/user2/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'), + array('/user2/files/foo/source.txt', '/user1/files/target.txt', false, false, + '/user2/files_encryption/keys/files/foo/source.txt/', '/user1/files_encryption/keys/files/target.txt/'), + array('/user2/files/source.txt', '/user1/files/foo/target.txt', false, false, + '/user2/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/foo/target.txt/'), + array('/user2/files/source.txt', '/user1/files/foo/target.txt', true, true, + '/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/foo/target.txt/'), + array('/user2/files/source.txt', '/user1/files/target.txt', false, true, + '/user2/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/target.txt/'), + array('/user2/files/source.txt', '/user1/files/target.txt', true, false, + '/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'), + ); + } + /** + * @dataProvider dataTestGetPathToKeys + * + * @param string $path + * @param boolean $systemWideMountPoint + * @param string $expected + */ + public function testGetPathToKeys($path, $systemWideMountPoint, $expected) { + + $this->util->expects($this->any()) + ->method('getUidAndFilename') + ->will($this->returnCallback(array($this, 'getUidAndFilenameCallback'))); + $this->util->expects($this->any()) + ->method('isSystemWideMountPoint') + ->willReturn($systemWideMountPoint); + + $this->assertSame($expected, + self::invokePrivate($this->storage, 'getPathToKeys', [$path]) + ); + } + + public function dataTestGetPathToKeys() { + return array( + array('/user1/files/source.txt', false, '/user1/files_encryption/keys/files/source.txt/'), + array('/user1/files/source.txt', true, '/files_encryption/keys/files/source.txt/') ); } @@ -382,7 +421,7 @@ class StorageTest extends TestCase { '/user1/files_encryption', '/user1'); - \Test_Helper::invokePrivate($this->storage, 'keySetPreparation', array('/user1/files_encryption/keys/foo')); + self::invokePrivate($this->storage, 'keySetPreparation', array('/user1/files_encryption/keys/foo')); } public function mkdirCallback() { diff --git a/tests/lib/encryption/managertest.php b/tests/lib/encryption/managertest.php index 3b1e07ffd69..9af7bc2c134 100644 --- a/tests/lib/encryption/managertest.php +++ b/tests/lib/encryption/managertest.php @@ -81,7 +81,7 @@ class ManagerTest extends TestCase { /** * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException - * @expectedExceptionMessage Module with id: unknown does not exists. + * @expectedExceptionMessage Module with id: unknown does not exist. */ public function testGetEncryptionModuleUnknown() { $this->config->expects($this->any())->method('getAppValue')->willReturn(true); @@ -127,7 +127,7 @@ class ManagerTest extends TestCase { $en0 = $this->manager->getEncryptionModule('ID0'); $this->assertEquals('ID0', $en0->getId()); - $en0 = \Test_Helper::invokePrivate($this->manager, 'getDefaultEncryptionModule'); + $en0 = self::invokePrivate($this->manager, 'getDefaultEncryptionModule'); $this->assertEquals('ID0', $en0->getId()); $this->assertEquals('ID0', $this->manager->getDefaultEncryptionModuleId()); @@ -195,7 +195,7 @@ class ManagerTest extends TestCase { // // /** // * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException -// * @expectedExceptionMessage Module with id: unknown does not exists. +// * @expectedExceptionMessage Module with id: unknown does not exist. // */ // public function testGetEncryptionModuleUnknown() { // $config = $this->getMock('\OCP\IConfig'); diff --git a/tests/lib/files/pathverificationtest.php b/tests/lib/files/pathverificationtest.php index 65342c7799e..b59aceba7b1 100644 --- a/tests/lib/files/pathverificationtest.php +++ b/tests/lib/files/pathverificationtest.php @@ -94,7 +94,7 @@ class PathVerification extends \Test\TestCase { $storage = new Local(['datadir' => '']); $fileName = " 123{$fileName}456 "; - \Test_Helper::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); + self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); } public function providesInvalidCharsWindows() { @@ -151,7 +151,7 @@ class PathVerification extends \Test\TestCase { $storage = new Local(['datadir' => '']); $fileName = " 123{$fileName}456 "; - \Test_Helper::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); + self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); } public function providesInvalidCharsPosix() { @@ -200,7 +200,7 @@ class PathVerification extends \Test\TestCase { public function testPathVerificationReservedNamesWindows($fileName) { $storage = new Local(['datadir' => '']); - \Test_Helper::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); + self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); } public function providesReservedNamesWindows() { @@ -236,8 +236,8 @@ class PathVerification extends \Test\TestCase { public function testPathVerificationValidPaths($fileName) { $storage = new Local(['datadir' => '']); - \Test_Helper::invokePrivate($storage, 'verifyPosixPath', [$fileName]); - \Test_Helper::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); + self::invokePrivate($storage, 'verifyPosixPath', [$fileName]); + self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]); // nothing thrown $this->assertTrue(true); } diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index 62fba4c1716..2355009c9bf 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -22,6 +22,8 @@ namespace Test\Files\Storage; +use OC\Files\Cache\Watcher; + abstract class Storage extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage instance @@ -309,6 +311,22 @@ abstract class Storage extends \Test\TestCase { $this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 5)); } + /** + * Test whether checkUpdate properly returns false when there was + * no change. + */ + public function testCheckUpdate() { + if ($this->instance instanceof \OC\Files\Storage\Wrapper\Wrapper) { + $this->markTestSkipped('Cannot test update check on wrappers'); + } + $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; + $watcher = $this->instance->getWatcher(); + $watcher->setPolicy(Watcher::CHECK_ALWAYS); + $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile)); + $this->assertTrue($watcher->checkUpdate('/lorem.txt'), 'Update detected'); + $this->assertFalse($watcher->checkUpdate('/lorem.txt'), 'No update'); + } + public function testUnlink() { $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile)); diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index d286978d926..520091df42d 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -355,7 +355,7 @@ class Encryption extends \Test\Files\Storage\Storage { } $this->assertSame($expected, - \Test_Helper::invokePrivate($this->instance, 'copyKeys', ['/source', '/target']) + self::invokePrivate($this->instance, 'copyKeys', ['/source', '/target']) ); } diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 03c6dacde64..bd527de160d 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -509,28 +509,9 @@ class Test_Helper extends \Test\TestCase { * @param $methodName * @param array $parameters * @return mixed + * @deprecated Please extend \Test\TestCase and use self::invokePrivate() then */ public static function invokePrivate($object, $methodName, array $parameters = array()) { - $reflection = new ReflectionClass(get_class($object)); - - if ($reflection->hasMethod($methodName)) { - $method = $reflection->getMethod($methodName); - - $method->setAccessible(true); - - return $method->invokeArgs($object, $parameters); - } elseif ($reflection->hasProperty($methodName)) { - $property = $reflection->getProperty($methodName); - - $property->setAccessible(true); - - if (!empty($parameters)) { - $property->setValue($object, array_pop($parameters)); - } - - return $property->getValue($object); - } - - return false; + return parent::invokePrivate($object, $methodName, $parameters); } } diff --git a/tests/lib/http/client/clienttest.php b/tests/lib/http/client/clienttest.php index bd909769b09..c76fe0532a7 100644 --- a/tests/lib/http/client/clienttest.php +++ b/tests/lib/http/client/clienttest.php @@ -47,7 +47,7 @@ class ClientTest extends \Test\TestCase { ->method('getSystemValue') ->with('proxyuserpwd', null) ->willReturn(null); - $this->assertSame('', \Test_Helper::invokePrivate($this->client, 'getProxyUri')); + $this->assertSame('', self::invokePrivate($this->client, 'getProxyUri')); } public function testGetProxyUriProxyHostEmptyPassword() { @@ -61,7 +61,7 @@ class ClientTest extends \Test\TestCase { ->method('getSystemValue') ->with('proxyuserpwd', null) ->willReturn(null); - $this->assertSame('foo', \Test_Helper::invokePrivate($this->client, 'getProxyUri')); + $this->assertSame('foo', self::invokePrivate($this->client, 'getProxyUri')); } public function testGetProxyUriProxyHostWithPassword() { @@ -75,7 +75,7 @@ class ClientTest extends \Test\TestCase { ->method('getSystemValue') ->with('proxyuserpwd', null) ->willReturn('username:password'); - $this->assertSame('username:password@foo', \Test_Helper::invokePrivate($this->client, 'getProxyUri')); + $this->assertSame('username:password@foo', self::invokePrivate($this->client, 'getProxyUri')); } public function testGet() { diff --git a/tests/lib/mail/mailer.php b/tests/lib/mail/mailer.php index 7e5e689741a..21565f9ffb5 100644 --- a/tests/lib/mail/mailer.php +++ b/tests/lib/mail/mailer.php @@ -35,7 +35,7 @@ class MailerTest extends TestCase { } public function testGetMailInstance() { - $this->assertEquals(\Swift_MailTransport::newInstance(), \Test_Helper::invokePrivate($this->mailer, 'getMailinstance')); + $this->assertEquals(\Swift_MailTransport::newInstance(), self::invokePrivate($this->mailer, 'getMailinstance')); } public function testGetSendMailInstanceSendMail() { @@ -45,7 +45,7 @@ class MailerTest extends TestCase { ->with('mail_smtpmode', 'sendmail') ->will($this->returnValue('sendmail')); - $this->assertEquals(\Swift_SendmailTransport::newInstance('/usr/sbin/sendmail -bs'), \Test_Helper::invokePrivate($this->mailer, 'getSendMailInstance')); + $this->assertEquals(\Swift_SendmailTransport::newInstance('/usr/sbin/sendmail -bs'), self::invokePrivate($this->mailer, 'getSendMailInstance')); } public function testGetSendMailInstanceSendMailQmail() { @@ -55,11 +55,11 @@ class MailerTest extends TestCase { ->with('mail_smtpmode', 'sendmail') ->will($this->returnValue('qmail')); - $this->assertEquals(\Swift_SendmailTransport::newInstance('/var/qmail/bin/sendmail -bs'), \Test_Helper::invokePrivate($this->mailer, 'getSendMailInstance')); + $this->assertEquals(\Swift_SendmailTransport::newInstance('/var/qmail/bin/sendmail -bs'), self::invokePrivate($this->mailer, 'getSendMailInstance')); } public function testGetInstanceDefault() { - $this->assertInstanceOf('\Swift_MailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance')); + $this->assertInstanceOf('\Swift_MailTransport', self::invokePrivate($this->mailer, 'getInstance')); } public function testGetInstancePhp() { @@ -68,7 +68,7 @@ class MailerTest extends TestCase { ->method('getSystemValue') ->will($this->returnValue('php')); - $this->assertInstanceOf('\Swift_MailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance')); + $this->assertInstanceOf('\Swift_MailTransport', self::invokePrivate($this->mailer, 'getInstance')); } public function testGetInstanceSendmail() { @@ -77,7 +77,7 @@ class MailerTest extends TestCase { ->method('getSystemValue') ->will($this->returnValue('sendmail')); - $this->assertInstanceOf('\Swift_SendmailTransport', \Test_Helper::invokePrivate($this->mailer, 'getInstance')); + $this->assertInstanceOf('\Swift_SendmailTransport', self::invokePrivate($this->mailer, 'getInstance')); } public function testCreateMessage() { diff --git a/tests/lib/mail/message.php b/tests/lib/mail/message.php index c75cc18b650..8ee3c33627c 100644 --- a/tests/lib/mail/message.php +++ b/tests/lib/mail/message.php @@ -42,7 +42,7 @@ class MessageTest extends TestCase { * @dataProvider mailAddressProvider */ public function testConvertAddresses($unconverted, $expected) { - $this->assertSame($expected, \Test_Helper::invokePrivate($this->message, 'convertAddresses', array($unconverted))); + $this->assertSame($expected, self::invokePrivate($this->message, 'convertAddresses', array($unconverted))); } public function testSetFrom() { diff --git a/tests/lib/ocsclienttest.php b/tests/lib/ocsclienttest.php index f4bf1536291..ca8a2a2a2e8 100644 --- a/tests/lib/ocsclienttest.php +++ b/tests/lib/ocsclienttest.php @@ -76,7 +76,7 @@ class OCSClientTest extends \Test\TestCase { ->method('getSystemValue') ->with('appstoreurl', 'https://api.owncloud.com/v1') ->will($this->returnValue('https://api.owncloud.com/v1')); - $this->assertSame('https://api.owncloud.com/v1', Test_Helper::invokePrivate($this->ocsClient, 'getAppStoreUrl')); + $this->assertSame('https://api.owncloud.com/v1', self::invokePrivate($this->ocsClient, 'getAppStoreUrl')); } public function testGetCategoriesDisabledAppStore() { diff --git a/tests/lib/repair/cleantags.php b/tests/lib/repair/cleantags.php index 75bbbd07503..b455aa870fb 100644 --- a/tests/lib/repair/cleantags.php +++ b/tests/lib/repair/cleantags.php @@ -64,15 +64,15 @@ class CleanTags extends \Test\TestCase { $this->assertEntryCount('*PREFIX*vcategory_to_object', 4, 'Assert tag entries count before repair step'); $this->assertEntryCount('*PREFIX*vcategory', 4, 'Assert tag categories count before repair step'); - \Test_Helper::invokePrivate($this->repair, 'deleteOrphanFileEntries'); + self::invokePrivate($this->repair, 'deleteOrphanFileEntries'); $this->assertEntryCount('*PREFIX*vcategory_to_object', 3, 'Assert tag entries count after cleaning file entries'); $this->assertEntryCount('*PREFIX*vcategory', 4, 'Assert tag categories count after cleaning file entries'); - \Test_Helper::invokePrivate($this->repair, 'deleteOrphanTagEntries'); + self::invokePrivate($this->repair, 'deleteOrphanTagEntries'); $this->assertEntryCount('*PREFIX*vcategory_to_object', 2, 'Assert tag entries count after cleaning tag entries'); $this->assertEntryCount('*PREFIX*vcategory', 4, 'Assert tag categories count after cleaning tag entries'); - \Test_Helper::invokePrivate($this->repair, 'deleteOrphanCategoryEntries'); + self::invokePrivate($this->repair, 'deleteOrphanCategoryEntries'); $this->assertEntryCount('*PREFIX*vcategory_to_object', 2, 'Assert tag entries count after cleaning category entries'); $this->assertEntryCount('*PREFIX*vcategory', 2, 'Assert tag categories count after cleaning category entries'); } diff --git a/tests/lib/security/hasher.php b/tests/lib/security/hasher.php index 330789c67a0..a6f7df5b79f 100644 --- a/tests/lib/security/hasher.php +++ b/tests/lib/security/hasher.php @@ -11,7 +11,7 @@ use OC\Security\Hasher; /** * Class HasherTest */ -class HasherTest extends \PHPUnit_Framework_TestCase { +class HasherTest extends \Test\TestCase { /** * @return array @@ -70,14 +70,15 @@ class HasherTest extends \PHPUnit_Framework_TestCase { ); } - - /** @var Hasher */ protected $hasher; + /** @var \OCP\IConfig */ protected $config; protected function setUp() { + parent::setUp(); + $this->config = $this->getMockBuilder('\OCP\IConfig') ->disableOriginalConstructor()->getMock(); @@ -93,7 +94,7 @@ class HasherTest extends \PHPUnit_Framework_TestCase { * @dataProvider versionHashProvider */ function testSplitHash($hash, $expected) { - $relativePath = \Test_Helper::invokePrivate($this->hasher, 'splitHash', array($hash)); + $relativePath = self::invokePrivate($this->hasher, 'splitHash', array($hash)); $this->assertSame($expected, $relativePath); } diff --git a/tests/lib/setup.php b/tests/lib/setup.php index caaeec08fb3..79ca0c0be90 100644 --- a/tests/lib/setup.php +++ b/tests/lib/setup.php @@ -120,7 +120,7 @@ class Test_OC_Setup extends \Test\TestCase { * If it hasn't this test will fail. */ public function testHtaccessIsCurrent() { - $result = Test_Helper::invokePrivate( + $result = self::invokePrivate( $this->setupClass, 'isCurrentHtaccess' ); diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 5909102f797..f03ed43e7fc 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -1051,7 +1051,7 @@ class Test_Share extends \Test\TestCase { */ function testRemoveProtocolFromUrl($url, $expectedResult) { $share = new \OC\Share\Share(); - $result = \Test_Helper::invokePrivate($share, 'removeProtocolFromUrl', array($url)); + $result = self::invokePrivate($share, 'removeProtocolFromUrl', array($url)); $this->assertSame($expectedResult, $result); } diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php index 72741d0dec6..0fa025d44c8 100644 --- a/tests/lib/tempmanager.php +++ b/tests/lib/tempmanager.php @@ -154,7 +154,7 @@ class TempManager extends \Test\TestCase { public function testBuildFileNameWithPostfix() { $logger = $this->getMock('\Test\NullLogger'); - $tmpManager = \Test_Helper::invokePrivate( + $tmpManager = self::invokePrivate( $this->getManager($logger), 'buildFileNameWithSuffix', ['/tmp/myTemporaryFile', 'postfix'] @@ -165,7 +165,7 @@ class TempManager extends \Test\TestCase { public function testBuildFileNameWithoutPostfix() { $logger = $this->getMock('\Test\NullLogger'); - $tmpManager = \Test_Helper::invokePrivate( + $tmpManager = self::invokePrivate( $this->getManager($logger), 'buildFileNameWithSuffix', ['/tmp/myTemporaryFile', ''] @@ -176,7 +176,7 @@ class TempManager extends \Test\TestCase { public function testBuildFileNameWithSuffixPathTraversal() { $logger = $this->getMock('\Test\NullLogger'); - $tmpManager = \Test_Helper::invokePrivate( + $tmpManager = self::invokePrivate( $this->getManager($logger), 'buildFileNameWithSuffix', ['foo', '../Traversal\\../FileName'] diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index d8595c83a91..8551edab71f 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -50,6 +50,38 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { } /** + * Allows us to test private methods/properties + * + * @param $object + * @param $methodName + * @param array $parameters + * @return mixed + */ + protected static function invokePrivate($object, $methodName, array $parameters = array()) { + $reflection = new \ReflectionClass(get_class($object)); + + if ($reflection->hasMethod($methodName)) { + $method = $reflection->getMethod($methodName); + + $method->setAccessible(true); + + return $method->invokeArgs($object, $parameters); + } elseif ($reflection->hasProperty($methodName)) { + $property = $reflection->getProperty($methodName); + + $property->setAccessible(true); + + if (!empty($parameters)) { + $property->setValue($object, array_pop($parameters)); + } + + return $property->getValue($object); + } + + return false; + } + + /** * Returns a unique identifier as uniqid() is not reliable sometimes * * @param string $prefix diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/settings/controller/CheckSetupControllerTest.php index b21e78c831d..b39d13ac26b 100644 --- a/tests/settings/controller/CheckSetupControllerTest.php +++ b/tests/settings/controller/CheckSetupControllerTest.php @@ -81,7 +81,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue(false)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -109,7 +109,7 @@ class CheckSetupControllerTest extends TestCase { $this->assertTrue( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -134,7 +134,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue($client)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -162,7 +162,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue($client)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isInternetConnectionWorking' ) @@ -176,7 +176,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue(null)); $this->assertFalse( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isMemcacheConfigured' ) @@ -190,7 +190,7 @@ class CheckSetupControllerTest extends TestCase { ->will($this->returnValue('SomeProvider')); $this->assertTrue( - \Test_Helper::invokePrivate( + self::invokePrivate( $this->checkSetupController, 'isMemcacheConfigured' ) @@ -239,7 +239,7 @@ class CheckSetupControllerTest extends TestCase { 'dataDirectoryProtected' => true, 'isMemcacheConfigured' => true, 'memcacheDocs' => 'http://doc.owncloud.org/server/go.php?to=admin-performance', - 'isUrandomAvailable' => \Test_Helper::invokePrivate($this->checkSetupController, 'isUrandomAvailable'), + 'isUrandomAvailable' => self::invokePrivate($this->checkSetupController, 'isUrandomAvailable'), 'securityDocs' => 'https://doc.owncloud.org/server/8.1/admin_manual/configuration_server/hardening.html', ] ); diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php index e70b235f603..5f98cf21c04 100644 --- a/tests/settings/controller/userscontrollertest.php +++ b/tests/settings/controller/userscontrollertest.php @@ -1290,7 +1290,7 @@ class UsersControllerTest extends \Test\TestCase { list($user, $expectedResult) = $this->mockUser(); - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } @@ -1327,7 +1327,7 @@ class UsersControllerTest extends \Test\TestCase { ) ->will($this->returnValue('1')); - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } @@ -1345,7 +1345,7 @@ class UsersControllerTest extends \Test\TestCase { $expectedResult['isRestoreDisabled'] = true; - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } @@ -1384,7 +1384,7 @@ class UsersControllerTest extends \Test\TestCase { $expectedResult['isRestoreDisabled'] = true; - $result = \Test_Helper::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); + $result = self::invokePrivate($this->container['UsersController'], 'formatUserForIndex', [$user]); $this->assertEquals($expectedResult, $result); } |