diff options
168 files changed, 503 insertions, 215 deletions
diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js index 12ef9bb6a4b..e4911abb4ba 100644 --- a/apps/encryption/l10n/cs_CZ.js +++ b/apps/encryption/l10n/cs_CZ.js @@ -24,6 +24,7 @@ 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." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.", "Enable recovery key" : "Povolit záchranný klíč", "Disable recovery key" : "Vypnout záchranný klíč", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.", diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json index 6610d7825d6..f71b6803d79 100644 --- a/apps/encryption/l10n/cs_CZ.json +++ b/apps/encryption/l10n/cs_CZ.json @@ -22,6 +22,7 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.", "Enable recovery key" : "Povolit záchranný klíč", "Disable recovery key" : "Vypnout záchranný klíč", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.", diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js index a1530cfb5ca..d2546fff92a 100644 --- a/apps/encryption/l10n/el.js +++ b/apps/encryption/l10n/el.js @@ -24,6 +24,7 @@ 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." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.", "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης", "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.", diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json index 9963f6c82a0..8904aaa8fa3 100644 --- a/apps/encryption/l10n/el.json +++ b/apps/encryption/l10n/el.json @@ -22,6 +22,7 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.", "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης", "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.", diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js index 788d7789c38..823b4305c0e 100644 --- a/apps/encryption/l10n/en_GB.js +++ b/apps/encryption/l10n/en_GB.js @@ -8,11 +8,13 @@ OC.L10N.register( "Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!", "Recovery key successfully disabled" : "Recovery key disabled successfully", "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!", + "Missing parameters" : "Missing parameters", "Please provide the old recovery password" : "Please provide the old recovery password", "Please provide a new recovery password" : "Please provide a new recovery password", "Please repeat the new recovery password" : "Please repeat the new recovery password", "Password successfully changed." : "Password changed successfully.", "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.", + "Recovery Key disabled" : "Recovery Key disabled", "Recovery Key enabled" : "Recovery Key enabled", "Could not enable the recovery key, please try again or contact your administrator" : "Could not enable the recovery key, please try again or contact your administrator", "Could not update the private key password." : "Could not update the private key password.", @@ -22,8 +24,16 @@ 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." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.", + "Enable recovery key" : "Enable recovery key", + "Disable recovery key" : "Disable recovery key", + "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.", "Recovery key password" : "Recovery key password", + "Repeat recovery key password" : "Repeat recovery key password", "Change recovery key password:" : "Change recovery key password:", + "Old recovery key password" : "Old recovery key password", + "New recovery key password" : "New recovery key password", + "Repeat new recovery key password" : "Repeat new recovery key password", "Change Password" : "Change Password", "ownCloud basic encryption module" : "ownCloud basic encryption module", "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.", diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json index aff6305fa4c..9d5b8b6e6b8 100644 --- a/apps/encryption/l10n/en_GB.json +++ b/apps/encryption/l10n/en_GB.json @@ -6,11 +6,13 @@ "Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!", "Recovery key successfully disabled" : "Recovery key disabled successfully", "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!", + "Missing parameters" : "Missing parameters", "Please provide the old recovery password" : "Please provide the old recovery password", "Please provide a new recovery password" : "Please provide a new recovery password", "Please repeat the new recovery password" : "Please repeat the new recovery password", "Password successfully changed." : "Password changed successfully.", "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.", + "Recovery Key disabled" : "Recovery Key disabled", "Recovery Key enabled" : "Recovery Key enabled", "Could not enable the recovery key, please try again or contact your administrator" : "Could not enable the recovery key, please try again or contact your administrator", "Could not update the private key password." : "Could not update the private key password.", @@ -20,8 +22,16 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.", + "Enable recovery key" : "Enable recovery key", + "Disable recovery key" : "Disable recovery key", + "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.", "Recovery key password" : "Recovery key password", + "Repeat recovery key password" : "Repeat recovery key password", "Change recovery key password:" : "Change recovery key password:", + "Old recovery key password" : "Old recovery key password", + "New recovery key password" : "New recovery key password", + "Repeat new recovery key password" : "Repeat new recovery key password", "Change Password" : "Change Password", "ownCloud basic encryption module" : "ownCloud basic encryption module", "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.", diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js index 9664ee6f804..fee7b632671 100644 --- a/apps/encryption/l10n/pt_PT.js +++ b/apps/encryption/l10n/pt_PT.js @@ -8,6 +8,7 @@ OC.L10N.register( "Could not enable recovery key. Please check your recovery key password!" : "Não foi possível ativar a chave de recuperação. Por favor, verifique a sua senha da chave de recuperação!", "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso", "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.", + "Missing parameters" : "Parametros em falta", "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga", "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação", "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação", diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json index f3440482942..8ec72faf8d9 100644 --- a/apps/encryption/l10n/pt_PT.json +++ b/apps/encryption/l10n/pt_PT.json @@ -6,6 +6,7 @@ "Could not enable recovery key. Please check your recovery key password!" : "Não foi possível ativar a chave de recuperação. Por favor, verifique a sua senha da chave de recuperação!", "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso", "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.", + "Missing parameters" : "Parametros em falta", "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga", "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação", "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação", diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js index 5665807da8f..3f76fd9a328 100644 --- a/apps/files/l10n/az.js +++ b/apps/files/l10n/az.js @@ -42,6 +42,7 @@ OC.L10N.register( "Delete" : "Sil", "Disconnect storage" : "Daşıyıcını ayır", "Unshare" : "Paylaşımı durdur", + "No permission to delete" : "Silmək üçün yetki yoxdur", "Download" : "Yüklə", "Select" : "Seç", "Pending" : "Gözləmə", @@ -70,6 +71,7 @@ OC.L10N.register( "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ", "A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>", "A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>", + "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>sevimli faylların</strong> yaradılması və silinməsi haqqında olan xəbərdarlıqları limitlə <em>(Yalnız axınlar)</em>", "A file or folder has been <strong>deleted</strong>" : "Fayl və ya direktoriya <strong>silinib</strong>", "A file or folder has been <strong>restored</strong>" : "Fayl yada qovluq geriyə <strong>qaytarıldı</strong>", "You created %1$s" : "Siz yaratdınız %1$s", diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json index e3f9b6e49cd..ec7c41a00f9 100644 --- a/apps/files/l10n/az.json +++ b/apps/files/l10n/az.json @@ -40,6 +40,7 @@ "Delete" : "Sil", "Disconnect storage" : "Daşıyıcını ayır", "Unshare" : "Paylaşımı durdur", + "No permission to delete" : "Silmək üçün yetki yoxdur", "Download" : "Yüklə", "Select" : "Seç", "Pending" : "Gözləmə", @@ -68,6 +69,7 @@ "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ", "A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>", "A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>", + "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>sevimli faylların</strong> yaradılması və silinməsi haqqında olan xəbərdarlıqları limitlə <em>(Yalnız axınlar)</em>", "A file or folder has been <strong>deleted</strong>" : "Fayl və ya direktoriya <strong>silinib</strong>", "A file or folder has been <strong>restored</strong>" : "Fayl yada qovluq geriyə <strong>qaytarıldı</strong>", "You created %1$s" : "Siz yaratdınız %1$s", diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js index 80515d6890e..4fa680b5c7f 100644 --- a/apps/files/l10n/en_GB.js +++ b/apps/files/l10n/en_GB.js @@ -42,6 +42,7 @@ OC.L10N.register( "Delete" : "Delete", "Disconnect storage" : "Disconnect storage", "Unshare" : "Unshare", + "No permission to delete" : "No permission to delete", "Download" : "Download", "Select" : "Select", "Pending" : "Pending", diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json index e22b24ca829..417272a5cdb 100644 --- a/apps/files/l10n/en_GB.json +++ b/apps/files/l10n/en_GB.json @@ -40,6 +40,7 @@ "Delete" : "Delete", "Disconnect storage" : "Disconnect storage", "Unshare" : "Unshare", + "No permission to delete" : "No permission to delete", "Download" : "Download", "Select" : "Select", "Pending" : "Pending", diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index fc78ced0b76..a649ecfe885 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -2,6 +2,7 @@ background: #fff; text-align: center; margin: 45px auto 0; + min-height: 200px; } #preview .notCreatable { diff --git a/apps/files_sharing/l10n/az.js b/apps/files_sharing/l10n/az.js index 957ab4a7306..7c8b2f812fc 100644 --- a/apps/files_sharing/l10n/az.js +++ b/apps/files_sharing/l10n/az.js @@ -21,6 +21,7 @@ OC.L10N.register( "Remote share password" : "Uzaq yayımlanma şifrəsi", "Cancel" : "Dayandır", "Add remote share" : "Uzaq yayımlanmanı əlavə et", + "You can upload into this folder" : "Siz bu qovluğun içinə yükləyə bilərsiniz", "No ownCloud installation (7 or higher) found at {remote}" : "Yüklənmiş (7 yada yuxarı) ownCloud {uzaq} unvanında tapılmadı ", "Invalid ownCloud url" : "Yalnış ownCloud url-i", "Share" : "Yayımla", @@ -56,6 +57,7 @@ OC.L10N.register( "Download %s" : "Endir %s", "Direct link" : "Birbaşa link", "Federated Cloud Sharing" : "Federal Cloud Paylaşım", + "Open documentation" : "Sənədləri aç", "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" }, diff --git a/apps/files_sharing/l10n/az.json b/apps/files_sharing/l10n/az.json index 6d8bc7fb8dd..4de0b9df5c8 100644 --- a/apps/files_sharing/l10n/az.json +++ b/apps/files_sharing/l10n/az.json @@ -19,6 +19,7 @@ "Remote share password" : "Uzaq yayımlanma şifrəsi", "Cancel" : "Dayandır", "Add remote share" : "Uzaq yayımlanmanı əlavə et", + "You can upload into this folder" : "Siz bu qovluğun içinə yükləyə bilərsiniz", "No ownCloud installation (7 or higher) found at {remote}" : "Yüklənmiş (7 yada yuxarı) ownCloud {uzaq} unvanında tapılmadı ", "Invalid ownCloud url" : "Yalnış ownCloud url-i", "Share" : "Yayımla", @@ -54,6 +55,7 @@ "Download %s" : "Endir %s", "Direct link" : "Birbaşa link", "Federated Cloud Sharing" : "Federal Cloud Paylaşım", + "Open documentation" : "Sənədləri aç", "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php index c2a16e933b3..b70274e6bc0 100644 --- a/apps/files_sharing/publicwebdav.php +++ b/apps/files_sharing/publicwebdav.php @@ -24,10 +24,6 @@ * */ -if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) { - return false; -} - // load needed apps $RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging'); @@ -56,6 +52,11 @@ $server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC:: // wait with registering these until auth is handled and the filesystem is setup $server->on('beforeMethod', function () use ($server, $objectTree, $authBackend) { + if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) { + // this is what is thrown when trying to access a non-existing share + throw new \Sabre\DAV\Exception\NotAuthenticated(); + } + $share = $authBackend->getShare(); $rootShare = \OCP\Share::resolveReShare($share); $owner = $rootShare['uid_owner']; diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index d0c111b8e5b..eaa7ce7bfde 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -77,10 +77,7 @@ class ShareControllerTest extends \Test\TestCase { \OC_User::createUser($this->user, $this->user); \OC_Util::tearDownFS(); - \OC_User::setUserId(''); - Filesystem::tearDown(); - \OC_User::setUserId($this->user); - \OC_Util::setupFS($this->user); + $this->loginAsUser($this->user); // Create a dummy shared file $view = new View('/'. $this->user . '/files'); diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index b9e9f077201..7533b13f79d 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -153,6 +153,7 @@ abstract class TestCase extends \Test\TestCase { \OC::$server->getUserSession()->setUser(null); \OC\Files\Filesystem::tearDown(); \OC::$server->getUserSession()->login($user, $password); + \OC::$server->getUserFolder($user); \OC_Util::setupFS($user); } diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 31d77c01c91..6a1dcf3fce2 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -37,6 +37,7 @@ namespace OCA\Files_Trashbin; use OC\Files\Filesystem; +use OC\Files\View; use OCA\Files_Trashbin\Command\Expire; class Trashbin { @@ -124,6 +125,7 @@ class Trashbin { /** * copy file to owners trash + * * @param string $sourcePath * @param string $owner * @param string $ownerPath @@ -184,25 +186,32 @@ class Trashbin { // disable proxy to prevent recursive calls $trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp; + + /** @var \OC\Files\Storage\Storage $trashStorage */ + list($trashStorage, $trashInternalPath) = $view->resolvePath($trashPath); + /** @var \OC\Files\Storage\Storage $sourceStorage */ + list($sourceStorage, $sourceInternalPath) = $view->resolvePath('/files/' . $file_path); try { - $sizeOfAddedFiles = $view->filesize('/files/' . $file_path); - if ($view->file_exists($trashPath)) { - $view->unlink($trashPath); + $sizeOfAddedFiles = $sourceStorage->filesize($sourceInternalPath); + if ($trashStorage->file_exists($trashInternalPath)) { + $trashStorage->unlink($trashInternalPath); } - $view->rename('/files/' . $file_path, $trashPath); + $trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath); } catch (\OCA\Files_Trashbin\Exceptions\CopyRecursiveException $e) { $sizeOfAddedFiles = false; - if ($view->file_exists($trashPath)) { - $view->deleteAll($trashPath); + if ($trashStorage->file_exists($trashInternalPath)) { + $trashStorage->unlink($trashInternalPath); } \OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR); } - if ($view->file_exists('/files/' . $file_path)) { // failed to delete the original file, abort - $view->unlink($trashPath); + if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort + $sourceStorage->unlink($sourceInternalPath); return false; } + $view->getUpdater()->rename('/files/' . $file_path, $trashPath); + if ($sizeOfAddedFiles !== false) { $size = $sizeOfAddedFiles; $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)"); @@ -261,14 +270,15 @@ class Trashbin { if ($owner !== $user) { self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . basename($ownerPath) . '.d' . $timestamp, $rootView); } - $rootView->rename($owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp); + self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp); } else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) { + foreach ($versions as $v) { - $size += $rootView->filesize($owner . '/files_versions' . $v['path'] . '.v' . $v['version']); + $size += $rootView->filesize($owner . '/files_versions/' . $v['path'] . '.v' . $v['version']); if ($owner !== $user) { - $rootView->copy($owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . $v['name'] . '.v' . $v['version'] . '.d' . $timestamp); + self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . $v['name'] . '.v' . $v['version'] . '.d' . $timestamp); } - $rootView->rename($owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp); + self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp); } } } @@ -277,6 +287,50 @@ class Trashbin { } /** + * Move a file or folder on storage level + * + * @param View $view + * @param string $source + * @param string $target + * @return bool + */ + private static function move(View $view, $source, $target) { + /** @var \OC\Files\Storage\Storage $sourceStorage */ + list($sourceStorage, $sourceInternalPath) = $view->resolvePath($source); + /** @var \OC\Files\Storage\Storage $targetStorage */ + list($targetStorage, $targetInternalPath) = $view->resolvePath($target); + /** @var \OC\Files\Storage\Storage $ownerTrashStorage */ + + $result = $targetStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); + if ($result) { + $view->getUpdater()->rename($source, $target); + } + return $result; + } + + /** + * Copy a file or folder on storage level + * + * @param View $view + * @param string $source + * @param string $target + * @return bool + */ + private static function copy(View $view, $source, $target) { + /** @var \OC\Files\Storage\Storage $sourceStorage */ + list($sourceStorage, $sourceInternalPath) = $view->resolvePath($source); + /** @var \OC\Files\Storage\Storage $targetStorage */ + list($targetStorage, $targetInternalPath) = $view->resolvePath($target); + /** @var \OC\Files\Storage\Storage $ownerTrashStorage */ + + $result = $targetStorage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); + if ($result) { + $view->getUpdater()->update($target); + } + return $result; + } + + /** * Restore a file or folder from trash bin * * @param string $file path to the deleted file/folder relative to "files_trashbin/files/", @@ -299,7 +353,7 @@ class Trashbin { // if location no longer exists, restore file in the root directory if ($location !== '/' && (!$view->is_dir('files/' . $location) || - !$view->isCreatable('files/' . $location)) + !$view->isCreatable('files/' . $location)) ) { $location = ''; } @@ -569,6 +623,7 @@ class Trashbin { /** * resize trash bin if necessary after a new file was added to ownCloud + * * @param string $user user id */ public static function resizeTrash($user) { @@ -623,6 +678,7 @@ class Trashbin { /** * if the size limit for the trash bin is reached, we delete the oldest * files in the trash bin until we meet the limit again + * * @param array $files * @param string $user * @param int $availableSpace available disc space @@ -725,7 +781,7 @@ class Trashbin { //force rescan of versions, local storage may not have updated the cache if (!self::$scannedVersions) { /** @var \OC\Files\Storage\Storage $storage */ - list($storage, ) = $view->resolvePath('/'); + list($storage,) = $view->resolvePath('/'); $storage->getScanner()->scan('files_trashbin/versions'); self::$scannedVersions = true; } @@ -788,6 +844,7 @@ class Trashbin { /** * get the size from a given root folder + * * @param \OC\Files\View $view file view on the root folder * @return integer size of the folder */ @@ -799,7 +856,7 @@ class Trashbin { $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST); $size = 0; - /** + /** * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach * This bug is fixed in PHP 5.5.9 or before * See #8376 @@ -845,6 +902,7 @@ class Trashbin { /** * check if trash bin is empty for a given user + * * @param string $user * @return bool */ diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php index d8ddf74e24a..f99bc91dd26 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/storage.php @@ -316,10 +316,16 @@ class Storage extends \Test\TestCase { */ $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary') ->setConstructorArgs([[]]) - ->setMethods(['rename', 'unlink']) + ->setMethods(['rename', 'unlink', 'moveFromStorage']) ->getMock(); $storage->expects($this->any()) + ->method('rename') + ->will($this->returnValue(false)); + $storage->expects($this->any()) + ->method('moveFromStorage') + ->will($this->returnValue(false)); + $storage->expects($this->any()) ->method('unlink') ->will($this->returnValue(false)); diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index 85c47b527b7..0c37af24de5 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -646,6 +646,7 @@ class Test_Trashbin extends \Test\TestCase { \OC\Files\Filesystem::tearDown(); \OC_User::setUserId($user); \OC_Util::setupFS($user); + \OC::$server->getUserFolder($user); } } diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php index 97afcf715cb..685bf48d652 100644 --- a/apps/files_versions/tests/versions.php +++ b/apps/files_versions/tests/versions.php @@ -753,6 +753,7 @@ class Test_Files_Versioning extends \Test\TestCase { \OC\Files\Filesystem::tearDown(); \OC_User::setUserId($user); \OC_Util::setupFS($user); + \OC::$server->getUserFolder($user); } } diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php index 43cf22b071b..b709e09726d 100644 --- a/apps/provisioning_api/lib/users.php +++ b/apps/provisioning_api/lib/users.php @@ -27,6 +27,7 @@ use \OC_SubAdmin; use \OC_User; use \OC_Group; use \OC_Helper; +use OCP\Files\NotFoundException; class Users { @@ -92,16 +93,8 @@ class Users { $config = \OC::$server->getConfig(); // Find the data - $data = array(); - \OC_Util::tearDownFS(); - \OC_Util::setupFS($userId); - $storage = OC_Helper::getStorageInfo('/'); - $data['quota'] = array( - 'free' => $storage['free'], - 'used' => $storage['used'], - 'total' => $storage['total'], - 'relative' => $storage['relative'], - ); + $data = []; + $data = self::fillStorageInfo($userId, $data); $data['enabled'] = $config->getUserValue($userId, 'core', 'enabled', 'true'); $data['email'] = $config->getUserValue($userId, 'settings', 'email'); $data['displayname'] = OC_User::getDisplayName($parameters['userid']); @@ -350,4 +343,27 @@ class Users { return new OC_OCS_Result($groups); } } + + /** + * @param $userId + * @param $data + * @return mixed + * @throws \OCP\Files\NotFoundException + */ + private static function fillStorageInfo($userId, $data) { + try { + \OC_Util::tearDownFS(); + \OC_Util::setupFS($userId); + $storage = OC_Helper::getStorageInfo('/'); + $data['quota'] = [ + 'free' => $storage['free'], + 'used' => $storage['used'], + 'total' => $storage['total'], + 'relative' => $storage['relative'], + ]; + } catch (NotFoundException $ex) { + $data['quota'] = []; + } + return $data; + } } diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php index 140dd287a0e..94bff8bbf5b 100644 --- a/apps/provisioning_api/tests/appstest.php +++ b/apps/provisioning_api/tests/appstest.php @@ -44,7 +44,7 @@ class AppsTest extends TestCase { $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $result = \OCA\provisioning_API\Apps::getApps(array()); diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php index 94bde52c392..cb677d9b512 100644 --- a/apps/provisioning_api/tests/groupstest.php +++ b/apps/provisioning_api/tests/groupstest.php @@ -27,7 +27,7 @@ class GroupsTest extends TestCase { public function testGetGroupAsUser() { $users = $this->generateUsers(2); - \OC_User::setUserId($users[0]); + self::loginAsUser($users[0]); $group = $this->getUniqueID(); \OC_Group::createGroup($group); @@ -46,7 +46,7 @@ class GroupsTest extends TestCase { public function testGetGroupAsSubadmin() { $users = $this->generateUsers(2); - \OC_User::setUserId($users[0]); + self::loginAsUser($users[0]); $group = $this->getUniqueID(); \OC_Group::createGroup($group); @@ -75,7 +75,7 @@ class GroupsTest extends TestCase { public function testGetGroupAsIrrelevantSubadmin() { $users = $this->generateUsers(2); - \OC_User::setUserId($users[0]); + self::loginAsUser($users[0]); $group = $this->getUniqueID(); \OC_Group::createGroup($group); @@ -99,7 +99,7 @@ class GroupsTest extends TestCase { public function testGetGroupAsAdmin() { $users = $this->generateUsers(2); - \OC_User::setUserId($users[0]); + self::loginAsUser($users[0]); $group = $this->getUniqueID(); \OC_Group::createGroup($group); @@ -120,7 +120,7 @@ class GroupsTest extends TestCase { public function testGetSubAdminsOfGroup() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -135,7 +135,7 @@ class GroupsTest extends TestCase { \OC_Group::deleteGroup($group1); $user1 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $result = \OCA\provisioning_api\Groups::getSubAdminsOfGroup(array( 'groupid' => $this->getUniqueID(), diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php index c6a6133b7d2..0ba76355d58 100644 --- a/apps/provisioning_api/tests/userstest.php +++ b/apps/provisioning_api/tests/userstest.php @@ -81,7 +81,7 @@ class UsersTest extends TestCase { public function testGetUserOnSelf() { $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $params['userid'] = $user; $result = \OCA\provisioning_API\Users::getUser($params); $this->assertInstanceOf('OC_OCS_Result', $result); @@ -92,7 +92,7 @@ class UsersTest extends TestCase { public function testGetUserOnNonExistingUser() { $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $params = array(); $params['userid'] = $this->getUniqueID(); while(\OC_User::userExists($params['userid'])) { @@ -108,7 +108,7 @@ class UsersTest extends TestCase { public function testGetUserOnOtherUser() { $users = $this->generateUsers(2); $params['userid'] = $users[0]; - \OC_User::setUserId($users[1]); + self::loginAsUser($users[1]); $result = \OCA\provisioning_API\Users::getUser($params); $this->assertInstanceOf('OC_OCS_Result', $result); $this->assertFalse($result->succeeded()); @@ -116,8 +116,10 @@ class UsersTest extends TestCase { // Now as as admin $users = $this->generateUsers(2); $params['userid'] = $users[0]; + // login to generate home + self::loginAsUser($users[0]); \OC_Group::addToGroup($users[1], 'admin'); - \OC_User::setUserId($users[1]); + self::loginAsUser($users[1]); $result = \OCA\provisioning_API\Users::getUser($params); $this->assertInstanceOf('OC_OCS_Result', $result); $this->assertTrue($result->succeeded()); @@ -129,7 +131,7 @@ class UsersTest extends TestCase { // Test editing own name $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $result = \OCA\provisioning_API\Users::editUser( array( 'userid' => $user, @@ -150,7 +152,7 @@ class UsersTest extends TestCase { // Test admin editing users name $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $result = \OCA\provisioning_API\Users::editUser( array( @@ -171,7 +173,7 @@ class UsersTest extends TestCase { // Test editing other users name $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $result = \OCA\provisioning_API\Users::editUser( array( @@ -195,7 +197,7 @@ class UsersTest extends TestCase { public function testEditOwnQuota($expected, $quota) { $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $result = \OCA\provisioning_API\Users::editUser( [ 'userid' => $user, @@ -222,7 +224,7 @@ class UsersTest extends TestCase { public function testAdminEditOwnQuota() { $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $result = \OCA\provisioning_API\Users::editUser( array( 'userid' => $user, @@ -239,7 +241,7 @@ class UsersTest extends TestCase { public function testAdminEditOtherUserQuota() { $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $result = \OCA\provisioning_API\Users::editUser( array( @@ -256,7 +258,7 @@ class UsersTest extends TestCase { public function testUserEditOtherUserQuota() { $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $result = \OCA\provisioning_API\Users::editUser( array( @@ -274,7 +276,7 @@ class UsersTest extends TestCase { public function testUserEditOwnEmail() { $user = $this->generateUsers(); $email = 'test@example.com'; - \OC_User::setUserId($user); + self::loginAsUser($user); $result = \OCA\provisioning_API\Users::editUser( array( 'userid' => $user, @@ -292,7 +294,7 @@ class UsersTest extends TestCase { public function testUserEditOtherUserEmailAsUser() { $users = $this->generateUsers(2); $email = 'test@example.com'; - \OC_User::setUserId($users[0]); + self::loginAsUser($users[0]); $result = \OCA\provisioning_API\Users::editUser( array( 'userid' => $users[1], @@ -309,7 +311,7 @@ class UsersTest extends TestCase { public function testUserEditOtherUserEmailAsAdmin() { $users = $this->generateUsers(2); $email = 'test@example.com'; - \OC_User::setUserId($users[0]); + self::loginAsUser($users[0]); \OC_Group::addToGroup($users[0], 'admin'); $result = \OCA\provisioning_API\Users::editUser( array( @@ -327,7 +329,7 @@ class UsersTest extends TestCase { public function testDeleteSelf() { $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $result = \OCA\provisioning_API\Users::deleteUser(array( 'userid' => $user, )); @@ -337,7 +339,7 @@ class UsersTest extends TestCase { public function testDeleteOtherAsUser() { $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $result = \OCA\provisioning_API\Users::deleteUser(array( 'userid' => $user2, @@ -348,7 +350,7 @@ class UsersTest extends TestCase { public function testDeleteOtherAsSubAdmin() { $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $group = $this->getUniqueID(); \OC_Group::createGroup($group); @@ -365,7 +367,7 @@ class UsersTest extends TestCase { public function testDeleteOtherAsIrelevantSubAdmin() { $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $group = $this->getUniqueID(); $group2 = $this->getUniqueID(); @@ -386,7 +388,7 @@ class UsersTest extends TestCase { public function testDeleteOtherAsAdmin() { $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $user2 = $this->generateUsers(); $result = \OCA\provisioning_API\Users::deleteUser(array( 'userid' => $user2, @@ -398,7 +400,7 @@ class UsersTest extends TestCase { public function testDeleteSelfAsAdmin() { $user = $this->generateUsers(); \OC_Group::addToGroup($user, 'admin'); - \OC_User::setUserId($user); + self::loginAsUser($user); $result = \OCA\provisioning_API\Users::deleteUser(array( 'userid' => $user, )); @@ -408,7 +410,7 @@ class UsersTest extends TestCase { public function testGetUsersGroupsOnSelf() { $user = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $group = $this->getUniqueID(); \OC_Group::createGroup($group); \OC_Group::addToGroup($user, $group); @@ -426,7 +428,7 @@ class UsersTest extends TestCase { public function testGetUsersGroupOnOther() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group = $this->getUniqueID(); \OC_Group::createGroup($group); \OC_Group::addToGroup($user2, $group); @@ -442,7 +444,7 @@ class UsersTest extends TestCase { $user1 = $this->generateUsers(); \OC_Group::addToGroup($user1, 'admin'); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group = $this->getUniqueID(); \OC_Group::createGroup($group); \OC_Group::addToGroup($user2, $group); @@ -460,7 +462,7 @@ class UsersTest extends TestCase { public function testGetUsersGroupsOnOtherAsSubAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group1 = $this->getUniqueID(); $group2 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -484,7 +486,7 @@ class UsersTest extends TestCase { public function testGetUsersGroupsOnOtherAsIrelevantSubAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group1 = $this->getUniqueID(); $group2 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -505,7 +507,7 @@ class UsersTest extends TestCase { $user = $this->generateUsers(); $group = $this->getUniqueID(); \OC_Group::createGroup($group); - \OC_User::setUserId($user); + self::loginAsUser($user); $_POST['groupid'] = $group; $result = \OCA\provisioning_API\Users::addToGroup(array( 'userid' => $user, @@ -522,7 +524,7 @@ class UsersTest extends TestCase { $group = $this->getUniqueID(); \OC_Group::createGroup($group); $user2 = $this->generateUsers(); - \OC_User::setUserId($user); + self::loginAsUser($user); $_POST['groupid'] = $group; $result = \OCA\provisioning_API\Users::addToGroup(array( 'userid' => $user2, @@ -536,7 +538,7 @@ class UsersTest extends TestCase { public function testAddToGroupAsSubAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); \OC_SubAdmin::createSubAdmin($user1, $group1); @@ -553,7 +555,7 @@ class UsersTest extends TestCase { public function testAddToGroupAsIrelevantSubAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group1 = $this->getUniqueID(); $group2 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -573,7 +575,7 @@ class UsersTest extends TestCase { // test delete /cloud/users/{userid}/groups public function testRemoveFromGroupAsSelf() { $user1 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); \OC_Group::addToGroup($user1, $group1); @@ -592,7 +594,7 @@ class UsersTest extends TestCase { public function testRemoveFromGroupAsAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); \OC_Group::addToGroup($user2, $group1); @@ -611,7 +613,7 @@ class UsersTest extends TestCase { public function testRemoveFromGroupAsSubAdmin() { $user1 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $user2 = $this->generateUsers(); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -632,7 +634,7 @@ class UsersTest extends TestCase { public function testRemoveFromGroupAsIrelevantSubAdmin() { $user1 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); $user2 = $this->generateUsers(); $group1 = $this->getUniqueID(); $group2 = $this->getUniqueID(); @@ -657,7 +659,7 @@ class UsersTest extends TestCase { public function testCreateSubAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -674,7 +676,7 @@ class UsersTest extends TestCase { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $_POST['groupid'] = 'admin'; $result = \OCA\provisioning_api\Users::addSubAdmin(array( @@ -687,7 +689,7 @@ class UsersTest extends TestCase { $this->resetParams(); $user1 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -704,7 +706,7 @@ class UsersTest extends TestCase { public function testRemoveSubAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -721,7 +723,7 @@ class UsersTest extends TestCase { \OC_Group::deleteGroup($group1); $user1 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $result = \OCA\provisioning_api\Users::removeSubAdmin(array( 'userid' => $this->getUniqueID(), @@ -737,7 +739,7 @@ class UsersTest extends TestCase { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -757,7 +759,7 @@ class UsersTest extends TestCase { public function testGetSubAdminGroups() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); @@ -772,7 +774,7 @@ class UsersTest extends TestCase { \OC_Group::deleteGroup($group1); $user1 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); $result = \OCA\provisioning_api\Users::getUserSubAdminGroups(array( @@ -786,7 +788,7 @@ class UsersTest extends TestCase { public function testSubAdminOfGroupAlreadySubAdmin() { $user1 = $this->generateUsers(); $user2 = $this->generateUsers(); - \OC_User::setUserId($user1); + self::loginAsUser($user1); \OC_Group::addToGroup($user1, 'admin'); $group1 = $this->getUniqueID(); \OC_Group::createGroup($group1); diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js index a5eb704c3e6..26243f689c4 100644 --- a/apps/user_ldap/l10n/cs_CZ.js +++ b/apps/user_ldap/l10n/cs_CZ.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Selhalo zrušení mapování.", "Failed to delete the server configuration" : "Selhalo smazání nastavení serveru", + "The configuration is invalid: anonymous bind is not allowed." : "Tato konfigurace není platná: anonymní bind není povolen.", "The configuration is valid and the connection could be established!" : "Nastavení je v pořádku a spojení bylo navázáno.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.", "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurace je neplatná. Pro bližší informace se podívejte do logu.", @@ -11,6 +12,7 @@ OC.L10N.register( "No data specified" : "Neurčena žádná data", " Could not set configuration %s" : "Nelze nastavit konfiguraci %s", "Action does not exist" : "Tato akce neexistuje", + "The Base DN appears to be wrong" : "Base DN nevypadá být v pořádku", "Configuration incorrect" : "Nesprávná konfigurace", "Configuration incomplete" : "Nekompletní konfigurace", "Configuration OK" : "Konfigurace v pořádku", @@ -29,6 +31,8 @@ OC.L10N.register( "Confirm Deletion" : "Potvrdit smazání", "Mappings cleared successfully!" : "Mapování úspěšně vyčištěno!", "Error while clearing the mappings." : "Chyba při čištění mapování.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonymní bind není povolen. Zadejte prosím User DN a Heslo.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Chyba LDAP operace. Anonymní bind nejspíše není povolen.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Ukládání selhalo. Ujistěte se, že databáze funguje. Načtěte znovu, než budete pokračovat.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Přepnutí módu povolí automatické LDAP dotazy. V závislosti na velikosti vašeho LDAP může vyhledávání chvíli trvat. Opravdu si přejete přepnout mód?", "Mode switch" : "Přepnutí módu", diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json index dbe157bb1ba..bc7feb157d9 100644 --- a/apps/user_ldap/l10n/cs_CZ.json +++ b/apps/user_ldap/l10n/cs_CZ.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Selhalo zrušení mapování.", "Failed to delete the server configuration" : "Selhalo smazání nastavení serveru", + "The configuration is invalid: anonymous bind is not allowed." : "Tato konfigurace není platná: anonymní bind není povolen.", "The configuration is valid and the connection could be established!" : "Nastavení je v pořádku a spojení bylo navázáno.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.", "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurace je neplatná. Pro bližší informace se podívejte do logu.", @@ -9,6 +10,7 @@ "No data specified" : "Neurčena žádná data", " Could not set configuration %s" : "Nelze nastavit konfiguraci %s", "Action does not exist" : "Tato akce neexistuje", + "The Base DN appears to be wrong" : "Base DN nevypadá být v pořádku", "Configuration incorrect" : "Nesprávná konfigurace", "Configuration incomplete" : "Nekompletní konfigurace", "Configuration OK" : "Konfigurace v pořádku", @@ -27,6 +29,8 @@ "Confirm Deletion" : "Potvrdit smazání", "Mappings cleared successfully!" : "Mapování úspěšně vyčištěno!", "Error while clearing the mappings." : "Chyba při čištění mapování.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonymní bind není povolen. Zadejte prosím User DN a Heslo.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Chyba LDAP operace. Anonymní bind nejspíše není povolen.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Ukládání selhalo. Ujistěte se, že databáze funguje. Načtěte znovu, než budete pokračovat.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Přepnutí módu povolí automatické LDAP dotazy. V závislosti na velikosti vašeho LDAP může vyhledávání chvíli trvat. Opravdu si přejete přepnout mód?", "Mode switch" : "Přepnutí módu", diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js index 939edd4d045..5c22b9c7357 100644 --- a/apps/user_ldap/l10n/el.js +++ b/apps/user_ldap/l10n/el.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Αποτυχία εκκαθάρισης των αντιστοιχιών.", "Failed to delete the server configuration" : "Αποτυχία διαγραφής ρυθμίσεων διακομιστή", + "The configuration is invalid: anonymous bind is not allowed." : "Η διαμόρφωση δεν είναι έγκυρη: δεν επιτρέπεται ανώνυμη δέσμευση.", "The configuration is valid and the connection could be established!" : "Οι ρυθμίσεις είναι έγκυρες και η σύνδεση μπορεί να πραγματοποιηθεί!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.", "The configuration is invalid. Please have a look at the logs for further details." : "Η διαμόρφωση είναι άκυρη. Παρακαλώ ελέγξτε τα αρχεία σφαλμάτων για περαιτέρω λεπτομέρειες.", @@ -29,6 +30,8 @@ OC.L10N.register( "Confirm Deletion" : "Επιβεβαίωση Διαγραφής", "Mappings cleared successfully!" : "Η εκκαθάριση αντιστοιχιών ήταν επιτυχής!", "Error while clearing the mappings." : "Σφάλμα κατά την εκκαθάριση των αντιστοιχιών.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Η ανώνυμη δέσμευση δεν επιτρέπεται. Παρακαλούμε δώστε ένα DN χρήστη και Κωδικό Πρόσβασης.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Σφάλμα ενεργειών LDAP. Η ανώνυμη δέσμευση μπορεί να μην επιτρέπεται.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Αποτυχία αποθήκευσης. Παρακαλούμε βεβαιωθείτε ότι η βάση δεδομένων λειτουργεί. Επαναφορτώστε πριν συνεχίσετε.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Η αλλαγή της κατάστασης θα ενεργοποιήσει αυτόματα ερωτήματα LDAP. Ανάλογα με το μέγεθος του LDAP αυτό μπορεί να διαρκέσει αρκετά. Θέλετε ακόμη να αλλάξετε κατάσταση λειτουργίας;", "Mode switch" : "Αλλαγή κατάστασης", diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json index 1e0add9ee44..0c7b6b8009f 100644 --- a/apps/user_ldap/l10n/el.json +++ b/apps/user_ldap/l10n/el.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Αποτυχία εκκαθάρισης των αντιστοιχιών.", "Failed to delete the server configuration" : "Αποτυχία διαγραφής ρυθμίσεων διακομιστή", + "The configuration is invalid: anonymous bind is not allowed." : "Η διαμόρφωση δεν είναι έγκυρη: δεν επιτρέπεται ανώνυμη δέσμευση.", "The configuration is valid and the connection could be established!" : "Οι ρυθμίσεις είναι έγκυρες και η σύνδεση μπορεί να πραγματοποιηθεί!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.", "The configuration is invalid. Please have a look at the logs for further details." : "Η διαμόρφωση είναι άκυρη. Παρακαλώ ελέγξτε τα αρχεία σφαλμάτων για περαιτέρω λεπτομέρειες.", @@ -27,6 +28,8 @@ "Confirm Deletion" : "Επιβεβαίωση Διαγραφής", "Mappings cleared successfully!" : "Η εκκαθάριση αντιστοιχιών ήταν επιτυχής!", "Error while clearing the mappings." : "Σφάλμα κατά την εκκαθάριση των αντιστοιχιών.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Η ανώνυμη δέσμευση δεν επιτρέπεται. Παρακαλούμε δώστε ένα DN χρήστη και Κωδικό Πρόσβασης.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Σφάλμα ενεργειών LDAP. Η ανώνυμη δέσμευση μπορεί να μην επιτρέπεται.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Αποτυχία αποθήκευσης. Παρακαλούμε βεβαιωθείτε ότι η βάση δεδομένων λειτουργεί. Επαναφορτώστε πριν συνεχίσετε.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Η αλλαγή της κατάστασης θα ενεργοποιήσει αυτόματα ερωτήματα LDAP. Ανάλογα με το μέγεθος του LDAP αυτό μπορεί να διαρκέσει αρκετά. Θέλετε ακόμη να αλλάξετε κατάσταση λειτουργίας;", "Mode switch" : "Αλλαγή κατάστασης", diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js index 86c93e972d7..6c4be9ec3f0 100644 --- a/apps/user_ldap/l10n/en_GB.js +++ b/apps/user_ldap/l10n/en_GB.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Failed to clear the mappings.", "Failed to delete the server configuration" : "Failed to delete the server configuration", + "The configuration is invalid: anonymous bind is not allowed." : "The configuration is invalid: anonymous bind is not allowed.", "The configuration is valid and the connection could be established!" : "The configuration is valid and the connection could be established!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "The configuration is valid, but the Bind failed. Please check the server settings and credentials.", "The configuration is invalid. Please have a look at the logs for further details." : "The configuration is invalid. Please have a look at the logs for further details.", @@ -22,12 +23,15 @@ OC.L10N.register( "Could not detect Base DN, please enter it manually." : "Could not detect Base DN, please enter it manually.", "{nthServer}. Server" : "{nthServer}. Server", "No object found in the given Base DN. Please revise." : "No object found in the given Base DN. Please revise.", + "More than 1.000 directory entries available." : "More than 1,000 directory entries available.", " entries available within the provided Base DN" : " entries available within the provided Base DN", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "An error occurred. Please check the Base DN, as well as connection settings and credentials.", "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?", "Confirm Deletion" : "Confirm Deletion", "Mappings cleared successfully!" : "Mappings cleared successfully!", "Error while clearing the mappings." : "Error whilst clearing the mappings.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonymous bind is not allowed. Please provide a User DN and Password.", + "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP Operations error. Anonymous bind might not be allowed.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Saving failed. Please make sure the database is in operation. Reload before continuing.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?", "Mode switch" : "Mode switch", diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json index 39366fd146b..4b8bf5fc163 100644 --- a/apps/user_ldap/l10n/en_GB.json +++ b/apps/user_ldap/l10n/en_GB.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Failed to clear the mappings.", "Failed to delete the server configuration" : "Failed to delete the server configuration", + "The configuration is invalid: anonymous bind is not allowed." : "The configuration is invalid: anonymous bind is not allowed.", "The configuration is valid and the connection could be established!" : "The configuration is valid and the connection could be established!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "The configuration is valid, but the Bind failed. Please check the server settings and credentials.", "The configuration is invalid. Please have a look at the logs for further details." : "The configuration is invalid. Please have a look at the logs for further details.", @@ -20,12 +21,15 @@ "Could not detect Base DN, please enter it manually." : "Could not detect Base DN, please enter it manually.", "{nthServer}. Server" : "{nthServer}. Server", "No object found in the given Base DN. Please revise." : "No object found in the given Base DN. Please revise.", + "More than 1.000 directory entries available." : "More than 1,000 directory entries available.", " entries available within the provided Base DN" : " entries available within the provided Base DN", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "An error occurred. Please check the Base DN, as well as connection settings and credentials.", "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?", "Confirm Deletion" : "Confirm Deletion", "Mappings cleared successfully!" : "Mappings cleared successfully!", "Error while clearing the mappings." : "Error whilst clearing the mappings.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonymous bind is not allowed. Please provide a User DN and Password.", + "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP Operations error. Anonymous bind might not be allowed.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Saving failed. Please make sure the database is in operation. Reload before continuing.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?", "Mode switch" : "Mode switch", diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js index fd90625352b..007730546ae 100644 --- a/apps/user_ldap/l10n/es.js +++ b/apps/user_ldap/l10n/es.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.", "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor", + "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: enlaces anónimos no están permitido.", "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.", "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.", @@ -11,6 +12,7 @@ OC.L10N.register( "No data specified" : "No se han especificado los datos", " Could not set configuration %s" : "No se pudo establecer la configuración %s", "Action does not exist" : "La acción no existe.", + "The Base DN appears to be wrong" : "La Base DN parece estar mal", "Configuration incorrect" : "Configuración Incorrecta", "Configuration incomplete" : "Configuración incompleta", "Configuration OK" : "Configuración correcta", @@ -29,6 +31,8 @@ OC.L10N.register( "Confirm Deletion" : "Confirmar eliminación", "Mappings cleared successfully!" : "¡Asignaciones borradas exitosamente!", "Error while clearing the mappings." : "Error mientras se borraban las asignaciones.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Enlace anónimo no está permitido. Por favor suministre un DN de usuario y contraseña ", + "LDAP Operations error. Anonymous bind might not be allowed." : "Error de operaciones LDAP. Enlace anónimo puede no estar permitido.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese de que la base de datos está en Operación. Actualizar antes de continuar.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. ¿Desea cambiar el modo?", "Mode switch" : "Modo interruptor", diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json index 3e939e07de2..2ad26941d48 100644 --- a/apps/user_ldap/l10n/es.json +++ b/apps/user_ldap/l10n/es.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.", "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor", + "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: enlaces anónimos no están permitido.", "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.", "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.", @@ -9,6 +10,7 @@ "No data specified" : "No se han especificado los datos", " Could not set configuration %s" : "No se pudo establecer la configuración %s", "Action does not exist" : "La acción no existe.", + "The Base DN appears to be wrong" : "La Base DN parece estar mal", "Configuration incorrect" : "Configuración Incorrecta", "Configuration incomplete" : "Configuración incompleta", "Configuration OK" : "Configuración correcta", @@ -27,6 +29,8 @@ "Confirm Deletion" : "Confirmar eliminación", "Mappings cleared successfully!" : "¡Asignaciones borradas exitosamente!", "Error while clearing the mappings." : "Error mientras se borraban las asignaciones.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Enlace anónimo no está permitido. Por favor suministre un DN de usuario y contraseña ", + "LDAP Operations error. Anonymous bind might not be allowed." : "Error de operaciones LDAP. Enlace anónimo puede no estar permitido.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese de que la base de datos está en Operación. Actualizar antes de continuar.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. ¿Desea cambiar el modo?", "Mode switch" : "Modo interruptor", diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js index 63f7a2cdaf1..201f09ddab6 100644 --- a/apps/user_ldap/l10n/gl.js +++ b/apps/user_ldap/l10n/gl.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Non foi posíbel limpar as asignacións.", "Failed to delete the server configuration" : "Non foi posíbel eliminar a configuración do servidor", + "The configuration is invalid: anonymous bind is not allowed." : "A configuración é incorrecta: o vínculo anónimo non está permitido.", "The configuration is valid and the connection could be established!" : "A configuración é correcta e pode estabelecerse a conexión.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.", "The configuration is invalid. Please have a look at the logs for further details." : "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles", @@ -11,6 +12,7 @@ OC.L10N.register( "No data specified" : "Non se especificaron datos", " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s", "Action does not exist" : "Non existe esta acción", + "The Base DN appears to be wrong" : "O DN base semella ser erróneo", "Configuration incorrect" : "Configuración incorrecta", "Configuration incomplete" : "Configuración incompleta", "Configuration OK" : "Configuración correcta", @@ -29,6 +31,8 @@ OC.L10N.register( "Confirm Deletion" : "Confirmar a eliminación", "Mappings cleared successfully!" : "Limpáronse satisfactoriamente as asignacións!", "Error while clearing the mappings." : "Produciuse un erro ao limpar as asignacións.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "O vínculo anónimo non está permitido. Forneza un DN de usuario e un contrasinal.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Produciuse un erro de operacións do LDAP. O vínculo anónimo podería non estar permitido.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Non foi posíbel gardar. Asegúrese de que a base de datos está en funcionamento. Volva a cargar antes de continuar.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "O cambio do modo permitirá consultas LDAP automáticas. Dependendo do tamaño de LDAP pode levarlle un chisco. Quere cambiar de modo aínda así?", "Mode switch" : "Cambio de modo", diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json index bcbef5d530e..a7258b69243 100644 --- a/apps/user_ldap/l10n/gl.json +++ b/apps/user_ldap/l10n/gl.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Non foi posíbel limpar as asignacións.", "Failed to delete the server configuration" : "Non foi posíbel eliminar a configuración do servidor", + "The configuration is invalid: anonymous bind is not allowed." : "A configuración é incorrecta: o vínculo anónimo non está permitido.", "The configuration is valid and the connection could be established!" : "A configuración é correcta e pode estabelecerse a conexión.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.", "The configuration is invalid. Please have a look at the logs for further details." : "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles", @@ -9,6 +10,7 @@ "No data specified" : "Non se especificaron datos", " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s", "Action does not exist" : "Non existe esta acción", + "The Base DN appears to be wrong" : "O DN base semella ser erróneo", "Configuration incorrect" : "Configuración incorrecta", "Configuration incomplete" : "Configuración incompleta", "Configuration OK" : "Configuración correcta", @@ -27,6 +29,8 @@ "Confirm Deletion" : "Confirmar a eliminación", "Mappings cleared successfully!" : "Limpáronse satisfactoriamente as asignacións!", "Error while clearing the mappings." : "Produciuse un erro ao limpar as asignacións.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "O vínculo anónimo non está permitido. Forneza un DN de usuario e un contrasinal.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Produciuse un erro de operacións do LDAP. O vínculo anónimo podería non estar permitido.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Non foi posíbel gardar. Asegúrese de que a base de datos está en funcionamento. Volva a cargar antes de continuar.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "O cambio do modo permitirá consultas LDAP automáticas. Dependendo do tamaño de LDAP pode levarlle un chisco. Quere cambiar de modo aínda así?", "Mode switch" : "Cambio de modo", diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js index 342808994e4..92d64b72b74 100644 --- a/apps/user_ldap/l10n/it.js +++ b/apps/user_ldap/l10n/it.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Cancellazione delle associazioni non riuscita.", "Failed to delete the server configuration" : "Eliminazione della configurazione del server non riuscita", + "The configuration is invalid: anonymous bind is not allowed." : "La configurazione non è valida: l'associazione anonima non è consentita.", "The configuration is valid and the connection could be established!" : "La configurazione è valida e la connessione può essere stabilita.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.", "The configuration is invalid. Please have a look at the logs for further details." : "La configurazione non è valida. Controlla i log per ulteriori dettagli.", @@ -11,6 +12,7 @@ OC.L10N.register( "No data specified" : "Nessun dato specificato", " Could not set configuration %s" : "Impossibile impostare la configurazione %s", "Action does not exist" : "L'azione non esiste", + "The Base DN appears to be wrong" : "Il DN base sembra essere errato", "Configuration incorrect" : "Configurazione non corretta", "Configuration incomplete" : "Configurazione incompleta", "Configuration OK" : "Configurazione corretta", @@ -29,6 +31,8 @@ OC.L10N.register( "Confirm Deletion" : "Conferma l'eliminazione", "Mappings cleared successfully!" : "Associazioni cancellate correttamente!", "Error while clearing the mappings." : "Errore durante la cancellazione delle associazioni.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "L'associazione anonima non è consentita. Fornisci un DN utente e la password.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Errore delle operazioni LDAP. L'associazione anonima potrebbe non essere consentita.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Salvataggio non riuscito. Assicurati che il database sia operativo. Ricarica prima di continuare.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Il cambio di modalità abiliterà le query LDAP automatiche. In base alla dimensione di LDAP, potrebbero richiedere del tempo. Vuoi ancora cambiare modalità?", "Mode switch" : "Cambio modalità", diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json index 42ab5158a28..53425d04435 100644 --- a/apps/user_ldap/l10n/it.json +++ b/apps/user_ldap/l10n/it.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Cancellazione delle associazioni non riuscita.", "Failed to delete the server configuration" : "Eliminazione della configurazione del server non riuscita", + "The configuration is invalid: anonymous bind is not allowed." : "La configurazione non è valida: l'associazione anonima non è consentita.", "The configuration is valid and the connection could be established!" : "La configurazione è valida e la connessione può essere stabilita.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.", "The configuration is invalid. Please have a look at the logs for further details." : "La configurazione non è valida. Controlla i log per ulteriori dettagli.", @@ -9,6 +10,7 @@ "No data specified" : "Nessun dato specificato", " Could not set configuration %s" : "Impossibile impostare la configurazione %s", "Action does not exist" : "L'azione non esiste", + "The Base DN appears to be wrong" : "Il DN base sembra essere errato", "Configuration incorrect" : "Configurazione non corretta", "Configuration incomplete" : "Configurazione incompleta", "Configuration OK" : "Configurazione corretta", @@ -27,6 +29,8 @@ "Confirm Deletion" : "Conferma l'eliminazione", "Mappings cleared successfully!" : "Associazioni cancellate correttamente!", "Error while clearing the mappings." : "Errore durante la cancellazione delle associazioni.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "L'associazione anonima non è consentita. Fornisci un DN utente e la password.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Errore delle operazioni LDAP. L'associazione anonima potrebbe non essere consentita.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Salvataggio non riuscito. Assicurati che il database sia operativo. Ricarica prima di continuare.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Il cambio di modalità abiliterà le query LDAP automatiche. In base alla dimensione di LDAP, potrebbero richiedere del tempo. Vuoi ancora cambiare modalità?", "Mode switch" : "Cambio modalità", diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js index 4600b251564..30c897c82b2 100644 --- a/apps/user_ldap/l10n/nl.js +++ b/apps/user_ldap/l10n/nl.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Niet gelukt de vertalingen leeg te maken.", "Failed to delete the server configuration" : "Verwijderen serverconfiguratie mislukt", + "The configuration is invalid: anonymous bind is not allowed." : "De configuratie is ongeldig: anonieme bind is niet toegestaan.", "The configuration is valid and the connection could be established!" : "De configuratie is geldig en de verbinding is geslaagd!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.", "The configuration is invalid. Please have a look at the logs for further details." : "De configuratie is ongeldig. Bekijk de logbestanden voor meer details.", @@ -29,6 +30,8 @@ OC.L10N.register( "Confirm Deletion" : "Bevestig verwijderen", "Mappings cleared successfully!" : "Mappings succesvol schoongemaakt!", "Error while clearing the mappings." : "Fout bij opschonen mappings.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonieme bind is niet toegestaan. Geef een gebruikers DN en wachrwoord op.", + "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP operatie fout. Anonieme bind is misschien niet toegstaan.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Opslaan mislukt. Verifieer dat de database draait. Herlaad voordat u verder gaat.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Omschakelen van de modus schakelt automatische LDAP opvragingen in. Afhankelijk van uw LDAP omvang kan dat even duren. Wilt u nog steeds omschakelen?", "Mode switch" : "Omschakelen modus", diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json index 63d8720555d..3b2c19e86a2 100644 --- a/apps/user_ldap/l10n/nl.json +++ b/apps/user_ldap/l10n/nl.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Niet gelukt de vertalingen leeg te maken.", "Failed to delete the server configuration" : "Verwijderen serverconfiguratie mislukt", + "The configuration is invalid: anonymous bind is not allowed." : "De configuratie is ongeldig: anonieme bind is niet toegestaan.", "The configuration is valid and the connection could be established!" : "De configuratie is geldig en de verbinding is geslaagd!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.", "The configuration is invalid. Please have a look at the logs for further details." : "De configuratie is ongeldig. Bekijk de logbestanden voor meer details.", @@ -27,6 +28,8 @@ "Confirm Deletion" : "Bevestig verwijderen", "Mappings cleared successfully!" : "Mappings succesvol schoongemaakt!", "Error while clearing the mappings." : "Fout bij opschonen mappings.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonieme bind is niet toegestaan. Geef een gebruikers DN en wachrwoord op.", + "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP operatie fout. Anonieme bind is misschien niet toegstaan.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Opslaan mislukt. Verifieer dat de database draait. Herlaad voordat u verder gaat.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Omschakelen van de modus schakelt automatische LDAP opvragingen in. Afhankelijk van uw LDAP omvang kan dat even duren. Wilt u nog steeds omschakelen?", "Mode switch" : "Omschakelen modus", diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js index 37d5de96d38..2f6e9226b16 100644 --- a/apps/user_ldap/l10n/pt_BR.js +++ b/apps/user_ldap/l10n/pt_BR.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Failed to clear the mappings." : "Falha ao limpar os mapeamentos.", "Failed to delete the server configuration" : "Falha ao deletar a configuração do servidor", + "The configuration is invalid: anonymous bind is not allowed." : "A configuração é inválida: vínculo anônimo não é permitido.", "The configuration is valid and the connection could be established!" : "A configuração é válida e a conexão foi estabelecida!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.", "The configuration is invalid. Please have a look at the logs for further details." : "Configuração inválida. Por favor, dê uma olhada nos logs para mais detalhes.", @@ -11,6 +12,7 @@ OC.L10N.register( "No data specified" : "Não há dados especificados", " Could not set configuration %s" : "Não foi possível definir a configuração %s", "Action does not exist" : "A ação não existe", + "The Base DN appears to be wrong" : "O DN de base parece estar errado", "Configuration incorrect" : "Configuração incorreta", "Configuration incomplete" : "Configuração incompleta", "Configuration OK" : "Configuração OK", @@ -29,6 +31,8 @@ OC.L10N.register( "Confirm Deletion" : "Confirmar Exclusão", "Mappings cleared successfully!" : "Limpeza do mapeamento feita com sucesso!", "Error while clearing the mappings." : "Erro enquanto limpava os mapeamentos.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Vínculo anônimo não é permitido. Por favor, forneça um DN do usuário e senha.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Erro Operações LDAP. Vínculo anônimo pode não ser permitido.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha ao gravar. Por favor, verifique se o banco de dados está em operação. Atualize antes de continuar.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Mudar o modo irá permitir consultas LDAP automáticas. Dependendo do tamanho do LDAP isso pode demorar um pouco. Você ainda quer mudar o modo?", "Mode switch" : "Troca de modo", diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json index 5980b372c8b..aed3f713a05 100644 --- a/apps/user_ldap/l10n/pt_BR.json +++ b/apps/user_ldap/l10n/pt_BR.json @@ -1,6 +1,7 @@ { "translations": { "Failed to clear the mappings." : "Falha ao limpar os mapeamentos.", "Failed to delete the server configuration" : "Falha ao deletar a configuração do servidor", + "The configuration is invalid: anonymous bind is not allowed." : "A configuração é inválida: vínculo anônimo não é permitido.", "The configuration is valid and the connection could be established!" : "A configuração é válida e a conexão foi estabelecida!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.", "The configuration is invalid. Please have a look at the logs for further details." : "Configuração inválida. Por favor, dê uma olhada nos logs para mais detalhes.", @@ -9,6 +10,7 @@ "No data specified" : "Não há dados especificados", " Could not set configuration %s" : "Não foi possível definir a configuração %s", "Action does not exist" : "A ação não existe", + "The Base DN appears to be wrong" : "O DN de base parece estar errado", "Configuration incorrect" : "Configuração incorreta", "Configuration incomplete" : "Configuração incompleta", "Configuration OK" : "Configuração OK", @@ -27,6 +29,8 @@ "Confirm Deletion" : "Confirmar Exclusão", "Mappings cleared successfully!" : "Limpeza do mapeamento feita com sucesso!", "Error while clearing the mappings." : "Erro enquanto limpava os mapeamentos.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Vínculo anônimo não é permitido. Por favor, forneça um DN do usuário e senha.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Erro Operações LDAP. Vínculo anônimo pode não ser permitido.", "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha ao gravar. Por favor, verifique se o banco de dados está em operação. Atualize antes de continuar.", "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Mudar o modo irá permitir consultas LDAP automáticas. Dependendo do tamanho do LDAP isso pode demorar um pouco. Você ainda quer mudar o modo?", "Mode switch" : "Troca de modo", diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js index 55cccb28022..34fa399e686 100644 --- a/apps/user_ldap/l10n/pt_PT.js +++ b/apps/user_ldap/l10n/pt_PT.js @@ -11,14 +11,26 @@ OC.L10N.register( "No data specified" : "Nenhuma data especificada", " Could not set configuration %s" : "Não foi possível definir a configuração %s", "Action does not exist" : "Não existe esta acção", + "The Base DN appears to be wrong" : "O ND de base parece estar errado", "Configuration incorrect" : "Configuração incorreta", "Configuration incomplete" : "Configuração incompleta", "Configuration OK" : "Configuração OK", "Select groups" : "Seleccionar grupos", "Select object classes" : "Selecionar classes de objetos", + "Please check the credentials, they seem to be wrong." : "Por favor verifique as credenciais, parecem estar erradas.", + "Please specify the port, it could not be auto-detected." : "Por favor especifique a porta, não pode ser detetada automaticamente.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "O ND de base não pode ser detetado automaticamente, por favor verifique as credenciais, host e porta.", + "Could not detect Base DN, please enter it manually." : "Não foi possível detetar o ND de base, por favor introduza-o manualmente.", "{nthServer}. Server" : "{nthServer}. Servidor", + "More than 1.000 directory entries available." : "Mais de 1,000 entradas de diretório disponíveis.", + " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ocorreu um erro. Por favor verifique o ND de base, bem como as definições de ligação e as credenciais.", "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?", "Confirm Deletion" : "Confirmar a operação de apagar", + "Mappings cleared successfully!" : "Mapas limpos com sucesso!", + "Error while clearing the mappings." : "Erro a limpar os mapas.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Ligação anónima não permitida. Por favor forneça um ND de utilizador e password.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Erro de operações LDAP. Ligação anónima pode não ser permitida.", "Select attributes" : "Selecionar atributos", "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"], "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"], @@ -34,11 +46,13 @@ OC.L10N.register( "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.", "Other Attributes:" : "Outros Atributos:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"", + "Verify settings" : "Verificar definições", "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servvidor", "Host" : "Anfitrião", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://", "Port" : "Porto", + "Detect Port" : "Detetar porta", "User DN" : "DN do utilizador", "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." : "O DN to cliente ", "Password" : "Password", diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json index 2b0c81a96f4..920ceea7d60 100644 --- a/apps/user_ldap/l10n/pt_PT.json +++ b/apps/user_ldap/l10n/pt_PT.json @@ -9,14 +9,26 @@ "No data specified" : "Nenhuma data especificada", " Could not set configuration %s" : "Não foi possível definir a configuração %s", "Action does not exist" : "Não existe esta acção", + "The Base DN appears to be wrong" : "O ND de base parece estar errado", "Configuration incorrect" : "Configuração incorreta", "Configuration incomplete" : "Configuração incompleta", "Configuration OK" : "Configuração OK", "Select groups" : "Seleccionar grupos", "Select object classes" : "Selecionar classes de objetos", + "Please check the credentials, they seem to be wrong." : "Por favor verifique as credenciais, parecem estar erradas.", + "Please specify the port, it could not be auto-detected." : "Por favor especifique a porta, não pode ser detetada automaticamente.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "O ND de base não pode ser detetado automaticamente, por favor verifique as credenciais, host e porta.", + "Could not detect Base DN, please enter it manually." : "Não foi possível detetar o ND de base, por favor introduza-o manualmente.", "{nthServer}. Server" : "{nthServer}. Servidor", + "More than 1.000 directory entries available." : "Mais de 1,000 entradas de diretório disponíveis.", + " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ocorreu um erro. Por favor verifique o ND de base, bem como as definições de ligação e as credenciais.", "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?", "Confirm Deletion" : "Confirmar a operação de apagar", + "Mappings cleared successfully!" : "Mapas limpos com sucesso!", + "Error while clearing the mappings." : "Erro a limpar os mapas.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "Ligação anónima não permitida. Por favor forneça um ND de utilizador e password.", + "LDAP Operations error. Anonymous bind might not be allowed." : "Erro de operações LDAP. Ligação anónima pode não ser permitida.", "Select attributes" : "Selecionar atributos", "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"], "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"], @@ -32,11 +44,13 @@ "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.", "Other Attributes:" : "Outros Atributos:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"", + "Verify settings" : "Verificar definições", "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servvidor", "Host" : "Anfitrião", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://", "Port" : "Porto", + "Detect Port" : "Detetar porta", "User DN" : "DN do utilizador", "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." : "O DN to cliente ", "Password" : "Password", diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 7f5d943bb8b..85bd430db58 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -70,6 +70,12 @@ class Upgrade extends Command { null, InputOption::VALUE_NONE, 'only runs the database schema migration simulation, do not actually update' + ) + ->addOption( + '--no-app-disable', + null, + InputOption::VALUE_NONE, + 'skips the disable of third party apps' ); } @@ -83,6 +89,7 @@ class Upgrade extends Command { $simulateStepEnabled = true; $updateStepEnabled = true; + $skip3rdPartyAppsDisable = false; if ($input->getOption('skip-migration-test')) { $simulateStepEnabled = false; @@ -90,6 +97,9 @@ class Upgrade extends Command { if ($input->getOption('dry-run')) { $updateStepEnabled = false; } + if ($input->getOption('no-app-disable')) { + $skip3rdPartyAppsDisable = true; + } if (!$simulateStepEnabled && !$updateStepEnabled) { $output->writeln( @@ -106,6 +116,7 @@ class Upgrade extends Command { $updater->setSimulateStepEnabled($simulateStepEnabled); $updater->setUpdateStepEnabled($updateStepEnabled); + $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable); $updater->listen('\OC\Updater', 'maintenanceStart', function () use($output) { $output->writeln('<info>Turned on maintenance mode</info>'); @@ -127,7 +138,7 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) { $output->writeln('<info>Disabled incompatible app: ' . $app . '</info>'); }); - $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use($output) { + $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) { $output->writeln('<info>Disabled 3rd-party app: ' . $app . '</info>'); }); $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) { @@ -145,7 +156,6 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) { $output->writeln("<info>Updated <$app> to $version</info>"); }); - $updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) { $output->writeln("<error>$message</error>"); $self->upgradeFailed = true; diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index 283f97c3be1..1df630bf26d 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Složka s daty", "Configure the database" : "Nastavit databázi", "Only %s is available." : "Pouze %s je dostupný.", + "Install and activate additional PHP modules to choose other database types." : "Pro výběr jiných typů databáze je třeba nainstalovat a povolit dodatečné PHP moduly.", + "For more details check out the documentation." : "Více informací lze nalézt v dokumentaci.", "Database user" : "Uživatel databáze", "Database password" : "Heslo databáze", "Database name" : "Název databáze", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index a2ff9f9dda1..616028fa31a 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -189,6 +189,8 @@ "Data folder" : "Složka s daty", "Configure the database" : "Nastavit databázi", "Only %s is available." : "Pouze %s je dostupný.", + "Install and activate additional PHP modules to choose other database types." : "Pro výběr jiných typů databáze je třeba nainstalovat a povolit dodatečné PHP moduly.", + "For more details check out the documentation." : "Více informací lze nalézt v dokumentaci.", "Database user" : "Uživatel databáze", "Database password" : "Heslo databáze", "Database name" : "Název databáze", diff --git a/core/l10n/de.js b/core/l10n/de.js index 4177a028cd4..2ded2a0a800 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installiere und aktiviere zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schau für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/de.json b/core/l10n/de.json index 9959c62385c..651c5886cac 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -189,6 +189,8 @@ "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installiere und aktiviere zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schau für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index a25a1c3b46c..5f97e1b90fe 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installieren und aktivieren Sie zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schauen Sie für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 26139935feb..0c03c1bc241 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -189,6 +189,8 @@ "Data folder" : "Datenverzeichnis", "Configure the database" : "Datenbank einrichten", "Only %s is available." : "Es ist nur %s verfügbar.", + "Install and activate additional PHP modules to choose other database types." : "Installieren und aktivieren Sie zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.", + "For more details check out the documentation." : "Schauen Sie für weitere Informationen in die Dokumentation.", "Database user" : "Datenbank-Benutzer", "Database password" : "Datenbank-Passwort", "Database name" : "Datenbank-Name", diff --git a/core/l10n/el.js b/core/l10n/el.js index 4c9cf8e018d..fe567209a33 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Φάκελος δεδομένων", "Configure the database" : "Ρύθμιση της βάσης δεδομένων", "Only %s is available." : "Μόνο %s είναι διαθέσιμο.", + "Install and activate additional PHP modules to choose other database types." : "Εγκαταστήστε και ενεργοποιείστε επιπλέον αρθρώματα PHP για να επιλέξετε άλλους τύπους βάσεων δεδομένων.", + "For more details check out the documentation." : "Για περισσότερες πληροφορίες ανατρέξτε στην τεκμηρίωση.", "Database user" : "Χρήστης της βάσης δεδομένων", "Database password" : "Συνθηματικό βάσης δεδομένων", "Database name" : "Όνομα βάσης δεδομένων", diff --git a/core/l10n/el.json b/core/l10n/el.json index 3cf513b2e9a..2c512da3f4a 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -189,6 +189,8 @@ "Data folder" : "Φάκελος δεδομένων", "Configure the database" : "Ρύθμιση της βάσης δεδομένων", "Only %s is available." : "Μόνο %s είναι διαθέσιμο.", + "Install and activate additional PHP modules to choose other database types." : "Εγκαταστήστε και ενεργοποιείστε επιπλέον αρθρώματα PHP για να επιλέξετε άλλους τύπους βάσεων δεδομένων.", + "For more details check out the documentation." : "Για περισσότερες πληροφορίες ανατρέξτε στην τεκμηρίωση.", "Database user" : "Χρήστης της βάσης δεδομένων", "Database password" : "Συνθηματικό βάσης δεδομένων", "Database name" : "Όνομα βάσης δεδομένων", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 910419fc498..4cb9072218d 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -134,6 +134,7 @@ OC.L10N.register( "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}", "Hello {name}" : "Hello {name}", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], + "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", "Please reload the page." : "Please reload the page.", "The update was unsuccessful. " : "The update was unsuccessful. ", @@ -190,6 +191,8 @@ OC.L10N.register( "Data folder" : "Data folder", "Configure the database" : "Configure the database", "Only %s is available." : "Only %s is available.", + "Install and activate additional PHP modules to choose other database types." : "Install and activate additional PHP modules to choose other database types.", + "For more details check out the documentation." : "For more details check out the documentation.", "Database user" : "Database user", "Database password" : "Database password", "Database name" : "Database name", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index 6087dfcf4eb..011f700c87c 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -132,6 +132,7 @@ "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}", "Hello {name}" : "Hello {name}", "_download %n file_::_download %n files_" : ["download %n file","download %n files"], + "{version} is available. Get more information on how to update." : "{version} is available. Get more information on how to update.", "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.", "Please reload the page." : "Please reload the page.", "The update was unsuccessful. " : "The update was unsuccessful. ", @@ -188,6 +189,8 @@ "Data folder" : "Data folder", "Configure the database" : "Configure the database", "Only %s is available." : "Only %s is available.", + "Install and activate additional PHP modules to choose other database types." : "Install and activate additional PHP modules to choose other database types.", + "For more details check out the documentation." : "For more details check out the documentation.", "Database user" : "Database user", "Database password" : "Database password", "Database name" : "Database name", diff --git a/core/l10n/es.js b/core/l10n/es.js index 0f6239bac2f..7d4e8319553 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Directorio de datos", "Configure the database" : "Configurar la base de datos", "Only %s is available." : "Solo %s está disponible.", + "Install and activate additional PHP modules to choose other database types." : "Instalar y activar módulos PHP adicionales para elegir otros formatos de base de datos.", + "For more details check out the documentation." : "Para más detalles revisar la documentación.", "Database user" : "Usuario de la base de datos", "Database password" : "Contraseña de la base de datos", "Database name" : "Nombre de la base de datos", diff --git a/core/l10n/es.json b/core/l10n/es.json index f978e29c713..c6acbfb8f1a 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -189,6 +189,8 @@ "Data folder" : "Directorio de datos", "Configure the database" : "Configurar la base de datos", "Only %s is available." : "Solo %s está disponible.", + "Install and activate additional PHP modules to choose other database types." : "Instalar y activar módulos PHP adicionales para elegir otros formatos de base de datos.", + "For more details check out the documentation." : "Para más detalles revisar la documentación.", "Database user" : "Usuario de la base de datos", "Database password" : "Contraseña de la base de datos", "Database name" : "Nombre de la base de datos", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 47edd9464bf..cffe48dbc43 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Datakansio", "Configure the database" : "Muokkaa tietokantaa", "Only %s is available." : "Vain %s on käytettävissä.", + "Install and activate additional PHP modules to choose other database types." : "Asenna ja aktivoi erillisiä PHP-moduuleja valitaksesi muita tietokantatyyppejä.", + "For more details check out the documentation." : "Lisätietoja on saatavilla dokumentaatiossa.", "Database user" : "Tietokannan käyttäjä", "Database password" : "Tietokannan salasana", "Database name" : "Tietokannan nimi", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index 198bec2f9fb..58788a8421e 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -189,6 +189,8 @@ "Data folder" : "Datakansio", "Configure the database" : "Muokkaa tietokantaa", "Only %s is available." : "Vain %s on käytettävissä.", + "Install and activate additional PHP modules to choose other database types." : "Asenna ja aktivoi erillisiä PHP-moduuleja valitaksesi muita tietokantatyyppejä.", + "For more details check out the documentation." : "Lisätietoja on saatavilla dokumentaatiossa.", "Database user" : "Tietokannan käyttäjä", "Database password" : "Tietokannan salasana", "Database name" : "Tietokannan nimi", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index 79119d32ce2..66fa87c9ad6 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Cartafol de datos", "Configure the database" : "Configurar a base de datos", "Only %s is available." : "Só está dispoñíbel %s.", + "Install and activate additional PHP modules to choose other database types." : "Instale e active os módulos de PHP adicionais para seleccionar outros tipos de bases de datos.", + "For more details check out the documentation." : "Para obter máis detalles revise a documentación.", "Database user" : "Usuario da base de datos", "Database password" : "Contrasinal da base de datos", "Database name" : "Nome da base de datos", diff --git a/core/l10n/gl.json b/core/l10n/gl.json index c1d17291e45..e888d689551 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -189,6 +189,8 @@ "Data folder" : "Cartafol de datos", "Configure the database" : "Configurar a base de datos", "Only %s is available." : "Só está dispoñíbel %s.", + "Install and activate additional PHP modules to choose other database types." : "Instale e active os módulos de PHP adicionais para seleccionar outros tipos de bases de datos.", + "For more details check out the documentation." : "Para obter máis detalles revise a documentación.", "Database user" : "Usuario da base de datos", "Database password" : "Contrasinal da base de datos", "Database name" : "Nome da base de datos", diff --git a/core/l10n/it.js b/core/l10n/it.js index eba7161cbea..bcfc4950788 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Cartella dati", "Configure the database" : "Configura il database", "Only %s is available." : "È disponibile solo %s.", + "Install and activate additional PHP modules to choose other database types." : "Installa e attiva i moduli PHP aggiuntivi per scegliere gli altri tipi di database.", + "For more details check out the documentation." : "Per ulteriori dettagli, leggi la documentazione.", "Database user" : "Utente del database", "Database password" : "Password del database", "Database name" : "Nome del database", diff --git a/core/l10n/it.json b/core/l10n/it.json index 361bf4b0d28..430d893966e 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -189,6 +189,8 @@ "Data folder" : "Cartella dati", "Configure the database" : "Configura il database", "Only %s is available." : "È disponibile solo %s.", + "Install and activate additional PHP modules to choose other database types." : "Installa e attiva i moduli PHP aggiuntivi per scegliere gli altri tipi di database.", + "For more details check out the documentation." : "Per ulteriori dettagli, leggi la documentazione.", "Database user" : "Utente del database", "Database password" : "Password del database", "Database name" : "Nome del database", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 53cd4ce633f..7182ad3a1e9 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -191,6 +191,8 @@ OC.L10N.register( "Data folder" : "Gegevensmap", "Configure the database" : "Configureer de database", "Only %s is available." : "Alleen %s is beschikbaar.", + "Install and activate additional PHP modules to choose other database types." : "Installeer en activeer aanvullende PHP modules om andere soorten databases te kiezen.", + "For more details check out the documentation." : "Voor meer informatie wordt u verwezen naar de documentatie.", "Database user" : "Gebruiker database", "Database password" : "Wachtwoord database", "Database name" : "Naam database", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index ebc4cf4d3a2..ba0d7657c2a 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -189,6 +189,8 @@ "Data folder" : "Gegevensmap", "Configure the database" : "Configureer de database", "Only %s is available." : "Alleen %s is beschikbaar.", + "Install and activate additional PHP modules to choose other database types." : "Installeer en activeer aanvullende PHP modules om andere soorten databases te kiezen.", + "For more details check out the documentation." : "Voor meer informatie wordt u verwezen naar de documentatie.", "Database user" : "Gebruiker database", "Database password" : "Wachtwoord database", "Database name" : "Naam database", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index 00dd9989021..a2b23ab9585 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -190,6 +190,8 @@ OC.L10N.register( "Data folder" : "Pasta de dados", "Configure the database" : "Configurar o banco de dados", "Only %s is available." : "Somente %s está disponível.", + "Install and activate additional PHP modules to choose other database types." : "Instalar e ativar os módulos adicionais do PHP para escolher outros tipos de banco de dados.", + "For more details check out the documentation." : "Para mais informações consulte a documentação.", "Database user" : "Usuário do banco de dados", "Database password" : "Senha do banco de dados", "Database name" : "Nome do banco de dados", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 6991f703840..9ac98948047 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -188,6 +188,8 @@ "Data folder" : "Pasta de dados", "Configure the database" : "Configurar o banco de dados", "Only %s is available." : "Somente %s está disponível.", + "Install and activate additional PHP modules to choose other database types." : "Instalar e ativar os módulos adicionais do PHP para escolher outros tipos de banco de dados.", + "For more details check out the documentation." : "Para mais informações consulte a documentação.", "Database user" : "Usuário do banco de dados", "Database password" : "Senha do banco de dados", "Database name" : "Nome do banco de dados", diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js index ed653ec5566..9d51e3f82b3 100644 --- a/lib/l10n/ast.js +++ b/lib/l10n/ast.js @@ -102,7 +102,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Instala ún d'estos locales nel to sistema y reanicia'l sirvidor web", "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.", "PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse los módulos PHP, ¿pero tán entá llistaos como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor, entruga al to alministrador pa reaniciar el sirvidor web.", diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json index 0f6cfa91c59..788455ab179 100644 --- a/lib/l10n/ast.json +++ b/lib/l10n/ast.json @@ -100,7 +100,6 @@ "Please install one of these locales on your system and restart your webserver." : "Instala ún d'estos locales nel to sistema y reanicia'l sirvidor web", "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.", "PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse los módulos PHP, ¿pero tán entá llistaos como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor, entruga al to alministrador pa reaniciar el sirvidor web.", diff --git a/lib/l10n/az.js b/lib/l10n/az.js index b69c06a6a8a..fa7a457a1c2 100644 --- a/lib/l10n/az.js +++ b/lib/l10n/az.js @@ -39,7 +39,6 @@ OC.L10N.register( "Share type %s is not valid for %s" : "Yayımlanma tipi %s etibarlı deyil %s üçün", "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir", "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP göründüyü kimi, daxili doc bloklarının ayrılması işini görəcək. Bu bəzi özək proqramlarını əlçatılmaz edə bilər.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu ola bilər ki, cache/accelerator such tərəfindən cağırılıb hansi ki, Zend OPcache və eAccelerator-da olduğu kimidir." }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/az.json b/lib/l10n/az.json index 66c3e77e931..0b10e9b3794 100644 --- a/lib/l10n/az.json +++ b/lib/l10n/az.json @@ -37,7 +37,6 @@ "Share type %s is not valid for %s" : "Yayımlanma tipi %s etibarlı deyil %s üçün", "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir", "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP göründüyü kimi, daxili doc bloklarının ayrılması işini görəcək. Bu bəzi özək proqramlarını əlçatılmaz edə bilər.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu ola bilər ki, cache/accelerator such tərəfindən cağırılıb hansi ki, Zend OPcache və eAccelerator-da olduğu kimidir." },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg_BG.js index 1320491be01..986884d7310 100644 --- a/lib/l10n/bg_BG.js +++ b/lib/l10n/bg_BG.js @@ -113,7 +113,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Моля, инсталирай едно от следните език-държава на сървъра и рестартирай уеб сървъра.", "Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.", "PHP module %s not installed." : "PHP модулът %s не е инсталиран.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP модулите са инсталирани, но все още се обявяват като липсващи?", "Please ask your server administrator to restart the web server." : "Моля, поискай от своя администратор да рестартира уеб сървъра.", diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json index 60f21770939..6db0d8894e8 100644 --- a/lib/l10n/bg_BG.json +++ b/lib/l10n/bg_BG.json @@ -111,7 +111,6 @@ "Please install one of these locales on your system and restart your webserver." : "Моля, инсталирай едно от следните език-държава на сървъра и рестартирай уеб сървъра.", "Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.", "PHP module %s not installed." : "PHP модулът %s не е инсталиран.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP е настроен да премахва inline doc блокове. Това може да превърне няколко основни приложения недостъпни.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Това може да се дължи на cache/accelerator като Zend OPache или eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP модулите са инсталирани, но все още се обявяват като липсващи?", "Please ask your server administrator to restart the web server." : "Моля, поискай от своя администратор да рестартира уеб сървъра.", diff --git a/lib/l10n/bs.js b/lib/l10n/bs.js index 83ddd6624d7..004d5cd2aac 100644 --- a/lib/l10n/bs.js +++ b/lib/l10n/bs.js @@ -13,7 +13,6 @@ OC.L10N.register( "For the best results, please consider using a GNU/Linux server instead." : "Umjesto toga, za najbolje rezultate, molimo razmislite o mogućnosti korištenje GNU/Linux servera.", "A valid username must be provided" : "Nužno je navesti valjano korisničko ime", "A valid password must be provided" : "Nužno je navesti valjanu lozinku", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen da se skine inline doc blokova. To će nekoliko osnovnih aplikacija učiniti nedostupnim.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator." }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/lib/l10n/bs.json b/lib/l10n/bs.json index c6abd080fd9..f4da9911f97 100644 --- a/lib/l10n/bs.json +++ b/lib/l10n/bs.json @@ -11,7 +11,6 @@ "For the best results, please consider using a GNU/Linux server instead." : "Umjesto toga, za najbolje rezultate, molimo razmislite o mogućnosti korištenje GNU/Linux servera.", "A valid username must be provided" : "Nužno je navesti valjano korisničko ime", "A valid password must be provided" : "Nužno je navesti valjanu lozinku", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen da se skine inline doc blokova. To će nekoliko osnovnih aplikacija učiniti nedostupnim.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator." },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js index 136751f1f7b..d7c908fee30 100644 --- a/lib/l10n/ca.js +++ b/lib/l10n/ca.js @@ -101,7 +101,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Siusplau, instal·li un d'aquests arxius de localització en el seu sistema, i reinicii el seu servidor web.", "Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.", "PHP module %s not installed." : "El mòdul PHP %s no està instal·lat.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?", "Please ask your server administrator to restart the web server." : "Demaneu a l'administrador que reinici el servidor web.", diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json index 822bf14e36c..0622ea4e2eb 100644 --- a/lib/l10n/ca.json +++ b/lib/l10n/ca.json @@ -99,7 +99,6 @@ "Please install one of these locales on your system and restart your webserver." : "Siusplau, instal·li un d'aquests arxius de localització en el seu sistema, i reinicii el seu servidor web.", "Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.", "PHP module %s not installed." : "El mòdul PHP %s no està instal·lat.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?", "Please ask your server administrator to restart the web server." : "Demaneu a l'administrador que reinici el servidor web.", diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js index d19306a6d3f..01817f5cde5 100644 --- a/lib/l10n/cs_CZ.js +++ b/lib/l10n/cs_CZ.js @@ -44,6 +44,7 @@ OC.L10N.register( "File name is a reserved word" : "Jméno souboru je rezervované slovo", "File name contains at least one invalid character" : "Jméno souboru obsahuje nejméně jeden neplatný znak", "File name is too long" : "Jméno souboru je moc dlouhé", + "Can't read file" : "Nelze přečíst soubor", "App directory already exists" : "Adresář aplikace již existuje", "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s", "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace", @@ -131,9 +132,9 @@ OC.L10N.register( "PHP module %s not installed." : "PHP modul %s není nainstalován.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP hodnota \"%s\" není nastavena na \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Úprava tohoto nastavení v php.ini opět rozběhne ownCloud", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload je nastaveno na \"%s\" místo očekávané hodnoty \"0\"", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload je nastaven na \"%s\" místo očekávané hodnoty \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Pro nápravu nastavte <code>mbstring.func_overload</code> na <code>0</code> v souboru php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek znepřístupnění mnoha důležitých aplikací.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?", "Please ask your server administrator to restart the web server." : "Požádejte svého správce systému o restart webového serveru.", diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json index 3b4e01fefd1..ab5e4662633 100644 --- a/lib/l10n/cs_CZ.json +++ b/lib/l10n/cs_CZ.json @@ -42,6 +42,7 @@ "File name is a reserved word" : "Jméno souboru je rezervované slovo", "File name contains at least one invalid character" : "Jméno souboru obsahuje nejméně jeden neplatný znak", "File name is too long" : "Jméno souboru je moc dlouhé", + "Can't read file" : "Nelze přečíst soubor", "App directory already exists" : "Adresář aplikace již existuje", "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s", "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace", @@ -129,9 +130,9 @@ "PHP module %s not installed." : "PHP modul %s není nainstalován.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP hodnota \"%s\" není nastavena na \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Úprava tohoto nastavení v php.ini opět rozběhne ownCloud", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload je nastaveno na \"%s\" místo očekávané hodnoty \"0\"", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload je nastaven na \"%s\" místo očekávané hodnoty \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Pro nápravu nastavte <code>mbstring.func_overload</code> na <code>0</code> v souboru php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek znepřístupnění mnoha důležitých aplikací.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?", "Please ask your server administrator to restart the web server." : "Požádejte svého správce systému o restart webového serveru.", diff --git a/lib/l10n/da.js b/lib/l10n/da.js index 0647d110366..4916287c2dc 100644 --- a/lib/l10n/da.js +++ b/lib/l10n/da.js @@ -131,7 +131,6 @@ OC.L10N.register( "PHP module %s not installed." : "PHP-modulet %s er ikke installeret.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-indstillingen \"%s\" er ikke angivet til \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Justeres denne indstilling i php.ini, så vil ownCloud kunne køre igen", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator", "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremstår stadig som fraværende?", "Please ask your server administrator to restart the web server." : "Du bedes anmode din serveradministrator om at genstarte webserveren.", diff --git a/lib/l10n/da.json b/lib/l10n/da.json index 0fd2986f905..92667d548c0 100644 --- a/lib/l10n/da.json +++ b/lib/l10n/da.json @@ -129,7 +129,6 @@ "PHP module %s not installed." : "PHP-modulet %s er ikke installeret.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-indstillingen \"%s\" er ikke angivet til \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Justeres denne indstilling i php.ini, så vil ownCloud kunne køre igen", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator", "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremstår stadig som fraværende?", "Please ask your server administrator to restart the web server." : "Du bedes anmode din serveradministrator om at genstarte webserveren.", diff --git a/lib/l10n/de.js b/lib/l10n/de.js index d9a5024318f..39ee0169d7c 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -132,9 +132,9 @@ OC.L10N.register( "PHP module %s not installed." : "PHP-Modul %s nicht installiert.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-Einstellung „%s“ ist nicht auf „%s“ gesetzt.", "Adjusting this setting in php.ini will make ownCloud run again" : "Durch das Anpassen dieser Einstellung in der php.ini wird ownCloud wieder laufen", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Setze in Deiner php.ini <code>mbstring.func_overload</code> auf <code>-0</code>, um dieses Problem zu beheben.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?", "Please ask your server administrator to restart the web server." : "Bitte kontaktiere Deinen Server-Administrator und bitte um den Neustart des Webservers.", diff --git a/lib/l10n/de.json b/lib/l10n/de.json index 6228b9e27e7..513c75fc94a 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -130,9 +130,9 @@ "PHP module %s not installed." : "PHP-Modul %s nicht installiert.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-Einstellung „%s“ ist nicht auf „%s“ gesetzt.", "Adjusting this setting in php.ini will make ownCloud run again" : "Durch das Anpassen dieser Einstellung in der php.ini wird ownCloud wieder laufen", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Setze in Deiner php.ini <code>mbstring.func_overload</code> auf <code>-0</code>, um dieses Problem zu beheben.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?", "Please ask your server administrator to restart the web server." : "Bitte kontaktiere Deinen Server-Administrator und bitte um den Neustart des Webservers.", diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index fdad346751a..bbc3919647f 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -132,9 +132,9 @@ OC.L10N.register( "PHP module %s not installed." : "PHP-Modul %s nicht installiert.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-Einstellung „%s“ ist nicht auf „%s“ gesetzt.", "Adjusting this setting in php.ini will make ownCloud run again" : "Durch das Anpassen dieser Einstellung in der php.ini wird ownCloud wieder laufen", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Setzen Sie in Ihrer php.ini <code>mbstring.func_overload</code> auf <code>-0</code>, um dieses Problem zu beheben.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?", "Please ask your server administrator to restart the web server." : "Bitte kontaktieren Sie Ihren Server-Administrator und bitten Sie um den Neustart des Webservers.", diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index 6b0ebc39cae..e1433fb5339 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -130,9 +130,9 @@ "PHP module %s not installed." : "PHP-Modul %s nicht installiert.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-Einstellung „%s“ ist nicht auf „%s“ gesetzt.", "Adjusting this setting in php.ini will make ownCloud run again" : "Durch das Anpassen dieser Einstellung in der php.ini wird ownCloud wieder laufen", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload ist nicht auf den erwarteten Wert „0“, sondern stattdessen auf „%s“ gesetzt", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Setzen Sie in Ihrer php.ini <code>mbstring.func_overload</code> auf <code>-0</code>, um dieses Problem zu beheben.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?", "Please ask your server administrator to restart the web server." : "Bitte kontaktieren Sie Ihren Server-Administrator und bitten Sie um den Neustart des Webservers.", diff --git a/lib/l10n/el.js b/lib/l10n/el.js index 9b15850dbdb..a1e1cd4af08 100644 --- a/lib/l10n/el.js +++ b/lib/l10n/el.js @@ -41,6 +41,7 @@ OC.L10N.register( "File name is a reserved word" : "Το όνομα αρχείου είναι λέξη που έχει δεσμευτεί", "File name contains at least one invalid character" : "Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα", "File name is too long" : "Το όνομα αρχείου είνια πολύ μεγάλο", + "Can't read file" : "Αδυναμία ανάγνωσης αρχείου", "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη", "Can't create app folder. Please fix permissions. %s" : "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s", "No source specified when installing app" : "Δεν προσδιορίστηκε πηγή κατά την εγκατάσταση της εφαρμογής", @@ -128,9 +129,7 @@ OC.L10N.register( "PHP module %s not installed." : "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ", "PHP setting \"%s\" is not set to \"%s\"." : "Η ρύθμιση \"%s\"της PHP δεν είναι ορισμένη σε \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Η διόρθωση της ρύθμισης στο αρχείο php.ini θα επιτρέψει στο ownCloud να επαναλειτουργήσει", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "Το mbstring.func_overload έχει ορισθεί σε \"%s\" αντί για την αναμενόμενη τιμή \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Για να διορθώσετε αυτό το πρόβλημα ορίστε το <code>mbstring.func_overload</code> σε <code>0</code> στο αρχείο php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Κάποιες μονάδες PHP έχουν εγκατασταθεί, αλλά είναι ακόμα καταγεγραμμένες ως απούσες;", "Please ask your server administrator to restart the web server." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να επανεκκινήσει το διακομιστή δικτύου σας.", diff --git a/lib/l10n/el.json b/lib/l10n/el.json index 45a39a98096..e60cd9fea65 100644 --- a/lib/l10n/el.json +++ b/lib/l10n/el.json @@ -39,6 +39,7 @@ "File name is a reserved word" : "Το όνομα αρχείου είναι λέξη που έχει δεσμευτεί", "File name contains at least one invalid character" : "Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα", "File name is too long" : "Το όνομα αρχείου είνια πολύ μεγάλο", + "Can't read file" : "Αδυναμία ανάγνωσης αρχείου", "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη", "Can't create app folder. Please fix permissions. %s" : "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s", "No source specified when installing app" : "Δεν προσδιορίστηκε πηγή κατά την εγκατάσταση της εφαρμογής", @@ -126,9 +127,7 @@ "PHP module %s not installed." : "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ", "PHP setting \"%s\" is not set to \"%s\"." : "Η ρύθμιση \"%s\"της PHP δεν είναι ορισμένη σε \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Η διόρθωση της ρύθμισης στο αρχείο php.ini θα επιτρέψει στο ownCloud να επαναλειτουργήσει", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "Το mbstring.func_overload έχει ορισθεί σε \"%s\" αντί για την αναμενόμενη τιμή \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Για να διορθώσετε αυτό το πρόβλημα ορίστε το <code>mbstring.func_overload</code> σε <code>0</code> στο αρχείο php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Κάποιες μονάδες PHP έχουν εγκατασταθεί, αλλά είναι ακόμα καταγεγραμμένες ως απούσες;", "Please ask your server administrator to restart the web server." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να επανεκκινήσει το διακομιστή δικτύου σας.", diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js index eaa94cb2d1b..2e57ab56533 100644 --- a/lib/l10n/en_GB.js +++ b/lib/l10n/en_GB.js @@ -44,6 +44,7 @@ OC.L10N.register( "File name is a reserved word" : "File name is a reserved word", "File name contains at least one invalid character" : "File name contains at least one invalid character", "File name is too long" : "File name is too long", + "Can't read file" : "Can't read file", "App directory already exists" : "App directory already exists", "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s", "No source specified when installing app" : "No source specified when installing app", @@ -131,7 +132,7 @@ OC.L10N.register( "PHP module %s not installed." : "PHP module %s not installed.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP setting \"%s\" is not set to \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Adjusting this setting in php.ini will make ownCloud run again", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", + "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?", "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.", diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json index 8c7f2b820eb..58d2eac6e6c 100644 --- a/lib/l10n/en_GB.json +++ b/lib/l10n/en_GB.json @@ -42,6 +42,7 @@ "File name is a reserved word" : "File name is a reserved word", "File name contains at least one invalid character" : "File name contains at least one invalid character", "File name is too long" : "File name is too long", + "Can't read file" : "Can't read file", "App directory already exists" : "App directory already exists", "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s", "No source specified when installing app" : "No source specified when installing app", @@ -129,7 +130,7 @@ "PHP module %s not installed." : "PHP module %s not installed.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP setting \"%s\" is not set to \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Adjusting this setting in php.ini will make ownCloud run again", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", + "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?", "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.", diff --git a/lib/l10n/es.js b/lib/l10n/es.js index 1e36bf5f818..8eb15106ed1 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -132,9 +132,9 @@ OC.L10N.register( "PHP module %s not installed." : "El módulo PHP %s no está instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "La opción PHP \"%s\" no es \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustando esta opción en php.ini permitirá que ownCloud vuelva a funcionar", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload está definida como \"%s\" en lugar del valor esperado de \"0\"", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload está dispuesta en \"%s\" en lugar del valor esperado \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Para solucionarlo, defina la función <code>mbstring.func_overload</code> a <code>0</code> en su php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales estén inaccesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Los módulos PHP se han instalado, pero aparecen listados como si faltaran", "Please ask your server administrator to restart the web server." : "Consulte al administrador de su servidor para reiniciar el servidor web.", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index f50b0034c8a..81983ec11f4 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -130,9 +130,9 @@ "PHP module %s not installed." : "El módulo PHP %s no está instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "La opción PHP \"%s\" no es \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustando esta opción en php.ini permitirá que ownCloud vuelva a funcionar", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload está definida como \"%s\" en lugar del valor esperado de \"0\"", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload está dispuesta en \"%s\" en lugar del valor esperado \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Para solucionarlo, defina la función <code>mbstring.func_overload</code> a <code>0</code> en su php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales estén inaccesibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Los módulos PHP se han instalado, pero aparecen listados como si faltaran", "Please ask your server administrator to restart the web server." : "Consulte al administrador de su servidor para reiniciar el servidor web.", diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js index d672d9f96af..284c9556322 100644 --- a/lib/l10n/et_EE.js +++ b/lib/l10n/et_EE.js @@ -99,7 +99,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.", "Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.", "PHP module %s not installed." : "PHP moodulit %s pole paigaldatud.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moodulid on paigaldatud, kuid neid näitatakse endiselt kui puuduolevad?", "Please ask your server administrator to restart the web server." : "Palu oma serveri haldajal veebiserver taaskäivitada.", diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json index 2bb262b8e5e..b19225c16e2 100644 --- a/lib/l10n/et_EE.json +++ b/lib/l10n/et_EE.json @@ -97,7 +97,6 @@ "Please install one of these locales on your system and restart your webserver." : "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.", "Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.", "PHP module %s not installed." : "PHP moodulit %s pole paigaldatud.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moodulid on paigaldatud, kuid neid näitatakse endiselt kui puuduolevad?", "Please ask your server administrator to restart the web server." : "Palu oma serveri haldajal veebiserver taaskäivitada.", diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js index 60ee82cdb61..ce77065574f 100644 --- a/lib/l10n/eu.js +++ b/lib/l10n/eu.js @@ -116,7 +116,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.", "Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.", "PHP module %s not installed." : "PHPren %s modulua ez dago instalaturik.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduluak instalatu dira, baina oraindik faltan bezala markatuta daude?", "Please ask your server administrator to restart the web server." : "Mesedez eskatu zerbitzariaren kudeatzaileari web zerbitzaria berrabiarazteko.", diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json index 80a932eb70a..6fa2fc55a16 100644 --- a/lib/l10n/eu.json +++ b/lib/l10n/eu.json @@ -114,7 +114,6 @@ "Please install one of these locales on your system and restart your webserver." : "Instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.", "Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.", "PHP module %s not installed." : "PHPren %s modulua ez dago instalaturik.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduluak instalatu dira, baina oraindik faltan bezala markatuta daude?", "Please ask your server administrator to restart the web server." : "Mesedez eskatu zerbitzariaren kudeatzaileari web zerbitzaria berrabiarazteko.", diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js index 74934d3fad9..28d4556cc12 100644 --- a/lib/l10n/fi_FI.js +++ b/lib/l10n/fi_FI.js @@ -39,6 +39,7 @@ OC.L10N.register( "web services under your control" : "verkkopalvelut hallinnassasi", "Empty filename is not allowed" : "Tiedostonimi ei voi olla tyhjä", "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", + "4-byte characters are not supported in file names" : "4 tavun merkit eivät ole tuettuja tiedostojen nimissä", "File name contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin", "File name is too long" : "Tiedoston nimi on liian pitkä", "Can't read file" : "Tiedostoa ei voi lukea", @@ -114,7 +115,7 @@ OC.L10N.register( "PHP module %s not installed." : "PHP-moduulia %s ei ole asennettu.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-asetusta \"%s\" ei ole asetettu arvoon \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Tämän asetuksen muuttaminen php.ini-tiedostossa saattaa ownCloudin jälleen toimintakykyiseksi", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload on asetettu arvoon \"%s\" odotetun arvon \"0\" sijaan", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload on asetettu arvoon \"%s\" odotetun arvon \"0\" sijaan", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Korjaa tämä ongelma asettamalla <code>mbstring.func_overload</code> arvoon <code>0</code> php.ini-tiedostossasi", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?", "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.", diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json index 93bc893e673..d6842c69102 100644 --- a/lib/l10n/fi_FI.json +++ b/lib/l10n/fi_FI.json @@ -37,6 +37,7 @@ "web services under your control" : "verkkopalvelut hallinnassasi", "Empty filename is not allowed" : "Tiedostonimi ei voi olla tyhjä", "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", + "4-byte characters are not supported in file names" : "4 tavun merkit eivät ole tuettuja tiedostojen nimissä", "File name contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin", "File name is too long" : "Tiedoston nimi on liian pitkä", "Can't read file" : "Tiedostoa ei voi lukea", @@ -112,7 +113,7 @@ "PHP module %s not installed." : "PHP-moduulia %s ei ole asennettu.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-asetusta \"%s\" ei ole asetettu arvoon \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Tämän asetuksen muuttaminen php.ini-tiedostossa saattaa ownCloudin jälleen toimintakykyiseksi", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload on asetettu arvoon \"%s\" odotetun arvon \"0\" sijaan", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload on asetettu arvoon \"%s\" odotetun arvon \"0\" sijaan", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Korjaa tämä ongelma asettamalla <code>mbstring.func_overload</code> arvoon <code>0</code> php.ini-tiedostossasi", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?", "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.", diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index 45f6db84447..0dc89813635 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -130,9 +130,7 @@ OC.L10N.register( "PHP module %s not installed." : "Le module PHP %s n’est pas installé.", "PHP setting \"%s\" is not set to \"%s\"." : "Le paramètre PHP \"%s\" n'est pas \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajuster ce paramètre dans php.ini permettra à ownCloud de fonctionner à nouveau", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload est mis à \"%s\" au lieu de la valeur \"0\" attendue", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Pour corriger ce problème mettez <code>mbstring.func_overload</code> à <code>0</code> dans votre php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes du code. Cela rendra plusieurs applications de base inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?", "Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index 6e706dae417..b1757a0ca23 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -128,9 +128,7 @@ "PHP module %s not installed." : "Le module PHP %s n’est pas installé.", "PHP setting \"%s\" is not set to \"%s\"." : "Le paramètre PHP \"%s\" n'est pas \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajuster ce paramètre dans php.ini permettra à ownCloud de fonctionner à nouveau", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload est mis à \"%s\" au lieu de la valeur \"0\" attendue", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Pour corriger ce problème mettez <code>mbstring.func_overload</code> à <code>0</code> dans votre php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes du code. Cela rendra plusieurs applications de base inaccessibles.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?", "Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.", diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js index 5433c2e65f4..cbb6914ddef 100644 --- a/lib/l10n/gl.js +++ b/lib/l10n/gl.js @@ -132,9 +132,9 @@ OC.L10N.register( "PHP module %s not installed." : "O módulo PHP %s non está instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "O axuste de PHP «%s» non está estabelecido a «%s».", "Adjusting this setting in php.ini will make ownCloud run again" : "Facer este axuste en php.ini fará que ownCloud volva executarse", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload está estabelecido a «%s» no canto do valor «0» agardado", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload está estabelecido a «%s» no canto do valor «0» agardado", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Para arranxar este problema, estabeleza <code>mbstring.func_overload</code> a <code>0</code> no ficheiro php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Semella que PHP foi configurado para quitar bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?", "Please ask your server administrator to restart the web server." : "Pregúntelle ao administrador do servidor polo reinicio do servidor web..", diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json index b2649d5e3fb..393eca2d9a1 100644 --- a/lib/l10n/gl.json +++ b/lib/l10n/gl.json @@ -130,9 +130,9 @@ "PHP module %s not installed." : "O módulo PHP %s non está instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "O axuste de PHP «%s» non está estabelecido a «%s».", "Adjusting this setting in php.ini will make ownCloud run again" : "Facer este axuste en php.ini fará que ownCloud volva executarse", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload está estabelecido a «%s» no canto do valor «0» agardado", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload está estabelecido a «%s» no canto do valor «0» agardado", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Para arranxar este problema, estabeleza <code>mbstring.func_overload</code> a <code>0</code> no ficheiro php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Semella que PHP foi configurado para quitar bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?", "Please ask your server administrator to restart the web server." : "Pregúntelle ao administrador do servidor polo reinicio do servidor web..", diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js index 6d204ff6647..a885d452d9c 100644 --- a/lib/l10n/hr.js +++ b/lib/l10n/hr.js @@ -109,7 +109,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Molimo instalirajte jednu od ovih regionalnih shema u svoj sustav i ponovno pokrenite svoj web poslužitelj.", "Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.", "PHP module %s not installed." : "PHP modul %s nije instaliran.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?", "Please ask your server administrator to restart the web server." : "Molimo zamolite svog administratora poslužitelja da ponovno pokrene web poslužitelj.", diff --git a/lib/l10n/hr.json b/lib/l10n/hr.json index 3f42d0beb60..40ef41d0a38 100644 --- a/lib/l10n/hr.json +++ b/lib/l10n/hr.json @@ -107,7 +107,6 @@ "Please install one of these locales on your system and restart your webserver." : "Molimo instalirajte jednu od ovih regionalnih shema u svoj sustav i ponovno pokrenite svoj web poslužitelj.", "Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.", "PHP module %s not installed." : "PHP modul %s nije instaliran.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?", "Please ask your server administrator to restart the web server." : "Molimo zamolite svog administratora poslužitelja da ponovno pokrene web poslužitelj.", diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js index df10bbc59e2..d8c67ec5cdf 100644 --- a/lib/l10n/hu_HU.js +++ b/lib/l10n/hu_HU.js @@ -102,7 +102,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Kérjük állítsa be a következő lokalizációk valamelyikét a rendszeren és indítsa újra a webszervert!", "Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!", "PHP module %s not installed." : "A %s PHP modul nincs telepítve.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.", "PHP modules have been installed, but they are still listed as missing?" : "A PHP modulok telepítve vannak, de a listában mégsincsenek felsorolva?", "Please ask your server administrator to restart the web server." : "Kérje meg a rendszergazdát, hogy indítsa újra a webszervert!", diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json index d4da38b9269..8f281ecb3fe 100644 --- a/lib/l10n/hu_HU.json +++ b/lib/l10n/hu_HU.json @@ -100,7 +100,6 @@ "Please install one of these locales on your system and restart your webserver." : "Kérjük állítsa be a következő lokalizációk valamelyikét a rendszeren és indítsa újra a webszervert!", "Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!", "PHP module %s not installed." : "A %s PHP modul nincs telepítve.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.", "PHP modules have been installed, but they are still listed as missing?" : "A PHP modulok telepítve vannak, de a listában mégsincsenek felsorolva?", "Please ask your server administrator to restart the web server." : "Kérje meg a rendszergazdát, hogy indítsa újra a webszervert!", diff --git a/lib/l10n/id.js b/lib/l10n/id.js index e2bb862aefa..40da45a638f 100644 --- a/lib/l10n/id.js +++ b/lib/l10n/id.js @@ -130,7 +130,6 @@ OC.L10N.register( "PHP module %s not installed." : "Module PHP %s tidak terinstal.", "PHP setting \"%s\" is not set to \"%s\"." : "Pengaturan PHP \"%s\" tidak diatur ke \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Menyesuaikan pengaturan ini dalam php.ini akan menyebabkan ownCloud berjalan kembali", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?", "Please ask your server administrator to restart the web server." : "Mohon minta administrator Anda untuk menjalankan ulang server web.", diff --git a/lib/l10n/id.json b/lib/l10n/id.json index c74d5ab2121..90ab46561d2 100644 --- a/lib/l10n/id.json +++ b/lib/l10n/id.json @@ -128,7 +128,6 @@ "PHP module %s not installed." : "Module PHP %s tidak terinstal.", "PHP setting \"%s\" is not set to \"%s\"." : "Pengaturan PHP \"%s\" tidak diatur ke \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Menyesuaikan pengaturan ini dalam php.ini akan menyebabkan ownCloud berjalan kembali", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?", "Please ask your server administrator to restart the web server." : "Mohon minta administrator Anda untuk menjalankan ulang server web.", diff --git a/lib/l10n/it.js b/lib/l10n/it.js index 9b93478772b..e16004cb95b 100644 --- a/lib/l10n/it.js +++ b/lib/l10n/it.js @@ -132,9 +132,9 @@ OC.L10N.register( "PHP module %s not installed." : "Il modulo PHP %s non è installato.", "PHP setting \"%s\" is not set to \"%s\"." : "L'impostazione \"%s\" di PHP non è configurata a \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "La modifica di questa impostazione nel file php.ini permetterà nuovamente l'esecuzione di ownCloud", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload è impostata a \"%s\" invece del valore atteso \"0\"", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload è impostata a \"%s\" invece del valore atteso \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Per correggere questo problema, imposta <code>mbstring.func_overload</code> a <code>0</code> nel tuo php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Sono stati installati moduli PHP, ma sono elencati ancora come mancanti?", "Please ask your server administrator to restart the web server." : "Chiedi all'amministratore di riavviare il server web.", diff --git a/lib/l10n/it.json b/lib/l10n/it.json index 121a0b9cd66..57f833529ef 100644 --- a/lib/l10n/it.json +++ b/lib/l10n/it.json @@ -130,9 +130,9 @@ "PHP module %s not installed." : "Il modulo PHP %s non è installato.", "PHP setting \"%s\" is not set to \"%s\"." : "L'impostazione \"%s\" di PHP non è configurata a \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "La modifica di questa impostazione nel file php.ini permetterà nuovamente l'esecuzione di ownCloud", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload è impostata a \"%s\" invece del valore atteso \"0\"", + "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload è impostata a \"%s\" invece del valore atteso \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Per correggere questo problema, imposta <code>mbstring.func_overload</code> a <code>0</code> nel tuo php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", + "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Sono stati installati moduli PHP, ma sono elencati ancora come mancanti?", "Please ask your server administrator to restart the web server." : "Chiedi all'amministratore di riavviare il server web.", diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js index 096d23d8b23..56ac5c84220 100644 --- a/lib/l10n/ja.js +++ b/lib/l10n/ja.js @@ -131,7 +131,6 @@ OC.L10N.register( "PHP module %s not installed." : "PHP のモジュール %s がインストールされていません。", "PHP setting \"%s\" is not set to \"%s\"." : "PHP設定の\"%s\"は \"%s\"に設定されていません", "Adjusting this setting in php.ini will make ownCloud run again" : "php.ini 中の設定を調整するとownCloudはもう一度動作するでしょう。 ", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレーターが原因かもしれません。", "PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？", "Please ask your server administrator to restart the web server." : "サーバー管理者にWebサーバーを再起動するよう依頼してください。", diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json index 239b1f88b8d..b9a4869e9b2 100644 --- a/lib/l10n/ja.json +++ b/lib/l10n/ja.json @@ -129,7 +129,6 @@ "PHP module %s not installed." : "PHP のモジュール %s がインストールされていません。", "PHP setting \"%s\" is not set to \"%s\"." : "PHP設定の\"%s\"は \"%s\"に設定されていません", "Adjusting this setting in php.ini will make ownCloud run again" : "php.ini 中の設定を調整するとownCloudはもう一度動作するでしょう。 ", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレーターが原因かもしれません。", "PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？", "Please ask your server administrator to restart the web server." : "サーバー管理者にWebサーバーを再起動するよう依頼してください。", diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js index 5773154ff70..a8b9f3def7b 100644 --- a/lib/l10n/ko.js +++ b/lib/l10n/ko.js @@ -131,9 +131,7 @@ OC.L10N.register( "PHP module %s not installed." : "PHP 모듈 %s이(가) 설치되지 않았습니다.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP 설정 \"%s\"이(가) \"%s\"(으)로 설정되어 있지 않습니다.", "Adjusting this setting in php.ini will make ownCloud run again" : "php.ini에서 이 설정을 변경하면 ownCloud가 다시 실행됩니다", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload 값이 \"%s\"(으)로 설정되어 있으나 필요한 값은 \"0\"입니다", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "이 문제를 해결하려면 php.ini에서 <code>mbstring.func_overload</code> 값을 <code>0</code>으로 설정하십시오", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.", "PHP modules have been installed, but they are still listed as missing?" : "PHP 모듈이 설치되었지만 여전히 없는 것으로 나타납니까?", "Please ask your server administrator to restart the web server." : "서버 관리자에게 웹 서버 재시작을 요청하십시오.", diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json index 1e7f247ca76..9a86f7f71cc 100644 --- a/lib/l10n/ko.json +++ b/lib/l10n/ko.json @@ -129,9 +129,7 @@ "PHP module %s not installed." : "PHP 모듈 %s이(가) 설치되지 않았습니다.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP 설정 \"%s\"이(가) \"%s\"(으)로 설정되어 있지 않습니다.", "Adjusting this setting in php.ini will make ownCloud run again" : "php.ini에서 이 설정을 변경하면 ownCloud가 다시 실행됩니다", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload 값이 \"%s\"(으)로 설정되어 있으나 필요한 값은 \"0\"입니다", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "이 문제를 해결하려면 php.ini에서 <code>mbstring.func_overload</code> 값을 <code>0</code>으로 설정하십시오", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.", "PHP modules have been installed, but they are still listed as missing?" : "PHP 모듈이 설치되었지만 여전히 없는 것으로 나타납니까?", "Please ask your server administrator to restart the web server." : "서버 관리자에게 웹 서버 재시작을 요청하십시오.", diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js index 67e073cf45e..a23a53ee3ae 100644 --- a/lib/l10n/nb_NO.js +++ b/lib/l10n/nb_NO.js @@ -128,7 +128,6 @@ OC.L10N.register( "PHP module %s not installed." : "PHP-modul %s er ikke installert.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-innstilling \"%s\" er ikke satt til \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Endring av denne innstillingen i php.ini vil få ownCloud til å kjøre igjen.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har blitt installert, men de listes fortsatt som fraværende?", "Please ask your server administrator to restart the web server." : "Be server-administratoren om å starte web-serveren på nytt.", diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json index 63f6d2c6699..4cdc3191b13 100644 --- a/lib/l10n/nb_NO.json +++ b/lib/l10n/nb_NO.json @@ -126,7 +126,6 @@ "PHP module %s not installed." : "PHP-modul %s er ikke installert.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP-innstilling \"%s\" er ikke satt til \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Endring av denne innstillingen i php.ini vil få ownCloud til å kjøre igjen.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har blitt installert, men de listes fortsatt som fraværende?", "Please ask your server administrator to restart the web server." : "Be server-administratoren om å starte web-serveren på nytt.", diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 72e1918244c..dc78f0623f3 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -132,9 +132,7 @@ OC.L10N.register( "PHP module %s not installed." : "PHP module %s niet geïnstalleerd.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP instelling \"%s\" staat niet op \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Het in php.ini bijstellen hiervan laat ownCloud weer werken", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload is ingesteld op \"%s\" in plaats van op de verwachte waarde \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Om dit op te lossen stel <code>mbstring.func_overload</code> in op <code>0</code> in uw php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modules zijn geïnstalleerd, maar worden ze nog steeds als ontbrekend aangegeven?", "Please ask your server administrator to restart the web server." : "Vraag uw beheerder de webserver opnieuw op te starten.", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index fc9f30bc0e4..4fd77148853 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -130,9 +130,7 @@ "PHP module %s not installed." : "PHP module %s niet geïnstalleerd.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP instelling \"%s\" staat niet op \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Het in php.ini bijstellen hiervan laat ownCloud weer werken", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload is ingesteld op \"%s\" in plaats van op de verwachte waarde \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Om dit op te lossen stel <code>mbstring.func_overload</code> in op <code>0</code> in uw php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modules zijn geïnstalleerd, maar worden ze nog steeds als ontbrekend aangegeven?", "Please ask your server administrator to restart the web server." : "Vraag uw beheerder de webserver opnieuw op te starten.", diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js index 3061b182bf8..4f460f08f0d 100644 --- a/lib/l10n/pl.js +++ b/lib/l10n/pl.js @@ -113,7 +113,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Proszę zainstalować jedno z poniższych locale w Twoim systemie i uruchomić ponownie serwer www.", "Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.", "PHP module %s not installed." : "Moduł PHP %s nie jest zainstalowany.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Moduły PHP zostały zainstalowane, ale nadal brakuje ich na liście?", "Please ask your server administrator to restart the web server." : "Poproś administratora serwera o restart serwera www.", diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json index 3d0d2bff116..55f589edf60 100644 --- a/lib/l10n/pl.json +++ b/lib/l10n/pl.json @@ -111,7 +111,6 @@ "Please install one of these locales on your system and restart your webserver." : "Proszę zainstalować jedno z poniższych locale w Twoim systemie i uruchomić ponownie serwer www.", "Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.", "PHP module %s not installed." : "Moduł PHP %s nie jest zainstalowany.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Moduły PHP zostały zainstalowane, ale nadal brakuje ich na liście?", "Please ask your server administrator to restart the web server." : "Poproś administratora serwera o restart serwera www.", diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js index fc5aaba2844..98b1eb58814 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -129,9 +129,7 @@ OC.L10N.register( "PHP module %s not installed." : "Módulo PHP %s não instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "Configurações \"%s\" PHP não está configurado para \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustando esta configuração no php.ini irá fazer o ownCloud rodar novamente", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload está definido para \"%s\" em vez do valor esperado \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Para corrigir esse problema defina <code>mbstring.func_overload</code> para <code>0</code> em seu php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Módulos do PHP foram instalados, mas eles ainda estão listados como desaparecidos?", "Please ask your server administrator to restart the web server." : "Por favor, peça ao seu administrador do servidor para reiniciar o servidor web.", diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json index 7819a4c339f..16558e8b7a7 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -127,9 +127,7 @@ "PHP module %s not installed." : "Módulo PHP %s não instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "Configurações \"%s\" PHP não está configurado para \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustando esta configuração no php.ini irá fazer o ownCloud rodar novamente", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "mbstring.func_overload está definido para \"%s\" em vez do valor esperado \"0\"", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Para corrigir esse problema defina <code>mbstring.func_overload</code> para <code>0</code> em seu php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Módulos do PHP foram instalados, mas eles ainda estão listados como desaparecidos?", "Please ask your server administrator to restart the web server." : "Por favor, peça ao seu administrador do servidor para reiniciar o servidor web.", diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js index 86b4a776a6f..c1f7310b6e5 100644 --- a/lib/l10n/pt_PT.js +++ b/lib/l10n/pt_PT.js @@ -127,7 +127,6 @@ OC.L10N.register( "PHP module %s not installed." : "O modulo %s PHP não está instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "Configuração PHP \"%s\" não está definida para \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustar esta configuração no php.ini fará com que o ownCloud funcione de novo", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.", "PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados, mas eles ainda estão listados como desaparecidos?", "Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.", diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json index 9737e2b3964..defa0723ed7 100644 --- a/lib/l10n/pt_PT.json +++ b/lib/l10n/pt_PT.json @@ -125,7 +125,6 @@ "PHP module %s not installed." : "O modulo %s PHP não está instalado.", "PHP setting \"%s\" is not set to \"%s\"." : "Configuração PHP \"%s\" não está definida para \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustar esta configuração no php.ini fará com que o ownCloud funcione de novo", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.", "PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados, mas eles ainda estão listados como desaparecidos?", "Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.", diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js index 01ca1d60034..9591ad0ac7d 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -131,7 +131,6 @@ OC.L10N.register( "PHP module %s not installed." : "Не установлен PHP-модуль %s.", "PHP setting \"%s\" is not set to \"%s\"." : "Параметр PHP \"%s\" не установлен в \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Установка этого параметра в php.ini позволит запуститься ownCloud снова.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP были установлены, но они все еще перечислены как недостающие?", "Please ask your server administrator to restart the web server." : "Пожалуйста, попросите вашего администратора перезапустить веб-сервер.", diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json index 908970ec603..973a7e7fe01 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -129,7 +129,6 @@ "PHP module %s not installed." : "Не установлен PHP-модуль %s.", "PHP setting \"%s\" is not set to \"%s\"." : "Параметр PHP \"%s\" не установлен в \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Установка этого параметра в php.ini позволит запуститься ownCloud снова.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP были установлены, но они все еще перечислены как недостающие?", "Please ask your server administrator to restart the web server." : "Пожалуйста, попросите вашего администратора перезапустить веб-сервер.", diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js index 38c18b431ef..163e2b01c68 100644 --- a/lib/l10n/sk_SK.js +++ b/lib/l10n/sk_SK.js @@ -119,7 +119,6 @@ OC.L10N.register( "PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.", "PHP setting \"%s\" is not set to \"%s\"." : "Voľba PHP „%s“ nie je nastavená na „%s“.", "Adjusting this setting in php.ini will make ownCloud run again" : "Zmenou tejto voľby v php.ini znovu uvediete váš ownCloud do prevádzky", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky komentárov. To zneprístupní niekoľko základných aplikácií.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sa tvária, že chýbajú?", "Please ask your server administrator to restart the web server." : "Prosím, požiadajte administrátora vášho servera o reštartovanie webového servera.", diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json index 031270747b7..0af94448c34 100644 --- a/lib/l10n/sk_SK.json +++ b/lib/l10n/sk_SK.json @@ -117,7 +117,6 @@ "PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.", "PHP setting \"%s\" is not set to \"%s\"." : "Voľba PHP „%s“ nie je nastavená na „%s“.", "Adjusting this setting in php.ini will make ownCloud run again" : "Zmenou tejto voľby v php.ini znovu uvediete váš ownCloud do prevádzky", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky komentárov. To zneprístupní niekoľko základných aplikácií.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sa tvária, že chýbajú?", "Please ask your server administrator to restart the web server." : "Prosím, požiadajte administrátora vášho servera o reštartovanie webového servera.", diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js index 2f84515b1e5..360725b7985 100644 --- a/lib/l10n/sr.js +++ b/lib/l10n/sr.js @@ -131,9 +131,7 @@ OC.L10N.register( "PHP module %s not installed." : "ПХП модул %s није инсталиран.", "PHP setting \"%s\" is not set to \"%s\"." : "ПХП поставка „%s“ није постављена на „%s“.", "Adjusting this setting in php.ini will make ownCloud run again" : "Подешавање ове поставке у php.ini фајлу ће омогућити да оунКлауд поново ради", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "Вредност mbstring.func_overload је постављена на „%s“ уместо на очекивану вредност „0“", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Да би решили овај проблем поставите <code>mbstring.func_overload</code> на <code>0</code> у фајлу php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.", "PHP modules have been installed, but they are still listed as missing?" : "ПХП модули су инсталирани али се и даље воде као недостајући?", "Please ask your server administrator to restart the web server." : "Замолите вашег администратора сервера да поново покрене веб сервер.", diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json index d1fe5d4fe43..f4f120b3e14 100644 --- a/lib/l10n/sr.json +++ b/lib/l10n/sr.json @@ -129,9 +129,7 @@ "PHP module %s not installed." : "ПХП модул %s није инсталиран.", "PHP setting \"%s\" is not set to \"%s\"." : "ПХП поставка „%s“ није постављена на „%s“.", "Adjusting this setting in php.ini will make ownCloud run again" : "Подешавање ове поставке у php.ini фајлу ће омогућити да оунКлауд поново ради", - "mbstring.func_overload is set to \"%s\" instead to the expected value \"0\"" : "Вредност mbstring.func_overload је постављена на „%s“ уместо на очекивану вредност „0“", "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Да би решили овај проблем поставите <code>mbstring.func_overload</code> на <code>0</code> у фајлу php.ini", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.", "PHP modules have been installed, but they are still listed as missing?" : "ПХП модули су инсталирани али се и даље воде као недостајући?", "Please ask your server administrator to restart the web server." : "Замолите вашег администратора сервера да поново покрене веб сервер.", diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js index 2401ffc2e96..16607aaf86b 100644 --- a/lib/l10n/sv.js +++ b/lib/l10n/sv.js @@ -115,7 +115,6 @@ OC.L10N.register( "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om dinn webbserver,", "Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.", "PHP module %s not installed." : "PHP modulen %s är inte installerad.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har installerats, men de listas fortfarande som saknade?", "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.", diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json index bd9a704dccb..a346bdcd026 100644 --- a/lib/l10n/sv.json +++ b/lib/l10n/sv.json @@ -113,7 +113,6 @@ "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om dinn webbserver,", "Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.", "PHP module %s not installed." : "PHP modulen %s är inte installerad.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP är tydligen inställd för att rensa inline doc block. Detta kommer att göra flera kärnapplikationer otillgängliga.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Detta orsakas troligtvis av en cache/accelerator som t ex Zend OPchache eller eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har installerats, men de listas fortfarande som saknade?", "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.", diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js index 4a969e8e288..021f2d59f98 100644 --- a/lib/l10n/tr.js +++ b/lib/l10n/tr.js @@ -131,7 +131,6 @@ OC.L10N.register( "PHP module %s not installed." : "PHP modülü %s yüklü değil.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP ayarı \"%s\", \"%s\" olarak ayarlanmamış.", "Adjusting this setting in php.ini will make ownCloud run again" : "Bu ayarı php.ini içerisinde ayarlamak ownCloud'ı tekrar çalıştıracak.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satıriçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle meydana gelir.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?", "Please ask your server administrator to restart the web server." : "Lütfen web sunucusunu yeniden başlatması için sunucu yöneticinize danışın.", diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json index add5a27ad60..3a2b9e687fc 100644 --- a/lib/l10n/tr.json +++ b/lib/l10n/tr.json @@ -129,7 +129,6 @@ "PHP module %s not installed." : "PHP modülü %s yüklü değil.", "PHP setting \"%s\" is not set to \"%s\"." : "PHP ayarı \"%s\", \"%s\" olarak ayarlanmamış.", "Adjusting this setting in php.ini will make ownCloud run again" : "Bu ayarı php.ini içerisinde ayarlamak ownCloud'ı tekrar çalıştıracak.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satıriçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek uygulamalarını erişilemez yapacak.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle meydana gelir.", "PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?", "Please ask your server administrator to restart the web server." : "Lütfen web sunucusunu yeniden başlatması için sunucu yöneticinize danışın.", diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js index a3a1e55b685..69ae90a8364 100644 --- a/lib/l10n/uk.js +++ b/lib/l10n/uk.js @@ -128,7 +128,6 @@ OC.L10N.register( "PHP module %s not installed." : "%s модуль PHP не встановлено.", "PHP setting \"%s\" is not set to \"%s\"." : "Параметр PHP \"%s\" не встановлено в \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Установка цього параметру в php.ini дозволяє запуститися ownCloud знову.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Модулі PHP були встановлені, але вони все ще перераховані як відсутні?", "Please ask your server administrator to restart the web server." : "Будь ласка, зверніться до адміністратора, щоб перезавантажити сервер.", diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json index 609c498f56d..e24bc37501b 100644 --- a/lib/l10n/uk.json +++ b/lib/l10n/uk.json @@ -126,7 +126,6 @@ "PHP module %s not installed." : "%s модуль PHP не встановлено.", "PHP setting \"%s\" is not set to \"%s\"." : "Параметр PHP \"%s\" не встановлено в \"%s\".", "Adjusting this setting in php.ini will make ownCloud run again" : "Установка цього параметру в php.ini дозволяє запуститися ownCloud знову.", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Схоже, що PHP налаштовано на вичищення блоків вбудованої документації. Це зробить кілька основних додатків недоступними.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Це, ймовірно, обумовлено використанням кеша/прискорювача такого як Zend OPcache або eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Модулі PHP були встановлені, але вони все ще перераховані як відсутні?", "Please ask your server administrator to restart the web server." : "Будь ласка, зверніться до адміністратора, щоб перезавантажити сервер.", diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js index 4430310e8f8..2046655f20d 100644 --- a/lib/l10n/zh_CN.js +++ b/lib/l10n/zh_CN.js @@ -89,7 +89,6 @@ OC.L10N.register( "Setting locale to %s failed" : "设置语言为 %s 失败", "Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。", "PHP module %s not installed." : "PHP %s 模块未安装。", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。", "PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装，但仍然显示未安装？", "Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。", diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json index e5edddc2fa1..e96f07d198c 100644 --- a/lib/l10n/zh_CN.json +++ b/lib/l10n/zh_CN.json @@ -87,7 +87,6 @@ "Setting locale to %s failed" : "设置语言为 %s 失败", "Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。", "PHP module %s not installed." : "PHP %s 模块未安装。", - "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。", "PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装，但仍然显示未安装？", "Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。", diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 81cca55924b..1257a14dd04 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -500,18 +500,18 @@ abstract class Common implements Storage { * @throws InvalidPathException */ private function scanForInvalidCharacters($fileName, $invalidChars) { - foreach(str_split($invalidChars) as $char) { + foreach (str_split($invalidChars) as $char) { if (strpos($fileName, $char) !== false) { throw new InvalidCharacterInPathException(); } } $sanitizedFileName = filter_var($fileName, FILTER_UNSAFE_RAW, FILTER_FLAG_STRIP_LOW); - if($sanitizedFileName !== $fileName) { + if ($sanitizedFileName !== $fileName) { throw new InvalidCharacterInPathException(); } } - + /** * @param array $options */ @@ -527,6 +527,7 @@ abstract class Common implements Storage { public function getMountOption($name, $default = null) { return isset($this->mountOptions[$name]) ? $this->mountOptions[$name] : $default; } + /** * @param \OCP\Files\Storage $sourceStorage * @param string $sourceInternalPath @@ -535,6 +536,10 @@ abstract class Common implements Storage { * @return bool */ public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { + if ($sourceStorage === $this) { + return $this->copy($sourceInternalPath, $targetInternalPath); + } + if ($sourceStorage->is_dir($sourceInternalPath)) { $dh = $sourceStorage->opendir($sourceInternalPath); $result = $this->mkdir($targetInternalPath); @@ -577,6 +582,10 @@ abstract class Common implements Storage { * @return bool */ public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { + if ($sourceStorage === $this) { + return $this->rename($sourceInternalPath, $targetInternalPath); + } + $result = $this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, true); if ($result) { if ($sourceStorage->is_dir($sourceInternalPath)) { diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php index f3dc09db138..14024addec4 100644 --- a/lib/private/files/storage/wrapper/wrapper.php +++ b/lib/private/files/storage/wrapper/wrapper.php @@ -513,6 +513,10 @@ class Wrapper implements \OC\Files\Storage\Storage { * @return bool */ public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { + if ($sourceStorage === $this) { + return $this->copy($sourceInternalPath, $targetInternalPath); + } + return $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); } @@ -523,6 +527,10 @@ class Wrapper implements \OC\Files\Storage\Storage { * @return bool */ public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { + if ($sourceStorage === $this) { + return $this->rename($sourceInternalPath, $targetInternalPath); + } + return $this->storage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); } diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php index b1b15f12ed7..5e92db398f9 100644 --- a/lib/private/log/errorhandler.php +++ b/lib/private/log/errorhandler.php @@ -64,10 +64,16 @@ class ErrorHandler { } } - // Uncaught exception handler + /** + * Uncaught exception handler + * + * @param \Exception $exception + */ public static function onException($exception) { - $msg = $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(); - self::$logger->critical(self::removePassword($msg), array('app' => 'PHP')); + $class = get_class($exception); + $msg = $exception->getMessage(); + $msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine(); + self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']); } //Recoverable errors handler diff --git a/lib/private/updater.php b/lib/private/updater.php index 59b1c0a8f66..8371193ef79 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -65,6 +65,9 @@ class Updater extends BasicEmitter { /** @var bool */ private $updateStepEnabled; + /** @var bool */ + private $skip3rdPartyAppsDisable; + /** * @param HTTPHelper $httpHelper * @param IConfig $config @@ -100,6 +103,16 @@ class Updater extends BasicEmitter { } /** + * Sets whether the update disables 3rd party apps. + * This can be set to true to skip the disable. + * + * @param bool $flag false to not disable, true otherwise + */ + public function setSkip3rdPartyAppsDisable($flag) { + $this->skip3rdPartyAppsDisable = $flag; + } + + /** * Check if a new version is available * * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php' @@ -407,10 +420,12 @@ class Updater extends BasicEmitter { continue; } - // disable any other 3rd party apps - \OC_App::disable($app); - $disabledApps[]= $app; - $this->emit('\OC\Updater', 'thirdPartyAppDisabled', array($app)); + // disable any other 3rd party apps if not overriden + if(!$this->skip3rdPartyAppsDisable) { + \OC_App::disable($app); + $disabledApps[]= $app; + $this->emit('\OC\Updater', 'thirdPartyAppDisabled', array($app)); + }; } return $disabledApps; } diff --git a/lib/private/user.php b/lib/private/user.php index b3677233825..8083b4e40be 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -241,7 +241,10 @@ class OC_User { $result = self::getUserSession()->login($loginname, $password); if ($result) { //we need to pass the user name, which may differ from login name - OC_Util::setupFS(self::getUserSession()->getUser()->getUID()); + $user = self::getUserSession()->getUser()->getUID(); + OC_Util::setupFS($user); + //trigger creation of user home and /files folder + \OC::$server->getUserFolder($user); } return $result; } @@ -421,7 +424,7 @@ class OC_User { /** * get the user id of the user currently logged in. * - * @return string uid or false + * @return string|bool uid or false */ public static function getUser() { $uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null; diff --git a/lib/private/util.php b/lib/private/util.php index 4288f8e293a..4470006b90c 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -189,9 +189,6 @@ class OC_Util { //jail the user into his "home" directory \OC\Files\Filesystem::init($user, $userDir); - //trigger creation of user home and /files folder - \OC::$server->getUserFolder($user); - OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir)); } \OC::$server->getEventLogger()->end('setup_fs'); diff --git a/settings/l10n/az.js b/settings/l10n/az.js index 677a7d3ab54..9b5de07237d 100644 --- a/settings/l10n/az.js +++ b/settings/l10n/az.js @@ -107,6 +107,7 @@ OC.L10N.register( "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Biz təkidlə təklif edirik ki, göstərilən dillər üçün tələb edilən paketləri sisteminizdə yükləyəsiniz: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eger sizin yüklənməniz root domain-də yüklənməyibsə və sistem cron-u istifadə edirsə, orda URL generasiyası ilə bağlı problemləriniz ola bilər. Bu problemləri aşmaq üçün xahiş olunur yüklənmə vaxtı \"overwrite.cli.url\" opsiyasını config.php faylında webroot ünvanı olaraq təyin edəsiniz (Məsləhətdir: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CRON işini CLİ-dan yerinə yetirmək mümkün olmadı. Görünən texniki səhv baş verdi.", + "Open documentation" : "Sənədləri aç", "Allow apps to use the Share API" : "Proqramlara izin verin ki, Paylaşım API-sindən istifadə edə bilsinlər.", "Allow users to share via link" : "Istifadəçilərə link üzərindən paylaşım etməyə izin vermək", "Enforce password protection" : "Şifrə müdafiəsini həyata keçirmək", diff --git a/settings/l10n/az.json b/settings/l10n/az.json index 1d0b227a3bd..7b778b3d818 100644 --- a/settings/l10n/az.json +++ b/settings/l10n/az.json @@ -105,6 +105,7 @@ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Biz təkidlə təklif edirik ki, göstərilən dillər üçün tələb edilən paketləri sisteminizdə yükləyəsiniz: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eger sizin yüklənməniz root domain-də yüklənməyibsə və sistem cron-u istifadə edirsə, orda URL generasiyası ilə bağlı problemləriniz ola bilər. Bu problemləri aşmaq üçün xahiş olunur yüklənmə vaxtı \"overwrite.cli.url\" opsiyasını config.php faylında webroot ünvanı olaraq təyin edəsiniz (Məsləhətdir: \"%s\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CRON işini CLİ-dan yerinə yetirmək mümkün olmadı. Görünən texniki səhv baş verdi.", + "Open documentation" : "Sənədləri aç", "Allow apps to use the Share API" : "Proqramlara izin verin ki, Paylaşım API-sindən istifadə edə bilsinlər.", "Allow users to share via link" : "Istifadəçilərə link üzərindən paylaşım etməyə izin vermək", "Enforce password protection" : "Şifrə müdafiəsini həyata keçirmək", diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 039a66fd753..b8e58315b69 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -147,6 +147,7 @@ OC.L10N.register( "Enable encryption" : "Povolit šifrování", "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.", "Select default encryption module:" : "Vybrat výchozí šifrovací modul:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Povolte prosím \"Default encryption module\" a spusťte příkaz 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou.", "Start migration" : "Spustit migraci", "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 5668be982a7..49071c3ba88 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -145,6 +145,7 @@ "Enable encryption" : "Povolit šifrování", "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.", "Select default encryption module:" : "Vybrat výchozí šifrovací modul:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Povolte prosím \"Default encryption module\" a spusťte příkaz 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou.", "Start migration" : "Spustit migraci", "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 5c358a3c77d..0927d5b50fe 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -180,7 +180,7 @@ OC.L10N.register( "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen", "Version" : "Version", "Developer documentation" : "Dokumentation für Entwickler", - "Experimental applications ahead" : "Kommende experimentelle Apps", + "Experimental applications ahead" : "Experimentelle Apps nachfolgend", "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.", "by" : "von", "licensed" : "Lizenziert", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 9b364c78f14..6d05e578bf5 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -178,7 +178,7 @@ "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen", "Version" : "Version", "Developer documentation" : "Dokumentation für Entwickler", - "Experimental applications ahead" : "Kommende experimentelle Apps", + "Experimental applications ahead" : "Experimentelle Apps nachfolgend", "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.", "by" : "von", "licensed" : "Lizenziert", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index d6f5756d167..25dd505eafa 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -180,7 +180,7 @@ OC.L10N.register( "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen", "Version" : "Version", "Developer documentation" : "Dokumentation für Entwickler", - "Experimental applications ahead" : "Kommende experimentelle Apps", + "Experimental applications ahead" : "Experimentelle Apps nachfolgend", "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.", "by" : "von", "licensed" : "Lizenziert", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 2d6ed050056..feb20f36972 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -178,7 +178,7 @@ "Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen", "Version" : "Version", "Developer documentation" : "Dokumentation für Entwickler", - "Experimental applications ahead" : "Kommende experimentelle Apps", + "Experimental applications ahead" : "Experimentelle Apps nachfolgend", "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.", "by" : "von", "licensed" : "Lizenziert", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index 34dac3237fe..159153f4b55 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -147,6 +147,7 @@ OC.L10N.register( "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης", "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.", "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε ενεργοποιήστε την \"Προεπιλεγμένη Μονάδα Κρυπτογράφησης\" και εκτελέστε την εντολή 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Πρέπει να μεταφέρετε τα κλειδιά σας κρυπτογράφησης από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια.", "Start migration" : "Έναρξη μετάβασης", "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index f9fc4cacf13..9c59d8aabaa 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -145,6 +145,7 @@ "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης", "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.", "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε ενεργοποιήστε την \"Προεπιλεγμένη Μονάδα Κρυπτογράφησης\" και εκτελέστε την εντολή 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Πρέπει να μεταφέρετε τα κλειδιά σας κρυπτογράφησης από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια.", "Start migration" : "Έναρξη μετάβασης", "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index 76951f31441..361600bf05b 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -107,6 +107,8 @@ OC.L10N.register( "NT LAN Manager" : "NT LAN Manager", "SSL" : "SSL", "TLS" : "TLS", + "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.", + "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", @@ -141,6 +143,12 @@ OC.L10N.register( "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.", "Enable server-side encryption" : "Enable server-side encryption", + "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?", + "Enable encryption" : "Enable encryption", + "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.", + "Select default encryption module:" : "Select default encryption module:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.", "Start migration" : "Start migration", "This is used for sending out notifications." : "This is used for sending out notifications.", "Send mode" : "Send mode", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index 4630170e7cf..8fa70ce9bc0 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -105,6 +105,8 @@ "NT LAN Manager" : "NT LAN Manager", "SSL" : "SSL", "TLS" : "TLS", + "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.", + "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.", "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.", @@ -139,6 +141,12 @@ "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.", "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.", "Enable server-side encryption" : "Enable server-side encryption", + "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?", + "Enable encryption" : "Enable encryption", + "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.", + "Select default encryption module:" : "Select default encryption module:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.", "Start migration" : "Start migration", "This is used for sending out notifications." : "This is used for sending out notifications.", "Send mode" : "Send mode", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 81c5e992fd3..55f085f5fe7 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -147,6 +147,7 @@ OC.L10N.register( "Enable encryption" : "Habilitar cifrado", "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.", "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Necesita migrar sus claves de cifrado provenientes del antiguo sistema (ownCloud <= 8.0) al nuevo. Por favor habilite el \"Módulo de cifrado por defecto\" y ejecute 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Se necesita migrar las claves de cifrado del antiguo sistema (ownCloud <= 8.0) al nuevo sistema.", "Start migration" : "Iniciar migración", "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 8ff4ab24edd..4b67f7aad14 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -145,6 +145,7 @@ "Enable encryption" : "Habilitar cifrado", "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.", "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Necesita migrar sus claves de cifrado provenientes del antiguo sistema (ownCloud <= 8.0) al nuevo. Por favor habilite el \"Módulo de cifrado por defecto\" y ejecute 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Se necesita migrar las claves de cifrado del antiguo sistema (ownCloud <= 8.0) al nuevo sistema.", "Start migration" : "Iniciar migración", "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 31c1b32e966..73e04bcfe0c 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -239,6 +239,7 @@ OC.L10N.register( "E-Mail" : "Sähköposti", "Create" : "Luo", "Admin Recovery Password" : "Ylläpitäjän palautussalasana", + "Enter the recovery password in order to recover the users files during password change" : "Anna palautussalasana, jotta käyttäjien tiedostot on mahdollista palauttaa salasanan muuttamisen yhteydessä", "Search Users" : "Etsi käyttäjiä", "Add Group" : "Lisää ryhmä", "Group" : "Ryhmä", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index dc045ec042e..0d9157466c9 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -237,6 +237,7 @@ "E-Mail" : "Sähköposti", "Create" : "Luo", "Admin Recovery Password" : "Ylläpitäjän palautussalasana", + "Enter the recovery password in order to recover the users files during password change" : "Anna palautussalasana, jotta käyttäjien tiedostot on mahdollista palauttaa salasanan muuttamisen yhteydessä", "Search Users" : "Etsi käyttäjiä", "Add Group" : "Lisää ryhmä", "Group" : "Ryhmä", diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js index f5cd082e8f0..cfffdd70507 100644 --- a/settings/l10n/gl.js +++ b/settings/l10n/gl.js @@ -147,6 +147,7 @@ OC.L10N.register( "Enable encryption" : "Activar o cifrado", "No encryption module loaded, please enable an encryption module in the app menu." : "Non hai cargado ningún módulo de cifrado, active un módulo de cifrado no menú de aplicacións.", "Select default encryption module:" : "Seleccionar o módulo predeterminado de cifrado:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "É necesario migrar as súas chaves de cifrado do antigo cifrado (ownCloud <= 8,0) cara ao novo. Active o «Módulo predeterminado de cifrado» e execute «occ encryption:migrate»", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "É necesario migrar as chaves de cifrado do antigo cifrado (ownCloud <= 8,0) cara ao novo.", "Start migration" : "Iniciar a migración", "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.", diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json index 86194a41d2a..40ec3fa453f 100644 --- a/settings/l10n/gl.json +++ b/settings/l10n/gl.json @@ -145,6 +145,7 @@ "Enable encryption" : "Activar o cifrado", "No encryption module loaded, please enable an encryption module in the app menu." : "Non hai cargado ningún módulo de cifrado, active un módulo de cifrado no menú de aplicacións.", "Select default encryption module:" : "Seleccionar o módulo predeterminado de cifrado:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "É necesario migrar as súas chaves de cifrado do antigo cifrado (ownCloud <= 8,0) cara ao novo. Active o «Módulo predeterminado de cifrado» e execute «occ encryption:migrate»", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "É necesario migrar as chaves de cifrado do antigo cifrado (ownCloud <= 8,0) cara ao novo.", "Start migration" : "Iniciar a migración", "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 1e00cc5b87a..7c07db78f87 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -147,6 +147,7 @@ OC.L10N.register( "Enable encryption" : "Abilita cifratura", "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.", "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Abilita il \"Modulo di cifratura predefinito\" ed esegui 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova.", "Start migration" : "Avvia migrazione", "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index 8eee9bff394..e13c850885a 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -145,6 +145,7 @@ "Enable encryption" : "Abilita cifratura", "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.", "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Abilita il \"Modulo di cifratura predefinito\" ed esegui 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova.", "Start migration" : "Avvia migrazione", "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 079e41d8738..b4904d1412c 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -147,6 +147,7 @@ OC.L10N.register( "Enable encryption" : "Ativar criptografia", "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.", "Select default encryption module:" : "Selecione o módulo de criptografia padrão:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"módulo de criptografia padrão\" e execute 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.", "Start migration" : "Iniciar migração", "This is used for sending out notifications." : "Isto é usado para o envio de notificações.", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index 9b724b55cf4..735620e3b7f 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -145,6 +145,7 @@ "Enable encryption" : "Ativar criptografia", "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.", "Select default encryption module:" : "Selecione o módulo de criptografia padrão:", + "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova. Ative o \"módulo de criptografia padrão\" e execute 'occ encryption:migrate'", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Você precisa migrar suas chaves de criptografia a partir da antiga criptografia (ownCloud <= 8,0) para a nova.", "Start migration" : "Iniciar migração", "This is used for sending out notifications." : "Isto é usado para o envio de notificações.", diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php index a5456eb6789..c58d7febc3f 100644 --- a/tests/core/avatar/avatarcontrollertest.php +++ b/tests/core/avatar/avatarcontrollertest.php @@ -88,11 +88,7 @@ class AvatarControllerTest extends \Test\TestCase { $this->user = $this->getUniqueID('user'); OC::$server->getUserManager()->createUser($this->user, $this->user); - \OC_Util::tearDownFS(); - \OC_User::setUserId(''); - Filesystem::tearDown(); - \OC_User::setUserId($this->user); - \OC_Util::setupFS($this->user); + $this->loginAsUser($this->user); // Create Cache dir $view = new \OC\Files\View('/'.$this->user); diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index 938fecb5bf3..e8602b6b24a 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -176,7 +176,7 @@ abstract class Storage extends \Test\TestCase { ]; } - public function initSourceAndTarget ($source, $target = null) { + public function initSourceAndTarget($source, $target = null) { $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; $this->instance->file_put_contents($source, file_get_contents($textFile)); if ($target) { @@ -185,12 +185,12 @@ abstract class Storage extends \Test\TestCase { } } - public function assertSameAsLorem ($file) { + public function assertSameAsLorem($file) { $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; $this->assertEquals( file_get_contents($textFile), $this->instance->file_get_contents($file), - 'Expected '.$file.' to be a copy of '.$textFile + 'Expected ' . $file . ' to be a copy of ' . $textFile ); } @@ -202,9 +202,9 @@ abstract class Storage extends \Test\TestCase { $this->instance->copy($source, $target); - $this->assertTrue($this->instance->file_exists($target), $target.' was not created'); + $this->assertTrue($this->instance->file_exists($target), $target . ' was not created'); $this->assertSameAsLorem($target); - $this->assertTrue($this->instance->file_exists($source), $source.' was deleted'); + $this->assertTrue($this->instance->file_exists($source), $source . ' was deleted'); } /** @@ -216,8 +216,8 @@ abstract class Storage extends \Test\TestCase { $this->instance->rename($source, $target); $this->wait(); - $this->assertTrue($this->instance->file_exists($target), $target.' was not created'); - $this->assertFalse($this->instance->file_exists($source), $source.' still exists'); + $this->assertTrue($this->instance->file_exists($target), $target . ' was not created'); + $this->assertFalse($this->instance->file_exists($source), $source . ' still exists'); $this->assertSameAsLorem($target); } @@ -225,12 +225,12 @@ abstract class Storage extends \Test\TestCase { * @dataProvider copyAndMoveProvider */ public function testCopyOverwrite($source, $target) { - $this->initSourceAndTarget($source,$target); + $this->initSourceAndTarget($source, $target); $this->instance->copy($source, $target); - $this->assertTrue($this->instance->file_exists($target), $target.' was not created'); - $this->assertTrue($this->instance->file_exists($source), $source.' was deleted'); + $this->assertTrue($this->instance->file_exists($target), $target . ' was not created'); + $this->assertTrue($this->instance->file_exists($source), $source . ' was deleted'); $this->assertSameAsLorem($target); $this->assertSameAsLorem($source); } @@ -243,8 +243,8 @@ abstract class Storage extends \Test\TestCase { $this->instance->rename($source, $target); - $this->assertTrue($this->instance->file_exists($target), $target.' was not created'); - $this->assertFalse($this->instance->file_exists($source), $source.' still exists'); + $this->assertTrue($this->instance->file_exists($target), $target . ' was not created'); + $this->assertFalse($this->instance->file_exists($source), $source . ' still exists'); $this->assertSameAsLorem($target); } @@ -535,4 +535,17 @@ abstract class Storage extends \Test\TestCase { $this->assertTrue($this->instance->instanceOfStorage(get_class($this->instance))); $this->assertFalse($this->instance->instanceOfStorage('\OC')); } + + /** + * @dataProvider copyAndMoveProvider + */ + public function testCopyFromSameStorage($source, $target) { + $this->initSourceAndTarget($source); + + $this->instance->copyFromStorage($this->instance, $source, $target); + + $this->assertTrue($this->instance->file_exists($target), $target . ' was not created'); + $this->assertSameAsLorem($target); + $this->assertTrue($this->instance->file_exists($source), $source . ' was deleted'); + } } diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index 76d5662da9d..c1ebfb025cf 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -174,6 +174,9 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { \OC\Files\Filesystem::tearDown(); \OC_User::setUserId($user); \OC_Util::setupFS($user); + if (\OC_User::userExists($user)) { + \OC::$server->getUserFolder($user); + } } /** |