diff options
81 files changed, 572 insertions, 101 deletions
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js index ef695af626d..7c90ba7e9a7 100644 --- a/apps/encryption/l10n/sl.js +++ b/apps/encryption/l10n/sl.js @@ -5,14 +5,17 @@ OC.L10N.register( "Please repeat the recovery key password" : "Ponovite vpis ključa za obnovitev", "Repeated recovery key password does not match the provided recovery key password" : "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa", "Recovery key successfully enabled" : "Ključ za obnovitev gesla je uspešno nastavljen", - "Could not enable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče nastaviti. Preverite ključ!", + "Could not enable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče nastaviti. Preverite geslo ključa!", "Recovery key successfully disabled" : "Ključ za obnovitev gesla je uspešno onemogočen", "Could not disable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!", + "Missing parameters" : "Manjkajoči parametri:", "Please provide the old recovery password" : "Vpišite star ključ za obnovitev", "Please provide a new recovery password" : "Vpišite nov ključ za obnovitev", "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev", "Password successfully changed." : "Geslo je uspešno spremenjeno.", "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.", + "Recovery Key disabled" : "Ključ za obnovitev gesla je onemogočen.", + "Recovery Key enabled" : "Ključ za obnovitev gesla je omogočen.", "Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.", "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.", "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", @@ -20,8 +23,14 @@ OC.L10N.register( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", + "Enable recovery key" : "Omogoči obnovitev gesla", + "Disable recovery key" : "Onemogoči obnovitev gesla", "Recovery key password" : "Ključ za obnovitev gesla", + "Repeat recovery key password" : "Ponovi ključ za obnovitev gesla", "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:", + "Old recovery key password" : "Stari ključ za obnovitev gesla", + "New recovery key password" : "Novi ključ za obnovitev gesla", + "Repeat new recovery key password" : "Ponovi novi ključ za obnovitev gesla", "Change Password" : "Spremeni geslo", "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.", "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:", diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json index 7e50e87f41b..82d23fc6e74 100644 --- a/apps/encryption/l10n/sl.json +++ b/apps/encryption/l10n/sl.json @@ -3,14 +3,17 @@ "Please repeat the recovery key password" : "Ponovite vpis ključa za obnovitev", "Repeated recovery key password does not match the provided recovery key password" : "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa", "Recovery key successfully enabled" : "Ključ za obnovitev gesla je uspešno nastavljen", - "Could not enable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče nastaviti. Preverite ključ!", + "Could not enable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče nastaviti. Preverite geslo ključa!", "Recovery key successfully disabled" : "Ključ za obnovitev gesla je uspešno onemogočen", "Could not disable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!", + "Missing parameters" : "Manjkajoči parametri:", "Please provide the old recovery password" : "Vpišite star ključ za obnovitev", "Please provide a new recovery password" : "Vpišite nov ključ za obnovitev", "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev", "Password successfully changed." : "Geslo je uspešno spremenjeno.", "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.", + "Recovery Key disabled" : "Ključ za obnovitev gesla je onemogočen.", + "Recovery Key enabled" : "Ključ za obnovitev gesla je omogočen.", "Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.", "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.", "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.", @@ -18,8 +21,14 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.", + "Enable recovery key" : "Omogoči obnovitev gesla", + "Disable recovery key" : "Onemogoči obnovitev gesla", "Recovery key password" : "Ključ za obnovitev gesla", + "Repeat recovery key password" : "Ponovi ključ za obnovitev gesla", "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:", + "Old recovery key password" : "Stari ključ za obnovitev gesla", + "New recovery key password" : "Novi ključ za obnovitev gesla", + "Repeat new recovery key password" : "Ponovi novi ključ za obnovitev gesla", "Change Password" : "Spremeni geslo", "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.", "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:", diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php index e4e5595efa1..3acf77e4c44 100644 --- a/apps/encryption/lib/migration.php +++ b/apps/encryption/lib/migration.php @@ -54,6 +54,7 @@ class Migration { public function __destruct() { $this->view->deleteAll('files_encryption/public_keys'); $this->updateFileCache(); + $this->config->deleteAppValue('files_encryption', 'installed_version'); } /** @@ -139,7 +140,6 @@ class Migration { public function updateDB() { // delete left-over from old encryption which is no longer needed - $this->config->deleteAppValue('files_encryption', 'installed_version'); $this->config->deleteAppValue('files_encryption', 'ocsid'); $this->config->deleteAppValue('files_encryption', 'types'); $this->config->deleteAppValue('files_encryption', 'enabled'); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index ab56b1a0323..5fc444e6121 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1716,11 +1716,13 @@ if (this._filter && this.fileSummary.summary.totalDirs + this.fileSummary.summary.totalFiles === 0) { this.$el.find('#filestable thead th').addClass('hidden'); this.$el.find('#emptycontent').addClass('hidden'); + $('#searchresults').addClass('filter-empty'); if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) { this.$el.find('.nofilterresults').removeClass('hidden'). find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}, null, {'escape': false})); } } else { + $('#searchresults').removeClass('filter-empty'); this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty); if (!this.$el.find('.mask').exists()) { this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty); diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index 09974a0321d..d1830fefd99 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -43,7 +43,7 @@ OC.L10N.register( "Disconnect storage" : "Desconete o armazenamento", "Unshare" : "Deixar de partilhar", "No permission to delete" : "Não tem permissão para apagar", - "Download" : "Transferir", + "Download" : "Descarregar", "Select" : "Selecionar", "Pending" : "Pendente", "Unable to determine date" : "Impossível determinar a data", diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index 4172185936a..f0d2d6b74de 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -41,7 +41,7 @@ "Disconnect storage" : "Desconete o armazenamento", "Unshare" : "Deixar de partilhar", "No permission to delete" : "Não tem permissão para apagar", - "Download" : "Transferir", + "Download" : "Descarregar", "Select" : "Selecionar", "Pending" : "Pendente", "Unable to determine date" : "Impossível determinar a data", diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index a4a15c932e0..299bce880f5 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -42,7 +42,7 @@ OC.L10N.register( "Delete" : "Izbriši", "Disconnect storage" : "Odklopi shrambo", "Unshare" : "Prekini souporabo", - "No permission to delete" : "Nimate pravic za brisanje", + "No permission to delete" : "Ni ustreznih dovoljenj za brisanje tega stika", "Download" : "Prejmi", "Select" : "Izberi", "Pending" : "V čakanju ...", @@ -62,7 +62,9 @@ OC.L10N.register( "_Uploading %n file_::_Uploading %n files_" : ["Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"], "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.", "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.", + "Storage of {owner} is full, files can not be updated or synced anymore!" : "Shramba uporabnika {owner} je polna, zato datotek ni več mogoče posodabljati in usklajevati!", "Your storage is full, files can not be updated or synced anymore!" : "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!", + "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Shramba uporabnika {owner} je polna ({usedSpacePercent}%).", "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"], "{dirs} and {files}" : "{dirs} in {files}", @@ -71,6 +73,7 @@ OC.L10N.register( "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak", "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>", "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.", + "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Omeji obvestila o ustvarjanju in spreminjanju <strong>najpogosteje uporabljenih </strong> datotek <em>(omogoči pretok)</em>", "A file or folder has been <strong>deleted</strong>" : "Datoteka ali mapa je <strong>izbrisana</strong>.", "A file or folder has been <strong>restored</strong>" : "Datoteka ali mapa je <strong>obnovljena</strong>.", "You created %1$s" : "Ustvarili ste %1$s", diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index 9c6ed85e9a9..7e684c04efe 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -40,7 +40,7 @@ "Delete" : "Izbriši", "Disconnect storage" : "Odklopi shrambo", "Unshare" : "Prekini souporabo", - "No permission to delete" : "Nimate pravic za brisanje", + "No permission to delete" : "Ni ustreznih dovoljenj za brisanje tega stika", "Download" : "Prejmi", "Select" : "Izberi", "Pending" : "V čakanju ...", @@ -60,7 +60,9 @@ "_Uploading %n file_::_Uploading %n files_" : ["Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"], "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.", "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.", + "Storage of {owner} is full, files can not be updated or synced anymore!" : "Shramba uporabnika {owner} je polna, zato datotek ni več mogoče posodabljati in usklajevati!", "Your storage is full, files can not be updated or synced anymore!" : "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!", + "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Shramba uporabnika {owner} je polna ({usedSpacePercent}%).", "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"], "{dirs} and {files}" : "{dirs} in {files}", @@ -69,6 +71,7 @@ "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak", "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>", "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.", + "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Omeji obvestila o ustvarjanju in spreminjanju <strong>najpogosteje uporabljenih </strong> datotek <em>(omogoči pretok)</em>", "A file or folder has been <strong>deleted</strong>" : "Datoteka ali mapa je <strong>izbrisana</strong>.", "A file or folder has been <strong>restored</strong>" : "Datoteka ali mapa je <strong>obnovljena</strong>.", "You created %1$s" : "Ustvarili ste %1$s", diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js index 2938f681116..094414ed296 100644 --- a/apps/files_external/l10n/sl.js +++ b/apps/files_external/l10n/sl.js @@ -43,6 +43,7 @@ OC.L10N.register( "Username as share" : "Uporabniško ime za souporabo", "URL" : "Naslov URL", "Secure https://" : "Varni način https://", + "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom", "Public key" : "Javni ključ", "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.", "Invalid mount point" : "Neveljavna priklopna točka", @@ -53,6 +54,12 @@ OC.L10N.register( "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive", "Personal" : "Osebno", "System" : "Sistem", + "Enable encryption" : "Omogoči šifriranje", + "Enable previews" : "Omogoči predogled", + "Check for changes" : "Preveri za spremembe", + "Never" : "Nikoli", + "Once every direct access" : "Enkrat ob neposrednem dostopu", + "Every time the filesystem is used" : "Kadarkoli je datotečni sistem v uporabi", "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.", "(group)" : "(skupina)", "Saved" : "Shranjeno", diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json index c3282e859dd..4cebc8a1ac4 100644 --- a/apps/files_external/l10n/sl.json +++ b/apps/files_external/l10n/sl.json @@ -41,6 +41,7 @@ "Username as share" : "Uporabniško ime za souporabo", "URL" : "Naslov URL", "Secure https://" : "Varni način https://", + "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom", "Public key" : "Javni ključ", "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.", "Invalid mount point" : "Neveljavna priklopna točka", @@ -51,6 +52,12 @@ "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive", "Personal" : "Osebno", "System" : "Sistem", + "Enable encryption" : "Omogoči šifriranje", + "Enable previews" : "Omogoči predogled", + "Check for changes" : "Preveri za spremembe", + "Never" : "Nikoli", + "Once every direct access" : "Enkrat ob neposrednem dostopu", + "Every time the filesystem is used" : "Kadarkoli je datotečni sistem v uporabi", "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.", "(group)" : "(skupina)", "Saved" : "Shranjeno", diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 763cf59aa4c..02a02710a14 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -443,9 +443,12 @@ class AmazonS3 extends \OC\Files\Storage\Common { $path = $this->normalizePath($path); $metadata = array(); - if (!is_null($mtime)) { - $metadata = array('lastmodified' => $mtime); + if (is_null($mtime)) { + $mtime = time(); } + $metadata = [ + 'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime) + ]; $fileType = $this->filetype($path); try { @@ -453,22 +456,24 @@ class AmazonS3 extends \OC\Files\Storage\Common { if ($fileType === 'dir' && ! $this->isRoot($path)) { $path .= '/'; } - $this->getConnection()->copyObject(array( + $this->getConnection()->copyObject([ 'Bucket' => $this->bucket, 'Key' => $this->cleanKey($path), 'Metadata' => $metadata, - 'CopySource' => $this->bucket . '/' . $path - )); + 'CopySource' => $this->bucket . '/' . $path, + 'MetadataDirective' => 'REPLACE', + ]); $this->testTimeout(); } else { $mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path); - $this->getConnection()->putObject(array( + $this->getConnection()->putObject([ 'Bucket' => $this->bucket, 'Key' => $this->cleanKey($path), 'Metadata' => $metadata, 'Body' => '', - 'ContentType' => $mimeType - )); + 'ContentType' => $mimeType, + 'MetadataDirective' => 'REPLACE', + ]); $this->testTimeout(); } } catch (S3Exception $e) { diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index c457a87a6c7..cbe090311a9 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -251,7 +251,11 @@ class SFTP extends \OC\Files\Storage\Common { */ public function rmdir($path) { try { - return $this->getConnection()->delete($this->absPath($path), true); + $result = $this->getConnection()->delete($this->absPath($path), true); + // workaround: stray stat cache entry when deleting empty folders + // see https://github.com/phpseclib/phpseclib/issues/706 + $this->getConnection()->clearStatCache(); + return $result; } catch (\Exception $e) { return false; } diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 06aecac9c42..d46e907e0c8 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -60,6 +60,8 @@ OC.L10N.register( "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 1e3213113b1..30d6badbb34 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -58,6 +58,8 @@ "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 1536da3b98f..0074bdbecad 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -60,6 +60,9 @@ OC.L10N.register( "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 9ff15fb26da..fef8ebf7b9d 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -58,6 +58,9 @@ "Open documentation" : "Dokumentation öffnen", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index 1c1c863a240..4f20489a687 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -60,6 +62,11 @@ OC.L10N.register( "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", - "Federated Cloud" : "Federated σύννεφο" + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 934b6704146..8d5a947f4c2 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς", "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου", "Shares" : "Κοινόχρηστοι φάκελοι", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -58,6 +60,11 @@ "Open documentation" : "Ανοιχτή τεκμηρίωση.", "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", - "Federated Cloud" : "Federated σύννεφο" + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 70495b7d550..223660dec0c 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", "Shares" : "Jaot", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", @@ -60,6 +62,11 @@ OC.L10N.register( "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", - "Federated Cloud" : "Federoitu pilvi" + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", + "Share it:" : "Jaa se:", + "Add it to your website:" : "Lisää verkkosivustollesi:", + "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", + "HTML Code:" : "HTML-koodi:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index 0b2f2b91ed2..b70098d049e 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", "Shares" : "Jaot", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", @@ -58,6 +60,11 @@ "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", - "Federated Cloud" : "Federoitu pilvi" + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", + "Share it:" : "Jaa se:", + "Add it to your website:" : "Lisää verkkosivustollesi:", + "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", + "HTML Code:" : "HTML-koodi:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index f6ead6dfd56..04a8418f3ea 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -2,7 +2,7 @@ OC.L10N.register( "files_sharing", { "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur", - "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.", + "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères non valides.", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", "Storage not valid" : "Support de stockage non valide", @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", "Shares" : "Partages", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.", "Password" : "Mot de passe", @@ -60,6 +62,11 @@ OC.L10N.register( "Open documentation" : "Voir la documentation", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Votre ID Federated Cloud :", + "Share it:" : "Partager :", + "Add it to your website:" : "Ajouter à votre site web :", + "Share with me via ownCloud" : "Partagez avec moi via ownCloud", + "HTML Code:" : "Code HTML:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index bf116fb52dd..c9f572f8912 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -1,6 +1,6 @@ { "translations": { "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur", - "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.", + "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères non valides.", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", "Storage not valid" : "Support de stockage non valide", @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous", "You shared %1$s via link" : "Vous avez partagé %1$s par lien public", "Shares" : "Partages", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.", "Password" : "Mot de passe", @@ -58,6 +60,11 @@ "Open documentation" : "Voir la documentation", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", - "Federated Cloud" : "Federated Cloud" + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Votre ID Federated Cloud :", + "Share it:" : "Partager :", + "Add it to your website:" : "Ajouter à votre site web :", + "Share with me via ownCloud" : "Partagez avec moi via ownCloud", + "HTML Code:" : "Code HTML:" },"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 a3a04710b32..1a5e1d10e77 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede", "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón", "Shares" : "Comparticións", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartido comigo a través do meu ID da nube federada do #ownCloud , vexa %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartido comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.", "Password" : "Contrasinal", @@ -60,6 +62,11 @@ OC.L10N.register( "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", - "Federated Cloud" : "Nube federada" + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID:" : "ID da súa nube federada:", + "Share it:" : "Compártao:", + "Add it to your website:" : "Engádao o seu sitio web:", + "Share with me via ownCloud" : "Compartido comigo a través do ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index 31315c47b9c..25532580e78 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede", "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón", "Shares" : "Comparticións", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartido comigo a través do meu ID da nube federada do #ownCloud , vexa %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartido comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.", "Password" : "Contrasinal", @@ -58,6 +60,11 @@ "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", - "Federated Cloud" : "Nube federada" + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID:" : "ID da súa nube federada:", + "Share it:" : "Compártao:", + "Add it to your website:" : "Engádao o seu sitio web:", + "Share with me via ownCloud" : "Compartido comigo a través do ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index af62d163c41..1b17e1b28c9 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", "Shares" : "Condivisioni", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivione è protetta da password", "The password is wrong. Try again." : "La password è errata. Prova ancora.", "Password" : "Password", @@ -60,6 +62,11 @@ OC.L10N.register( "Open documentation" : "Apri la documentazione", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", - "Federated Cloud" : "Cloud federata" + "Federated Cloud" : "Cloud federata", + "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", + "Share it:" : "Condividilo:", + "Add it to your website:" : "Aggiungilo al tuo sito web:", + "Share with me via ownCloud" : "Condividi con me tramite ownCloud", + "HTML Code:" : "Codice HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index 1d635eae59b..bcac10073d0 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", "Shares" : "Condivisioni", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivione è protetta da password", "The password is wrong. Try again." : "La password è errata. Prova ancora.", "Password" : "Password", @@ -58,6 +60,11 @@ "Open documentation" : "Apri la documentazione", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", - "Federated Cloud" : "Cloud federata" + "Federated Cloud" : "Cloud federata", + "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", + "Share it:" : "Condividilo:", + "Add it to your website:" : "Aggiungilo al tuo sito web:", + "Share with me via ownCloud" : "Condividi con me tramite ownCloud", + "HTML Code:" : "Codice HTML:" },"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 c15aa5f8d9b..91329d6236f 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", "Shares" : "Gedeeld", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.", "Password" : "Wachtwoord", @@ -60,6 +62,11 @@ OC.L10N.register( "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", - "Federated Cloud" : "Gefedereerde Cloud" + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", + "Share it:" : "Deel het:", + "Add it to your website:" : "Voeg het toe aan uw website:", + "Share with me via ownCloud" : "Deel met mij via ownCloud", + "HTML Code:" : "HTML Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index e4fd81d659a..298d0b24380 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", "Shares" : "Gedeeld", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.", "Password" : "Wachtwoord", @@ -58,6 +60,11 @@ "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", - "Federated Cloud" : "Gefedereerde Cloud" + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", + "Share it:" : "Deel het:", + "Add it to your website:" : "Voeg het toe aan uw website:", + "Share with me via ownCloud" : "Deel met mij via ownCloud", + "HTML Code:" : "HTML Code:" },"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 774c4760ed8..af80d4b380c 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", "Shares" : "Compartilhamentos", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID", "This share is password-protected" : "Este compartilhamento esta protegido por senha", "The password is wrong. Try again." : "Senha incorreta. Tente novamente.", "Password" : "Senha", @@ -60,6 +62,11 @@ OC.L10N.register( "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", - "Federated Cloud" : "Nuvem Conglomerada" + "Federated Cloud" : "Nuvem Conglomerada", + "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", + "Share it:" : "Compartilhe:", + "Add it to your website:" : "Adicione ao seu site:", + "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 92ba9768473..cd6e4492f51 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", "Shares" : "Compartilhamentos", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID", "This share is password-protected" : "Este compartilhamento esta protegido por senha", "The password is wrong. Try again." : "Senha incorreta. Tente novamente.", "Password" : "Senha", @@ -58,6 +60,11 @@ "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", - "Federated Cloud" : "Nuvem Conglomerada" + "Federated Cloud" : "Nuvem Conglomerada", + "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:", + "Share it:" : "Compartilhe:", + "Add it to your website:" : "Adicione ao seu site:", + "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index c4c347b33da..0ae19ac8d33 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -60,6 +60,10 @@ OC.L10N.register( "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Federated Cloud" : "Объединение облачных хранилищ" + "Federated Cloud" : "Объединение облачных хранилищ", + "Share it:" : "Поделись этим:", + "Add it to your website:" : "Добавь это на свой сайт:", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index c1b3a97d074..a2a7bf06029 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -58,6 +58,10 @@ "Open documentation" : "Открыть документацию", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Federated Cloud" : "Объединение облачных хранилищ" + "Federated Cloud" : "Объединение облачных хранилищ", + "Share it:" : "Поделись этим:", + "Add it to your website:" : "Добавь это на свой сайт:", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index 2666c8e3eaa..be6c0bd93fe 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -56,8 +56,9 @@ OC.L10N.register( "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", "Federated Cloud Sharing" : "Upravljana souporaba oblaka", - "Open documentation" : "Odprta dokumentacija", + "Open documentation" : "Odpri dokumentacijo", "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", - "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", + "HTML Code:" : "Koda HTML:" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index a301a495cf1..e4ec892d764 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -54,8 +54,9 @@ "Download %s" : "Prejmi %s", "Direct link" : "Neposredna povezava", "Federated Cloud Sharing" : "Upravljana souporaba oblaka", - "Open documentation" : "Odprta dokumentacija", + "Open documentation" : "Odpri dokumentacijo", "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", - "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov." + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", + "HTML Code:" : "Koda HTML:" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js index f2068c21368..5df005e01a7 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", "Shares" : "แชร์", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยคลาวด์ไอดี สามารถดูได้ที่ %s", + "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยคลาวด์ไอดี", "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", "The password is wrong. Try again." : "รหัสผ่านที่ไม่ถูกต้อง กรุณาลองอีกครั้ง", "Password" : "รหัสผ่าน", @@ -60,6 +62,11 @@ OC.L10N.register( "Open documentation" : "เปิดเอกสาร", "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", - "Federated Cloud" : "สหพันธ์คลาวด์" + "Federated Cloud" : "สหพันธ์คลาวด์", + "Your Federated Cloud ID:" : "คลาวด์ไอดีของคุณ:", + "Share it:" : "แชร์มัน:", + "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:", + "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", + "HTML Code:" : "โค้ด HTML:" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index d5988c16ed7..e1a9655741f 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ", "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์", "Shares" : "แชร์", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยคลาวด์ไอดี สามารถดูได้ที่ %s", + "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยคลาวด์ไอดี", "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", "The password is wrong. Try again." : "รหัสผ่านที่ไม่ถูกต้อง กรุณาลองอีกครั้ง", "Password" : "รหัสผ่าน", @@ -58,6 +60,11 @@ "Open documentation" : "เปิดเอกสาร", "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", - "Federated Cloud" : "สหพันธ์คลาวด์" + "Federated Cloud" : "สหพันธ์คลาวด์", + "Your Federated Cloud ID:" : "คลาวด์ไอดีของคุณ:", + "Share it:" : "แชร์มัน:", + "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:", + "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", + "HTML Code:" : "โค้ด HTML:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index b12da13d9df..b822570238b 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -40,6 +40,8 @@ OC.L10N.register( "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı", "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız", "Shares" : "Paylaşımlar", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -60,6 +62,11 @@ OC.L10N.register( "Open documentation" : "Belgelendirmeyi aç", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", - "Federated Cloud" : "Birleşmiş Bulut" + "Federated Cloud" : "Birleşmiş Bulut", + "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", + "Share it:" : "Paylaşın:", + "Add it to your website:" : "Web sitenize ekleyin:", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", + "HTML Code:" : "HTML Kodu:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index faeb6e12abb..4e6ed7f967d 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -38,6 +38,8 @@ "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı", "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız", "Shares" : "Paylaşımlar", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -58,6 +60,11 @@ "Open documentation" : "Belgelendirmeyi aç", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", - "Federated Cloud" : "Birleşmiş Bulut" + "Federated Cloud" : "Birleşmiş Bulut", + "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", + "Share it:" : "Paylaşın:", + "Add it to your website:" : "Web sitenize ekleyin:", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı", + "HTML Code:" : "HTML Kodu:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php index 72018ca68b9..3cc324c2306 100644 --- a/apps/files_versions/download.php +++ b/apps/files_versions/download.php @@ -34,7 +34,7 @@ $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision; $view = new OC\Files\View('/'); -$ftype = $view->getMimeType('/'.$uid.'/files/'.$filename); +$ftype = \OC_Helper::getSecureMimeType($view->getMimeType('/'.$uid.'/files/'.$filename)); header('Content-Type:'.$ftype); OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js index f0a6af6f6b8..edd059273a8 100644 --- a/apps/user_ldap/l10n/pl.js +++ b/apps/user_ldap/l10n/pl.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Nie udało się wyczyścić mapowania.", "Failed to delete the server configuration" : "Nie można usunąć konfiguracji serwera", + "The configuration is invalid: anonymous bind is not allowed." : "Konfiguracja jest nieprawidłowa: anonimowe złączenie nie jest dozwolone.", "The configuration is valid and the connection could be established!" : "Konfiguracja jest prawidłowa i można ustanowić połączenie!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.", "The configuration is invalid. Please have a look at the logs for further details." : "Konfiguracja jest nieprawidłowa. Proszę rzucić okiem na dzienniki dalszych szczegółów.", @@ -10,11 +11,14 @@ OC.L10N.register( "No configuration specified" : "Nie określono konfiguracji", "No data specified" : "Nie określono danych", " Could not set configuration %s" : "Nie można ustawić konfiguracji %s", + "Action does not exist" : "Akcja nie istnieje", "Configuration incorrect" : "Konfiguracja niepoprawna", "Configuration incomplete" : "Konfiguracja niekompletna", "Configuration OK" : "Konfiguracja poprawna", "Select groups" : "Wybierz grupy", "Select object classes" : "Wybierz obiekty klas", + "Please check the credentials, they seem to be wrong." : "Sprawdź dane logowania, wydają się być nieprawidłowe.", + "Please specify the port, it could not be auto-detected." : "Podaj port, nie można ustalić go automatycznie.", "{nthServer}. Server" : "{nthServer}. Serwer", "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?", "Confirm Deletion" : "Potwierdź usunięcie", @@ -26,18 +30,33 @@ OC.L10N.register( "Invalid Host" : "Niepoprawny Host", "Server" : "Serwer", "Users" : "Użytkownicy", + "Login Attributes" : "Atrybuty logowania", "Groups" : "Grupy", "Test Configuration" : "Konfiguracja testowa", "Help" : "Pomoc", "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:", + "Search groups" : "Przeszukaj grupy", + "Available groups" : "Dostępne grupy", + "Selected groups" : "Wybrane grupy", + "Edit LDAP Query" : "Edytuj zapytanie LDAP", + "LDAP Filter:" : "Filtr LDAP", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.", + "Verify settings and count groups" : "Zweryfikuj ustawienia i policz grupy", + "When logging in, %s will find the user based on the following attributes:" : "Podczas logowania, %s znajdzie użytkownika na podstawie następujących atrybutów:", + "LDAP / AD Username:" : "Nazwa użytkownika LDAP / AD:", + "LDAP / AD Email Address:" : "Adres email LDAP / AD:", "Other Attributes:" : "Inne atrybuty:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"", + "Verify settings" : "Weryfikuj ustawienia", "1. Server" : "1. Serwer", "%s. Server:" : "%s. Serwer:", + "Adds a new and blank configuration" : "Dodaje nową, czystą konfigurację", + "Copy current configuration into new directory binding" : "Kopiuje aktualną konfigurację do nowej lokalizacji", + "Delete the current configuration" : "Usuwa aktualną konfigurację", "Host" : "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://", "Port" : "Port", + "Detect Port" : "Wykryj port", "User DN" : "Użytkownik DN", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste", "Password" : "Hasło", diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json index ed5beeefaba..d49417c99ae 100644 --- a/apps/user_ldap/l10n/pl.json +++ b/apps/user_ldap/l10n/pl.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Nie udało się wyczyścić mapowania.", "Failed to delete the server configuration" : "Nie można usunąć konfiguracji serwera", + "The configuration is invalid: anonymous bind is not allowed." : "Konfiguracja jest nieprawidłowa: anonimowe złączenie nie jest dozwolone.", "The configuration is valid and the connection could be established!" : "Konfiguracja jest prawidłowa i można ustanowić połączenie!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.", "The configuration is invalid. Please have a look at the logs for further details." : "Konfiguracja jest nieprawidłowa. Proszę rzucić okiem na dzienniki dalszych szczegółów.", @@ -8,11 +9,14 @@ "No configuration specified" : "Nie określono konfiguracji", "No data specified" : "Nie określono danych", " Could not set configuration %s" : "Nie można ustawić konfiguracji %s", + "Action does not exist" : "Akcja nie istnieje", "Configuration incorrect" : "Konfiguracja niepoprawna", "Configuration incomplete" : "Konfiguracja niekompletna", "Configuration OK" : "Konfiguracja poprawna", "Select groups" : "Wybierz grupy", "Select object classes" : "Wybierz obiekty klas", + "Please check the credentials, they seem to be wrong." : "Sprawdź dane logowania, wydają się być nieprawidłowe.", + "Please specify the port, it could not be auto-detected." : "Podaj port, nie można ustalić go automatycznie.", "{nthServer}. Server" : "{nthServer}. Serwer", "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?", "Confirm Deletion" : "Potwierdź usunięcie", @@ -24,18 +28,33 @@ "Invalid Host" : "Niepoprawny Host", "Server" : "Serwer", "Users" : "Użytkownicy", + "Login Attributes" : "Atrybuty logowania", "Groups" : "Grupy", "Test Configuration" : "Konfiguracja testowa", "Help" : "Pomoc", "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:", + "Search groups" : "Przeszukaj grupy", + "Available groups" : "Dostępne grupy", + "Selected groups" : "Wybrane grupy", + "Edit LDAP Query" : "Edytuj zapytanie LDAP", + "LDAP Filter:" : "Filtr LDAP", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.", + "Verify settings and count groups" : "Zweryfikuj ustawienia i policz grupy", + "When logging in, %s will find the user based on the following attributes:" : "Podczas logowania, %s znajdzie użytkownika na podstawie następujących atrybutów:", + "LDAP / AD Username:" : "Nazwa użytkownika LDAP / AD:", + "LDAP / AD Email Address:" : "Adres email LDAP / AD:", "Other Attributes:" : "Inne atrybuty:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"", + "Verify settings" : "Weryfikuj ustawienia", "1. Server" : "1. Serwer", "%s. Server:" : "%s. Serwer:", + "Adds a new and blank configuration" : "Dodaje nową, czystą konfigurację", + "Copy current configuration into new directory binding" : "Kopiuje aktualną konfigurację do nowej lokalizacji", + "Delete the current configuration" : "Usuwa aktualną konfigurację", "Host" : "Host", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://", "Port" : "Port", + "Detect Port" : "Wykryj port", "User DN" : "Użytkownik DN", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste", "Password" : "Hasło", diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index 925f802f3a9..f965cf658cd 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -10,7 +10,7 @@ OC.L10N.register( "No configuration specified" : "Ni določenih nastavitev", "No data specified" : "Ni navedenih podatkov", " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s", - "Action does not exist" : "Operacija ne obstaja", + "Action does not exist" : "Dejanje ne obstaja", "Configuration incorrect" : "Nastavitev ni ustrezna", "Configuration incomplete" : "Nastavitev je nepopolna", "Configuration OK" : "Nastavitev je ustrezna", @@ -30,7 +30,7 @@ OC.L10N.register( "Invalid Host" : "Neveljaven gostitelj", "Server" : "Strežnik", "Users" : "Uporabniki", - "Login Attributes" : "Parametri prijave", + "Login Attributes" : "Atributi prijave", "Groups" : "Skupine", "Test Configuration" : "Preizkusne nastavitve", "Help" : "Pomoč", @@ -40,7 +40,7 @@ OC.L10N.register( "Search groups" : "Skupine za iskanje", "Available groups" : "Razpoložljive skupine", "Selected groups" : "Izbrane skupine", - "LDAP Filter:" : "LDAP Filter:", + "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index 4674f513589..efb51bad008 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -8,7 +8,7 @@ "No configuration specified" : "Ni določenih nastavitev", "No data specified" : "Ni navedenih podatkov", " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s", - "Action does not exist" : "Operacija ne obstaja", + "Action does not exist" : "Dejanje ne obstaja", "Configuration incorrect" : "Nastavitev ni ustrezna", "Configuration incomplete" : "Nastavitev je nepopolna", "Configuration OK" : "Nastavitev je ustrezna", @@ -28,7 +28,7 @@ "Invalid Host" : "Neveljaven gostitelj", "Server" : "Strežnik", "Users" : "Uporabniki", - "Login Attributes" : "Parametri prijave", + "Login Attributes" : "Atributi prijave", "Groups" : "Skupine", "Test Configuration" : "Preizkusne nastavitve", "Help" : "Pomoč", @@ -38,7 +38,7 @@ "Search groups" : "Skupine za iskanje", "Available groups" : "Razpoložljive skupine", "Selected groups" : "Izbrane skupine", - "LDAP Filter:" : "LDAP Filter:", + "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Other Attributes:" : "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js index e07bdad70fc..b9f893dccf0 100644 --- a/apps/user_ldap/l10n/tr.js +++ b/apps/user_ldap/l10n/tr.js @@ -33,6 +33,9 @@ OC.L10N.register( "Error while clearing the mappings." : "Eşleşmeler temizlenirken hata.", "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonim atamaya izin verilmiyor. Lütfen bir Kullanıcı DN ve Parola sağlayın.", "Select attributes" : "Nitelikleri seç", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Ayarlar doğrulandı ancak tek kullanıcı bulundu. Sadece ilk kullanıcı oturum açabilecek. Lütfen daha dar bir filtre seçin.", + "An unspecified error occurred. Please check the settings and the log." : "Belirtilmeyen bir hata oluştu. Lütfen ayarları ve günlüğü denetleyin.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Arama filtresi, eşleşmeyen parantez sayısı sebebiyle oluşabilen sözdizimi sorunlarından dolayı geçersiz. Lütfen gözden geçirin.", "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"], "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.", @@ -47,21 +50,31 @@ OC.L10N.register( "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.", "Other Attributes:" : "Diğer Nitelikler:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"", + "Test Loginname" : "Oturum açma adını sına", + "Verify settings" : "Ayarları doğrula", "1. Server" : "1. Sunucu", "%s. Server:" : "%s. Sunucu:", + "Adds a new and blank configuration" : "Yeni ve boş bir yapılandırma ekler", + "Copy current configuration into new directory binding" : "Geçerli yapılandırmayı yeni dizin bağlamasına kopyala", + "Delete the current configuration" : "Geçerli yapılandırmayı sil", "Host" : "Sunucu", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın", "Port" : "Port", + "Detect Port" : "Bağl. Noktasını Tespit Et", "User DN" : "Kullanıcı DN", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.", "Password" : "Parola", "For anonymous access, leave DN and Password empty." : "Anonim erişim için DN ve Parola alanlarını boş bırakın.", "One Base DN per line" : "Her satırda tek bir Base DN", "You can specify Base DN for users and groups in the Advanced tab" : "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz", + "Detect Base DN" : "Base DN'i Tespit Et", + "Test Base DN" : "Base DN'i Sına", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)", "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:", + "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Kullanıcılar için en çok ortak nesne sınıfları organizationalPerson, person, user ve inetOrgPerson sınıflarıdır. Hangi nesne sınıfını seçeceğinizden emin değilseniz lütfen dizin yöneticinize danışın.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.", + "Verify settings and count users" : "Ayarları doğrula ve kullanıcıları say", "Saving" : "Kaydediliyor", "Back" : "Geri", "Continue" : "Devam et", diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json index bf4d08049be..7733d546d5f 100644 --- a/apps/user_ldap/l10n/tr.json +++ b/apps/user_ldap/l10n/tr.json @@ -31,6 +31,9 @@ "Error while clearing the mappings." : "Eşleşmeler temizlenirken hata.", "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonim atamaya izin verilmiyor. Lütfen bir Kullanıcı DN ve Parola sağlayın.", "Select attributes" : "Nitelikleri seç", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Ayarlar doğrulandı ancak tek kullanıcı bulundu. Sadece ilk kullanıcı oturum açabilecek. Lütfen daha dar bir filtre seçin.", + "An unspecified error occurred. Please check the settings and the log." : "Belirtilmeyen bir hata oluştu. Lütfen ayarları ve günlüğü denetleyin.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Arama filtresi, eşleşmeyen parantez sayısı sebebiyle oluşabilen sözdizimi sorunlarından dolayı geçersiz. Lütfen gözden geçirin.", "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"], "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.", @@ -45,21 +48,31 @@ "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.", "Other Attributes:" : "Diğer Nitelikler:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"", + "Test Loginname" : "Oturum açma adını sına", + "Verify settings" : "Ayarları doğrula", "1. Server" : "1. Sunucu", "%s. Server:" : "%s. Sunucu:", + "Adds a new and blank configuration" : "Yeni ve boş bir yapılandırma ekler", + "Copy current configuration into new directory binding" : "Geçerli yapılandırmayı yeni dizin bağlamasına kopyala", + "Delete the current configuration" : "Geçerli yapılandırmayı sil", "Host" : "Sunucu", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın", "Port" : "Port", + "Detect Port" : "Bağl. Noktasını Tespit Et", "User DN" : "Kullanıcı DN", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.", "Password" : "Parola", "For anonymous access, leave DN and Password empty." : "Anonim erişim için DN ve Parola alanlarını boş bırakın.", "One Base DN per line" : "Her satırda tek bir Base DN", "You can specify Base DN for users and groups in the Advanced tab" : "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz", + "Detect Base DN" : "Base DN'i Tespit Et", + "Test Base DN" : "Base DN'i Sına", "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.", "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)", "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:", + "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Kullanıcılar için en çok ortak nesne sınıfları organizationalPerson, person, user ve inetOrgPerson sınıflarıdır. Hangi nesne sınıfını seçeceğinizden emin değilseniz lütfen dizin yöneticinize danışın.", "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.", + "Verify settings and count users" : "Ayarları doğrula ve kullanıcıları say", "Saving" : "Kaydediliyor", "Back" : "Geri", "Continue" : "Devam et", diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 2d6394fea85..58e98e2bbdc 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -158,6 +158,9 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($output) { $output->writeln('<info>Checked database schema update for apps</info>'); }); + $updater->listen('\OC\Updater', 'appUpgradeStarted', function ($app, $version) use ($output) { + $output->writeln("<info>Updating <$app> ...</info>"); + }); $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) { $output->writeln("<info>Updated <$app> to $version</info>"); }); diff --git a/core/l10n/el.js b/core/l10n/el.js index 2a2e69b7f98..04e49fb4598 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -77,6 +77,8 @@ OC.L10N.register( "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.", "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Έχετε πρόσβαση σε αυτό τον ιστότοπο μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί τη χρήση HTTPS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", "Shared" : "Κοινόχρηστα", "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}", "Share" : "Διαμοιρασμός", diff --git a/core/l10n/el.json b/core/l10n/el.json index e97eac43fc2..9f955c9d385 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -75,6 +75,8 @@ "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.", "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή", "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Έχετε πρόσβαση σε αυτό τον ιστότοπο μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί τη χρήση HTTPS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.", "Shared" : "Κοινόχρηστα", "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}", "Share" : "Διαμοιρασμός", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 053ab0c5afa..716a06d3a77 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -44,7 +44,7 @@ OC.L10N.register( "Saving..." : "Enregistrement…", "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", + "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.", "No" : "Non", @@ -77,6 +77,7 @@ OC.L10N.register( "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées dans notre <a href=\"{docLink}\">documentation</a>.", "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "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." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit sur votre <a href=\"{docUrl}\">aide de sécurité</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">aide à la sécurité</a>.", "Shared" : "Partagé", "Shared with {recipients}" : "Partagé avec {recipients}", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index d52c86e0ada..f3b3ed03592 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -42,7 +42,7 @@ "Saving..." : "Enregistrement…", "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", + "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.", "No" : "Non", @@ -75,6 +75,7 @@ "/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 n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées dans notre <a href=\"{docLink}\">documentation</a>.", "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "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." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit sur votre <a href=\"{docUrl}\">aide de sécurité</a>.", "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">aide à la sécurité</a>.", "Shared" : "Partagé", "Shared with {recipients}" : "Partagé avec {recipients}", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index a6107b2811b..84764d7adad 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -77,6 +77,8 @@ OC.L10N.register( "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Güvenlik sebepleri ile şiddetle kaçınılması gereken /dev/urandom PHP tarafından okunamıyor. Daha fazla bilgi <a href=\"{docLink}\">belgelendirmemizde</a> bulunabilir.", "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu", "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." : "\"{header}\" HTTP başlığı \"{expected}\" ile eşleşmek üzere yapılandırılmamış. Bu muhtemel bir güvenlik veya gizlilik riski olduğundan bu ayarı düzeltmenizi öneririz.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP başlığı en az \"{seconds}\" saniye olarak ayarlanmış. İyileştirilmiş güvenlik için <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> belirtilen HSTS etkinleştirmesini öneririz.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Bu siteye HTTP aracılığıyla erişiyorsunuz. Sunucunuzu <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> gösterildiği şekilde HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.", "Shared" : "Paylaşılan", "Shared with {recipients}" : "{recipients} ile paylaşılmış", "Share" : "Paylaş", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index c7797b21f02..d4f67e60758 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -75,6 +75,8 @@ "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Güvenlik sebepleri ile şiddetle kaçınılması gereken /dev/urandom PHP tarafından okunamıyor. Daha fazla bilgi <a href=\"{docLink}\">belgelendirmemizde</a> bulunabilir.", "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu", "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." : "\"{header}\" HTTP başlığı \"{expected}\" ile eşleşmek üzere yapılandırılmamış. Bu muhtemel bir güvenlik veya gizlilik riski olduğundan bu ayarı düzeltmenizi öneririz.", + "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP başlığı en az \"{seconds}\" saniye olarak ayarlanmış. İyileştirilmiş güvenlik için <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> belirtilen HSTS etkinleştirmesini öneririz.", + "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Bu siteye HTTP aracılığıyla erişiyorsunuz. Sunucunuzu <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> gösterildiği şekilde HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.", "Shared" : "Paylaşılan", "Shared with {recipients}" : "{recipients} ile paylaşılmış", "Share" : "Paylaş", diff --git a/core/search/css/results.css b/core/search/css/results.css index 36a2ccc13c3..fd07561d133 100644 --- a/core/search/css/results.css +++ b/core/search/css/results.css @@ -12,6 +12,10 @@ /* account for margin-bottom in files list */ margin-top: -250px; } +#searchresults.filter-empty { + /* remove whitespace on bottom when no search results, to fix layout */ + margin-top: 0 !important; +} #searchresults.hidden { display: none; diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js index 958e38ee374..769a7f7054f 100644 --- a/lib/l10n/sl.js +++ b/lib/l10n/sl.js @@ -41,6 +41,7 @@ OC.L10N.register( "File name is a reserved word" : "Ime datoteke je zadržana beseda", "File name contains at least one invalid character" : "Ime datoteke vsebuje vsaj en neveljaven znak.", "File name is too long" : "Ime datoteke je predolgo", + "Can't read file" : "Datoteke ni mogoče prebrati.", "App directory already exists" : "Programska mapa že obstaja", "Can't create app folder. Please fix permissions. %s" : "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s", "No source specified when installing app" : "Ni podanega vira med nameščenjem programa", @@ -79,6 +80,7 @@ OC.L10N.register( "Set an admin password." : "Nastavi geslo skrbnika.", "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s", "%s shared »%s« with you" : "%s je omogočil souporabo »%s«", + "%s via %s" : "%s prek %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "Omogočanje souporabe %s je spodletelo, ker ozadnji program ne dopušča souporabe vrste %i.", "Sharing %s failed, because the file does not exist" : "Souporaba %s je spodletela, ker ta datoteka ne obstaja", "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.", @@ -110,6 +112,7 @@ OC.L10N.register( "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "The username is already being used" : "Vpisano uporabniško ime je že v uporabi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).", + "Microsoft Windows Platform is not supported" : "Okolje Microsoft Windows ni podprto.", "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!", "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.", diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json index 3e9711d98bc..ab717c21dc2 100644 --- a/lib/l10n/sl.json +++ b/lib/l10n/sl.json @@ -39,6 +39,7 @@ "File name is a reserved word" : "Ime datoteke je zadržana beseda", "File name contains at least one invalid character" : "Ime datoteke vsebuje vsaj en neveljaven znak.", "File name is too long" : "Ime datoteke je predolgo", + "Can't read file" : "Datoteke ni mogoče prebrati.", "App directory already exists" : "Programska mapa že obstaja", "Can't create app folder. Please fix permissions. %s" : "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s", "No source specified when installing app" : "Ni podanega vira med nameščenjem programa", @@ -77,6 +78,7 @@ "Set an admin password." : "Nastavi geslo skrbnika.", "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s", "%s shared »%s« with you" : "%s je omogočil souporabo »%s«", + "%s via %s" : "%s prek %s", "Sharing %s failed, because the backend does not allow shares from type %i" : "Omogočanje souporabe %s je spodletelo, ker ozadnji program ne dopušča souporabe vrste %i.", "Sharing %s failed, because the file does not exist" : "Souporaba %s je spodletela, ker ta datoteka ne obstaja", "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.", @@ -108,6 +110,7 @@ "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "The username is already being used" : "Vpisano uporabniško ime je že v uporabi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).", + "Microsoft Windows Platform is not supported" : "Okolje Microsoft Windows ni podprto.", "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!", "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.", diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php index 93510093c08..e013a74253a 100644 --- a/lib/private/appframework/utility/controllermethodreflector.php +++ b/lib/private/appframework/utility/controllermethodreflector.php @@ -59,7 +59,7 @@ class ControllerMethodReflector implements IControllerMethodReflector{ $this->annotations = $matches[1]; // extract type parameter information - preg_match_all('/@param (?P<type>\w+) \$(?P<var>\w+)/', $docs, $matches); + preg_match_all('/@param\h+(?P<type>\w+)\h+\$(?P<var>\w+)/', $docs, $matches); // this is just a fix for PHP 5.3 (array_combine raises warning if called with // two empty arrays if($matches['var'] === array() && $matches['type'] === array()) { diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 056f823c18b..8d1f80c53c0 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -349,7 +349,8 @@ class Encryption extends Wrapper { if ($this->util->isExcluded($fullPath) === false) { $size = $unencryptedSize = 0; - $targetExists = $this->file_exists($path); + $realFile = $this->util->stripPartialFileExtension($path); + $targetExists = $this->file_exists($realFile); $targetIsEncrypted = false; if ($targetExists) { // in case the file exists we require the explicit module as @@ -605,8 +606,9 @@ class Encryption extends Wrapper { */ protected function getHeader($path) { $header = ''; - if ($this->storage->file_exists($path)) { - $handle = $this->storage->fopen($path, 'r'); + $realFile = $this->util->stripPartialFileExtension($path); + if ($this->storage->file_exists($realFile)) { + $handle = $this->storage->fopen($realFile, 'r'); $firstBlock = fread($handle, $this->util->getHeaderSize()); fclose($handle); if (substr($firstBlock, 0, strlen(Util::HEADER_START)) === Util::HEADER_START) { diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 47cbf35836c..73daf8a141f 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -1081,7 +1081,8 @@ class View { if ($this->fakeRoot === $defaultRoot) { return true; } - return (strlen($this->fakeRoot) > strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/'); + $fullPath = $this->getAbsolutePath($path); + return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/'); } /** @@ -1091,10 +1092,11 @@ class View { * @return bool */ private function runHooks($hooks, $path, $post = false) { + $relativePath = $path; $path = $this->getHookPath($path); $prefix = ($post) ? 'post_' : ''; $run = true; - if ($this->shouldEmitHooks($path)) { + if ($this->shouldEmitHooks($relativePath)) { foreach ($hooks as $hook) { if ($hook != 'read') { \OC_Hook::emit( diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 70263fc2afa..f8defe476c4 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -245,7 +245,7 @@ class Manager extends PublicEmitter implements IGroupManager { /** * Checks if a userId is in a group * @param string $userId - * @param group $group + * @param string $group * @return bool if in group */ public function isInGroup($userId, $group) { diff --git a/lib/private/preview.php b/lib/private/preview.php index 145b7924c05..f3599852838 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -701,7 +701,7 @@ class Preview { $this->generatePreview($fileId); } - // We still don't have a preview, so we generate an empty object which can't be displayed + // We still don't have a preview, so we send back an empty object if (is_null($this->preview)) { $this->preview = new \OC_Image(); } @@ -712,22 +712,26 @@ class Preview { /** * Sends the preview, including the headers to client which requested it * - * @param null|string $mimeType + * @param null|string $mimeTypeForHeaders the media type to use when sending back the reply * * @throws NotFoundException */ - public function showPreview($mimeType = null) { + public function showPreview($mimeTypeForHeaders = null) { // Check if file is valid if ($this->isFileValid() === false) { throw new NotFoundException('File not found.'); } - \OCP\Response::enableCaching(3600 * 24); // 24 hours if (is_null($this->preview)) { $this->getPreview(); } if ($this->preview instanceof \OCP\IImage) { - $this->preview->show($mimeType); + if ($this->preview->valid()) { + \OCP\Response::enableCaching(3600 * 24); // 24 hours + } else { + $this->getMimeIcon(); + } + $this->preview->show($mimeTypeForHeaders); } } @@ -812,9 +816,8 @@ class Preview { */ // It turns out the scaled preview is now too big, so we crop the image if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) { - list($newPreviewWidth, $newPreviewHeight) = - $this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight); - $this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight); + $this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight); + $this->storePreview($fileId, $askedWidth, $askedHeight); return; } @@ -822,11 +825,10 @@ class Preview { // At least one dimension of the scaled preview is too small, // so we fill the space with a transparent background if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) { - list($newPreviewWidth, $newPreviewHeight) = - $this->cropAndFill( - $image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight - ); - $this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight); + $this->cropAndFill( + $image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight + ); + $this->storePreview($fileId, $askedWidth, $askedHeight); return; } @@ -894,8 +896,6 @@ class Preview { * @param int $askedHeight * @param int $previewWidth * @param null $previewHeight - * - * @return \int[] */ private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) { $cropX = floor(abs($askedWidth - $previewWidth) * 0.5); @@ -904,8 +904,6 @@ class Preview { $cropY = 0; $image->crop($cropX, $cropY, $askedWidth, $askedHeight); $this->preview = $image; - - return [$askedWidth, $askedHeight]; } /** @@ -917,8 +915,6 @@ class Preview { * @param int $askedHeight * @param int $previewWidth * @param null $previewHeight - * - * @return \int[] */ private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { if ($previewWidth > $askedWidth) { @@ -954,8 +950,6 @@ class Preview { $image = new \OC_Image($backgroundLayer); $this->preview = $image; - - return [$askedWidth, $askedHeight]; } /** @@ -1092,6 +1086,22 @@ class Preview { } /** + * Defines the media icon, for the media type of the original file, as the preview + */ + private function getMimeIcon() { + $image = new \OC_Image(); + $mimeIconWebPath = \OC_Helper::mimetypeIcon($this->mimeType); + if (empty(\OC::$WEBROOT)) { + $mimeIconServerPath = \OC::$SERVERROOT . $mimeIconWebPath; + } else { + $mimeIconServerPath = str_replace(\OC::$WEBROOT, \OC::$SERVERROOT, $mimeIconWebPath); + } + $image->loadFromFile($mimeIconServerPath); + + $this->preview = $image; + } + + /** * Stores the max preview in the cache * * @param string $previewPath path to the preview diff --git a/lib/private/updater.php b/lib/private/updater.php index 7f1a493d2a0..bd9e8a65363 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -386,6 +386,7 @@ class Updater extends BasicEmitter { foreach ($stacks as $type => $stack) { foreach ($stack as $appId) { if (\OC_App::shouldUpgrade($appId)) { + $this->emit('\OC\Updater', 'appUpgradeStarted', array($appId, \OC_App::getAppVersion($appId))); \OC_App::updateApp($appId); $this->emit('\OC\Updater', 'appUpgrade', array($appId, \OC_App::getAppVersion($appId))); } diff --git a/lib/public/igroupmanager.php b/lib/public/igroupmanager.php index ec4b03c5d18..4f41c808c9f 100644 --- a/lib/public/igroupmanager.php +++ b/lib/public/igroupmanager.php @@ -127,7 +127,7 @@ interface IGroupManager { /** * Checks if a userId is in a group * @param string $userId - * @param group $group + * @param string $group * @return bool if in group * @since 8.0.0 */ diff --git a/settings/js/apps.js b/settings/js/apps.js index 2863e86dba8..7849e1b7573 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -119,7 +119,7 @@ OC.Settings.Apps = OC.Settings.Apps || { $('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.')}); $('.app-level .approved').tipsy({fallback: t('settings', 'Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.')}); - $('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install on your own risk.')}); + $('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')}); }, complete: function() { $('#apps-list').removeClass('icon-loading'); diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 4a328df2fd0..a7a9bc9fcd6 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -1,6 +1,8 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Upozornění zabezpečení a nastavení", "Sharing" : "Sdílení", "Server-side encryption" : "Šifrování na serveru", @@ -57,6 +59,7 @@ OC.L10N.register( "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.", "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "U této aplikace nebyla provedena kontrola bezpečnostních problémů. Aplikace je nová nebo nestabilní. Instalujete na vlastní nebezpečí.", + "Update to %s" : "Aktualizovat na %s", "Please wait...." : "Čekejte prosím...", "Error while disabling app" : "Chyba při zakazování aplikace", "Disable" : "Zakázat", @@ -190,7 +193,6 @@ OC.L10N.register( "Show description …" : "Zobrazit popis ...", "Hide description …" : "Skrýt popis ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:", - "Update to %s" : "Aktualizovat na %s", "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny", "Uninstall App" : "Odinstalovat aplikaci", "Enable experimental apps" : "Povolit experimentální aplikace", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 58ef1a9523f..7ae211b0980 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -1,4 +1,6 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Upozornění zabezpečení a nastavení", "Sharing" : "Sdílení", "Server-side encryption" : "Šifrování na serveru", @@ -55,6 +57,7 @@ "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.", "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "U této aplikace nebyla provedena kontrola bezpečnostních problémů. Aplikace je nová nebo nestabilní. Instalujete na vlastní nebezpečí.", + "Update to %s" : "Aktualizovat na %s", "Please wait...." : "Čekejte prosím...", "Error while disabling app" : "Chyba při zakazování aplikace", "Disable" : "Zakázat", @@ -188,7 +191,6 @@ "Show description …" : "Zobrazit popis ...", "Hide description …" : "Skrýt popis ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Tuto aplikaci nelze nainstalovat, protože nejsou splněny následující závislosti:", - "Update to %s" : "Aktualizovat na %s", "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny", "Uninstall App" : "Odinstalovat aplikaci", "Enable experimental apps" : "Povolit experimentální aplikace", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index d81fb77b9b7..d64ea32e435 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -48,7 +48,7 @@ OC.L10N.register( "Your %s account was created" : "Votre compte %s a été créé.", "Unable to delete user." : "Impossible de supprimer l'utilisateur.", "Forbidden" : "Iinterdit", - "Invalid user" : "Utilisateur non valide", + "Invalid user" : "Utilisateur non valable", "Unable to change mail address" : "Impossible de modifier l'adresse de courriel", "Email saved" : "Email sauvegardé", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index c2d74a22760..4972e23e64b 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -46,7 +46,7 @@ "Your %s account was created" : "Votre compte %s a été créé.", "Unable to delete user." : "Impossible de supprimer l'utilisateur.", "Forbidden" : "Iinterdit", - "Invalid user" : "Utilisateur non valide", + "Invalid user" : "Utilisateur non valable", "Unable to change mail address" : "Impossible de modifier l'adresse de courriel", "Email saved" : "Email sauvegardé", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?", diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js index 47593387c8f..a2c134e5a21 100644 --- a/settings/l10n/sk_SK.js +++ b/settings/l10n/sk_SK.js @@ -1,10 +1,14 @@ OC.L10N.register( "settings", { + "Security & setup warnings" : "Bezpečnosť a nastavenia upozornení", "Sharing" : "Zdieľanie", + "Server-side encryption" : "Šifrovanie na serveri", "External Storage" : "Externé úložisko", "Cron" : "Cron", + "Email server" : "Email server", "Log" : "Záznam", + "Server Status" : "Stav servera", "Tips & tricks" : "Tipy a triky", "Updates" : "Aktualizácie", "Authentication error" : "Chyba autentifikácie", @@ -25,15 +29,19 @@ OC.L10N.register( "Unable to change password" : "Zmena hesla sa nepodarila", "Enabled" : "Povolené", "Not enabled" : "Zakázané", + "A problem occurred, please check your log files (Error: %s)" : "Nastala chyba, skontrolujte prosím váš log súbor (Chyba: %s)", + "Migration Completed" : "Migrácia ukončená", "Group already exists." : "Skupina už existuje.", "Unable to add group." : "Nie je možné pridať skupinu.", "Unable to delete group." : "Nie je možné zmazať skupinu.", "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia", "Saved" : "Uložené", "test email settings" : "nastavenia testovacieho emailu", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia. (Chyba: %s)", "Email sent" : "Email odoslaný", "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj používateľský email, než budete môcť odoslať testovací email.", "Invalid mail address" : "Neplatná emailová adresa", + "A user with that name already exists." : "Používateľ s týmto menom už existuje.", "Unable to create user." : "Nie je možné vytvoriť používateľa.", "Your %s account was created" : "Váš účet %s bol vytvorený", "Unable to delete user." : "Nie je možné zmazať používateľa.", @@ -43,8 +51,11 @@ OC.L10N.register( "Email saved" : "Email uložený", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?", "Add trusted domain" : "Pridať dôveryhodnú doménu", + "Migration in progress. Please wait until the migration is finished" : "Prebieha migrácia. Počkajte prosím, kým sa skončí", + "Migration started …" : "Migrácia spustená ...", "Sending..." : "Odosielam...", "All" : "Všetky", + "Update to %s" : "Aktualizovať na %s", "Please wait...." : "Čakajte prosím...", "Error while disabling app" : "Chyba pri zakázaní aplikácie", "Disable" : "Zakázať", @@ -120,6 +131,7 @@ OC.L10N.register( "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.", + "Start migration" : "Začať migráciu", "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.", "Send mode" : "Mód odosielania", "Encryption" : "Šifrovanie", @@ -150,7 +162,6 @@ OC.L10N.register( "User Documentation" : "Príručka používateľa", "Admin Documentation" : "Príručka administrátora", "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:", - "Update to %s" : "Aktualizovať na %s", "Enable only for specific groups" : "Povoliť len pre vybrané skupiny", "Uninstall App" : "Odinštalovanie aplikácie", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json index b5f94b36612..56b82ade2a3 100644 --- a/settings/l10n/sk_SK.json +++ b/settings/l10n/sk_SK.json @@ -1,8 +1,12 @@ { "translations": { + "Security & setup warnings" : "Bezpečnosť a nastavenia upozornení", "Sharing" : "Zdieľanie", + "Server-side encryption" : "Šifrovanie na serveri", "External Storage" : "Externé úložisko", "Cron" : "Cron", + "Email server" : "Email server", "Log" : "Záznam", + "Server Status" : "Stav servera", "Tips & tricks" : "Tipy a triky", "Updates" : "Aktualizácie", "Authentication error" : "Chyba autentifikácie", @@ -23,15 +27,19 @@ "Unable to change password" : "Zmena hesla sa nepodarila", "Enabled" : "Povolené", "Not enabled" : "Zakázané", + "A problem occurred, please check your log files (Error: %s)" : "Nastala chyba, skontrolujte prosím váš log súbor (Chyba: %s)", + "Migration Completed" : "Migrácia ukončená", "Group already exists." : "Skupina už existuje.", "Unable to add group." : "Nie je možné pridať skupinu.", "Unable to delete group." : "Nie je možné zmazať skupinu.", "log-level out of allowed range" : "úroveň logovania z povoleného rozpätia", "Saved" : "Uložené", "test email settings" : "nastavenia testovacieho emailu", + "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia. (Chyba: %s)", "Email sent" : "Email odoslaný", "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj používateľský email, než budete môcť odoslať testovací email.", "Invalid mail address" : "Neplatná emailová adresa", + "A user with that name already exists." : "Používateľ s týmto menom už existuje.", "Unable to create user." : "Nie je možné vytvoriť používateľa.", "Your %s account was created" : "Váš účet %s bol vytvorený", "Unable to delete user." : "Nie je možné zmazať používateľa.", @@ -41,8 +49,11 @@ "Email saved" : "Email uložený", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?", "Add trusted domain" : "Pridať dôveryhodnú doménu", + "Migration in progress. Please wait until the migration is finished" : "Prebieha migrácia. Počkajte prosím, kým sa skončí", + "Migration started …" : "Migrácia spustená ...", "Sending..." : "Odosielam...", "All" : "Všetky", + "Update to %s" : "Aktualizovať na %s", "Please wait...." : "Čakajte prosím...", "Error while disabling app" : "Chyba pri zakázaní aplikácie", "Disable" : "Zakázať", @@ -118,6 +129,7 @@ "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.", + "Start migration" : "Začať migráciu", "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.", "Send mode" : "Mód odosielania", "Encryption" : "Šifrovanie", @@ -148,7 +160,6 @@ "User Documentation" : "Príručka používateľa", "Admin Documentation" : "Príručka administrátora", "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:", - "Update to %s" : "Aktualizovať na %s", "Enable only for specific groups" : "Povoliť len pre vybrané skupiny", "Uninstall App" : "Odinštalovanie aplikácie", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Dobrý deň,<br><br>toto je oznámenie o novo vytvorenom účte %s.<br><br>Vaše používateľské meno: %s<br>Prihlásiť sa môžete tu: <a href=\"%s\">%s</a><br><br>", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index 257aa8f9536..747a8010321 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -1,6 +1,8 @@ OC.L10N.register( "settings", { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Varnost in namestitvena opozorila", "Sharing" : "Souporaba", "Server-side encryption" : "Šifriranje na strežniku", @@ -8,6 +10,7 @@ OC.L10N.register( "Cron" : "Periodično opravilo", "Email server" : "Poštni strežnik", "Log" : "Dnevnik", + "Server Status" : "Stanje strežnika", "Tips & tricks" : "Nasveti in triki", "Updates" : "Posodobitve", "Authentication error" : "Napaka med overjanjem", @@ -52,7 +55,11 @@ OC.L10N.register( "Migration in progress. Please wait until the migration is finished" : "Selitev v teku. Prosimo, počakajte, da se selitev zaključi.", "Migration started …" : "Selitev pognana...", "Sending..." : "Poteka pošiljanje ...", + "Official" : "Uradno", + "Approved" : "Odobreno", + "Experimental" : "Preizkusno", "All" : "Vsi", + "Update to %s" : "Posodobi na %s", "Please wait...." : "Počakajte ...", "Error while disabling app" : "Napaka onemogočanja programa", "Disable" : "Onemogoči", @@ -126,6 +133,7 @@ OC.L10N.register( "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.", "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.", "Enable server-side encryption" : "Omogoči šifriranje na strežniku", + "Enable encryption" : "Omogoči šifriranje", "Start migration" : "Zaženite selitev", "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.", "Send mode" : "Način pošiljanja", @@ -165,7 +173,6 @@ OC.L10N.register( "Show description …" : "Prikaži opis...", "Hide description …" : "Skrij opis...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:", - "Update to %s" : "Posodobi na %s", "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", "Enable experimental apps" : "Omogoči testne aplikacije", @@ -215,6 +222,7 @@ OC.L10N.register( "Import root certificate" : "Uvozite korenski certifikat", "Show storage location" : "Pokaži mesto shrambe", "Show last log in" : "Pokaži podatke zadnje prijave", + "Show user backend" : "Pokaži ozadnji program", "Send email to new user" : "Pošlji sporočilo novemu uporabniku", "Show email address" : "Pokaži naslov elektronske pošte", "Username" : "Uporabniško ime", @@ -235,6 +243,7 @@ OC.L10N.register( "Group Admin for" : "Skrbnik skupine za", "Quota" : "Količinska omejitev", "Storage Location" : "Mesto shrambe", + "User Backend" : "Uporabniški ozadnji program", "Last Login" : "Zadnja prijava", "change full name" : "Spremeni polno ime", "set new password" : "nastavi novo geslo", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index e1972909ac5..593a17d7cfc 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -1,4 +1,6 @@ { "translations": { + "APCu" : "APCu", + "Redis" : "Redis", "Security & setup warnings" : "Varnost in namestitvena opozorila", "Sharing" : "Souporaba", "Server-side encryption" : "Šifriranje na strežniku", @@ -6,6 +8,7 @@ "Cron" : "Periodično opravilo", "Email server" : "Poštni strežnik", "Log" : "Dnevnik", + "Server Status" : "Stanje strežnika", "Tips & tricks" : "Nasveti in triki", "Updates" : "Posodobitve", "Authentication error" : "Napaka med overjanjem", @@ -50,7 +53,11 @@ "Migration in progress. Please wait until the migration is finished" : "Selitev v teku. Prosimo, počakajte, da se selitev zaključi.", "Migration started …" : "Selitev pognana...", "Sending..." : "Poteka pošiljanje ...", + "Official" : "Uradno", + "Approved" : "Odobreno", + "Experimental" : "Preizkusno", "All" : "Vsi", + "Update to %s" : "Posodobi na %s", "Please wait...." : "Počakajte ...", "Error while disabling app" : "Napaka onemogočanja programa", "Disable" : "Onemogoči", @@ -124,6 +131,7 @@ "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.", "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.", "Enable server-side encryption" : "Omogoči šifriranje na strežniku", + "Enable encryption" : "Omogoči šifriranje", "Start migration" : "Zaženite selitev", "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.", "Send mode" : "Način pošiljanja", @@ -163,7 +171,6 @@ "Show description …" : "Prikaži opis...", "Hide description …" : "Skrij opis...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:", - "Update to %s" : "Posodobi na %s", "Enable only for specific groups" : "Omogoči le za posamezne skupine", "Uninstall App" : "Odstrani program", "Enable experimental apps" : "Omogoči testne aplikacije", @@ -213,6 +220,7 @@ "Import root certificate" : "Uvozite korenski certifikat", "Show storage location" : "Pokaži mesto shrambe", "Show last log in" : "Pokaži podatke zadnje prijave", + "Show user backend" : "Pokaži ozadnji program", "Send email to new user" : "Pošlji sporočilo novemu uporabniku", "Show email address" : "Pokaži naslov elektronske pošte", "Username" : "Uporabniško ime", @@ -233,6 +241,7 @@ "Group Admin for" : "Skrbnik skupine za", "Quota" : "Količinska omejitev", "Storage Location" : "Mesto shrambe", + "User Backend" : "Uporabniški ozadnji program", "Last Login" : "Zadnja prijava", "change full name" : "Spremeni polno ime", "set new password" : "nastavi novo geslo", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index 66efd35bd47..0f5b6d4ff2c 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -63,6 +63,7 @@ OC.L10N.register( "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ", "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "แอพพลิเคชันนี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นของใหม่หรือที่รู้กันคือจะไม่เสถียร มันติดตั้งอยู่บนความเสี่ยงของคุณเอง", + "Update to %s" : "อัพเดทไปยัง %s", "Please wait...." : "กรุณารอสักครู่...", "Error while disabling app" : "เกิดข้อผิดพลาดขณะปิดการใช้งานแอพพลิเคชัน", "Disable" : "ปิดใช้งาน", @@ -199,13 +200,13 @@ OC.L10N.register( "Show description …" : "แสดงรายละเอียด ...", "Hide description …" : "ซ่อนรายละเอียด ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "ไม่สามารถติดตั้งแอพฯนี้เพราะไม่มีตัวอ้างอิงต่อไปนี้:", - "Update to %s" : "อัพเดทไปยัง %s", "Enable only for specific groups" : "เปิดใช้งานเพียงเฉพาะกลุ่ม", "Uninstall App" : "ถอนการติดตั้งแอพฯ", "Enable experimental apps" : "เปิดใช้งานแอพพลิเคชั่นทดลอง", "No apps found for your version" : "ไม่พบแอพพลิเคชันสำหรับรุ่นของคุณ", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "นี่คุณ<br><br>อยากจะแจ้งให้คุณทราบว่าขณะนี้คุณมีบัญชี %s<br><br>ชื่อผู้ใช้ของคุณคือ: %s<br>เข้าไปงานได้ที่: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "ไชโย!", + "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "นี่คุณ\n\nอยากให้คุณทราบว่าขณะนี้คุณมี %s บัญชี\n\nชื่อผู้ใช้ของคุณ: %s\nดูได้ที่: %s\n", "User documentation" : "เอกสารสำหรับผู้ใช้", "Administrator documentation" : "เอกสารของผู้ดูแลระบบ", "Online documentation" : "เอกสารออนไลน์", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index c908303ade2..b7e595e87c1 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -61,6 +61,7 @@ "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ", "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "แอพพลิเคชันนี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นของใหม่หรือที่รู้กันคือจะไม่เสถียร มันติดตั้งอยู่บนความเสี่ยงของคุณเอง", + "Update to %s" : "อัพเดทไปยัง %s", "Please wait...." : "กรุณารอสักครู่...", "Error while disabling app" : "เกิดข้อผิดพลาดขณะปิดการใช้งานแอพพลิเคชัน", "Disable" : "ปิดใช้งาน", @@ -197,13 +198,13 @@ "Show description …" : "แสดงรายละเอียด ...", "Hide description …" : "ซ่อนรายละเอียด ...", "This app cannot be installed because the following dependencies are not fulfilled:" : "ไม่สามารถติดตั้งแอพฯนี้เพราะไม่มีตัวอ้างอิงต่อไปนี้:", - "Update to %s" : "อัพเดทไปยัง %s", "Enable only for specific groups" : "เปิดใช้งานเพียงเฉพาะกลุ่ม", "Uninstall App" : "ถอนการติดตั้งแอพฯ", "Enable experimental apps" : "เปิดใช้งานแอพพลิเคชั่นทดลอง", "No apps found for your version" : "ไม่พบแอพพลิเคชันสำหรับรุ่นของคุณ", "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "นี่คุณ<br><br>อยากจะแจ้งให้คุณทราบว่าขณะนี้คุณมีบัญชี %s<br><br>ชื่อผู้ใช้ของคุณคือ: %s<br>เข้าไปงานได้ที่: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "ไชโย!", + "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "นี่คุณ\n\nอยากให้คุณทราบว่าขณะนี้คุณมี %s บัญชี\n\nชื่อผู้ใช้ของคุณ: %s\nดูได้ที่: %s\n", "User documentation" : "เอกสารสำหรับผู้ใช้", "Administrator documentation" : "เอกสารของผู้ดูแลระบบ", "Online documentation" : "เอกสารออนไลน์", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index 3e81d5e3603..d16e0f49678 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -63,6 +63,7 @@ OC.L10N.register( "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.", "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.", + "Update to %s" : "%s sürümüne güncelle", "Please wait...." : "Lütfen bekleyin....", "Error while disabling app" : "Uygulama devre dışı bırakılırken hata", "Disable" : "Devre Dışı Bırak", @@ -199,7 +200,6 @@ OC.L10N.register( "Show description …" : "Açıklamayı göster...", "Hide description …" : "Açıklamayı gizle...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:", - "Update to %s" : "%s sürümüne güncelle", "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir", "Uninstall App" : "Uygulamayı Kaldır", "Enable experimental apps" : "Deneysel uygulamaları etkinleştir", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index f9dc84a431e..e0e080a08f5 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -61,6 +61,7 @@ "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.", "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.", + "Update to %s" : "%s sürümüne güncelle", "Please wait...." : "Lütfen bekleyin....", "Error while disabling app" : "Uygulama devre dışı bırakılırken hata", "Disable" : "Devre Dışı Bırak", @@ -197,7 +198,6 @@ "Show description …" : "Açıklamayı göster...", "Hide description …" : "Açıklamayı gizle...", "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:", - "Update to %s" : "%s sürümüne güncelle", "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir", "Uninstall App" : "Uygulamayı Kaldır", "Enable experimental apps" : "Deneysel uygulamaları etkinleştir", diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php index c513e23cd6b..a584b5481ba 100644 --- a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php +++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php @@ -119,6 +119,20 @@ class ControllerMethodReflectorTest extends \Test\TestCase { $this->assertEquals('double', $reader->getType('test')); } + /** + * @Annotation + * @param string $foo + */ + public function testReadTypeWhitespaceAnnotations(){ + $reader = new ControllerMethodReflector(); + $reader->reflect( + '\OC\AppFramework\Utility\ControllerMethodReflectorTest', + 'testReadTypeWhitespaceAnnotations' + ); + + $this->assertEquals('string', $reader->getType('foo')); + } + public function arguments($arg, $arg2='hi') {} public function testReflectParameters() { diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index 00aab94e012..1eaddf53a11 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -264,6 +264,7 @@ class ObjectTree extends \Test\TestCase { $tree->getNodeForPath($path); } + public function testGetNodeForPathRoot() { $path = '/'; @@ -285,6 +286,6 @@ class ObjectTree extends \Test\TestCase { $tree = new \OC\Connector\Sabre\ObjectTree(); $tree->init($rootNode, $view, $mountManager); - $tree->getNodeForPath($path); + $this->assertInstanceOf('\Sabre\DAV\INode', $tree->getNodeForPath($path)); } } diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index 2355009c9bf..fcd7f73dcde 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -380,6 +380,13 @@ abstract class Storage extends \Test\TestCase { $this->assertFalse($this->instance->file_exists('folder')); } + public function testRmdirEmptyFolder() { + $this->assertTrue($this->instance->mkdir('empty')); + $this->wait(); + $this->assertTrue($this->instance->rmdir('empty')); + $this->assertFalse($this->instance->file_exists('empty')); + } + public function testRecursiveUnlink() { $this->instance->mkdir('folder'); $this->instance->mkdir('folder/bar'); diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 520091df42d..175713de497 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -68,6 +68,17 @@ class Encryption extends \Test\Files\Storage\Storage { */ private $mountManager; + /** + * @var \OC\Group\Manager | \PHPUnit_Framework_MockObject_MockObject + */ + private $groupManager; + + /** + * @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject + */ + private $config; + + /** @var integer dummy unencrypted size */ private $dummySize = -1; @@ -84,14 +95,16 @@ class Encryption extends \Test\Files\Storage\Storage { ->method('getEncryptionModule') ->willReturn($mockModule); - $config = $this->getMockBuilder('\OCP\IConfig') + $this->config = $this->getMockBuilder('\OCP\IConfig') ->disableOriginalConstructor() ->getMock(); - $groupManager = $this->getMockBuilder('\OC\Group\Manager') + $this->groupManager = $this->getMockBuilder('\OC\Group\Manager') ->disableOriginalConstructor() ->getMock(); - $this->util = $this->getMock('\OC\Encryption\Util', ['getUidAndFilename', 'isFile', 'isExcluded'], [new View(), new \OC\User\Manager(), $groupManager, $config]); + $this->util = $this->getMock('\OC\Encryption\Util', + ['getUidAndFilename', 'isFile', 'isExcluded'], + [new View(), new \OC\User\Manager(), $this->groupManager, $this->config]); $this->util->expects($this->any()) ->method('getUidAndFilename') ->willReturnCallback(function ($path) { @@ -365,4 +378,48 @@ class Encryption extends \Test\Files\Storage\Storage { array(false, true), ); } + + /** + * @dataProvider dataTestGetHeader + * @param $path + * @param $strippedPath + */ + public function testGetHeader($path, $strippedPath) { + + $sourceStorage = $this->getMockBuilder('\OC\Files\Storage\Storage') + ->disableOriginalConstructor()->getMock(); + + $util = $this->getMockBuilder('\OC\Encryption\Util') + ->setConstructorArgs([new View(), new \OC\User\Manager(), $this->groupManager, $this->config]) + ->getMock(); + + $instance = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Encryption') + ->setConstructorArgs( + [ + [ + 'storage' => $sourceStorage, + 'root' => 'foo', + 'mountPoint' => '/', + 'mount' => $this->mount + ], + $this->encryptionManager, $util, $this->logger, $this->file, null, $this->keyStore, $this->update, $this->mountManager + ] + ) + ->getMock(); + + $util->expects($this->once())->method('stripPartialFileExtension') + ->with($path)->willReturn($strippedPath); + $sourceStorage->expects($this->once())->method('file_exists') + ->with($strippedPath)->willReturn(false); + + $this->invokePrivate($instance, 'getHeader', [$path]); + } + + public function dataTestGetHeader() { + return array( + array('/foo/bar.txt', '/foo/bar.txt'), + array('/foo/bar.txt.part', '/foo/bar.txt'), + array('/foo/bar.txt.ocTransferId7437493.part', '/foo/bar.txt'), + ); + } } diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index dcdebfd9bce..9862026495f 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -1230,4 +1230,33 @@ class View extends \Test\TestCase { $this->assertFalse($this->isFileLocked($view, '/test//sub', ILockingProvider::LOCK_EXCLUSIVE)); } + + public function hookPathProvider() { + return [ + ['/foo/files', '/foo', true], + ['/foo/files/bar', '/foo', true], + ['/foo', '/foo', false], + ['/foo', '/files/foo', true], + ['/foo', 'filesfoo', false] + ]; + } + + /** + * @dataProvider hookPathProvider + * @param $root + * @param $path + * @param $shouldEmit + */ + public function testHookPaths($root, $path, $shouldEmit) { + $filesystemReflection = new \ReflectionClass('\OC\Files\Filesystem'); + $defaultRootValue = $filesystemReflection->getProperty('defaultInstance'); + $defaultRootValue->setAccessible(true); + $oldRoot = $defaultRootValue->getValue(); + $defaultView = new \OC\Files\View('/foo/files'); + $defaultRootValue->setValue($defaultView); + $view = new \OC\Files\View($root); + $result = \Test_Helper::invokePrivate($view, 'shouldEmitHooks', [$path]); + $defaultRootValue->setValue($oldRoot); + $this->assertEquals($shouldEmit, $result); + } } diff --git a/tests/lib/preview.php b/tests/lib/preview.php index 27410187f43..ca7fa6987d6 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -210,6 +210,26 @@ class Preview extends TestCase { } /** + * Tests if unsupported previews return an empty object + */ + public function testUnsupportedPreviewsReturnEmptyObject() { + $width = 400; + $height = 200; + + // Previews for odt files are not enabled + $imgData = file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.odt'); + $imgPath = '/' . self::TEST_PREVIEW_USER1 . '/files/testimage.odt'; + $this->rootView->file_put_contents($imgPath, $imgData); + + $preview = + new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.odt', $width, $height); + $preview->getPreview(); + $image = $preview->getPreview(); + + $this->assertSame(false, $image->valid()); + } + + /** * We generate the data to use as it makes it easier to adjust in case we need to test * something different * |