diff options
89 files changed, 529 insertions, 483 deletions
diff --git a/.drone.yml b/.drone.yml index 07ad955acfa..2b17ba42f77 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,38 +8,41 @@ build: commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - NOCOVERAGE=true ./autotest.sh sqlite sqlite-php5.5: image: nextcloudci/php5.5:1.0.7 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - NOCOVERAGE=true ./autotest.sh sqlite - sqlite: + sqlite-php5.6: image: nextcloudci/php5.6:1.0.6 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - - ./autotest.sh sqlite - mysql: + - NOCOVERAGE=true ./autotest.sh sqlite + sqlite-php7.0: + image: nextcloudci/php7.0:1.0.9 + commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues + - git submodule update --init + - NOCOVERAGE=true ./autotest.sh sqlite + mysql-php5.6: image: nextcloudci/php5.6:1.0.6 commands: - sleep 15 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./autotest.sh mysql - postgres: + - NOCOVERAGE=true ./autotest.sh mysql + postgres-php5.6: image: nextcloudci/php5.6:1.0.6 commands: - sleep 10 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./autotest.sh pgsql + - NOCOVERAGE=true ./autotest.sh pgsql integration: - image: nextcloudci/php5.6:1.0.6 + image: nextcloudci/php7.0:1.0.9 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init diff --git a/apps/comments/l10n/de.js b/apps/comments/l10n/de.js index f9f552faf0e..27d5154d150 100644 --- a/apps/comments/l10n/de.js +++ b/apps/comments/l10n/de.js @@ -8,7 +8,7 @@ OC.L10N.register( "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[Gelöschter Benutzer]", "Comments" : "Kommentare", - "No other comments available" : "Keine anderen Kommentare vorhanden", + "No other comments available" : "Keine weiteren Kommentare vorhanden", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}", @@ -18,8 +18,8 @@ OC.L10N.register( "{count} unread comments" : "{count} ungelesene Kommentare", "Comment" : "Kommentar", "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Kommentar hinzugefügt", - "%1$s commented" : "%1$s kommentierte", + "You commented" : "Von Dir kommentiert", + "%1$s commented" : "%1$s kommentiert", "You commented on %2$s" : "Du hast %2$s kommentiert", "%1$s commented on %2$s" : "%1$s kommentierte %2$s" }, diff --git a/apps/comments/l10n/de.json b/apps/comments/l10n/de.json index 4322d717c92..36e557bcb6d 100644 --- a/apps/comments/l10n/de.json +++ b/apps/comments/l10n/de.json @@ -6,7 +6,7 @@ "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[Gelöschter Benutzer]", "Comments" : "Kommentare", - "No other comments available" : "Keine anderen Kommentare vorhanden", + "No other comments available" : "Keine weiteren Kommentare vorhanden", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}", @@ -16,8 +16,8 @@ "{count} unread comments" : "{count} ungelesene Kommentare", "Comment" : "Kommentar", "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Kommentar hinzugefügt", - "%1$s commented" : "%1$s kommentierte", + "You commented" : "Von Dir kommentiert", + "%1$s commented" : "%1$s kommentiert", "You commented on %2$s" : "Du hast %2$s kommentiert", "%1$s commented on %2$s" : "%1$s kommentierte %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/comments/l10n/de_DE.js b/apps/comments/l10n/de_DE.js index 37fd10b9946..eae9e8afd9f 100644 --- a/apps/comments/l10n/de_DE.js +++ b/apps/comments/l10n/de_DE.js @@ -1,14 +1,14 @@ OC.L10N.register( "comments", { - "Type in a new comment..." : "Neuer Kommentar...", + "Type in a new comment..." : "Neuen Kommentar eingeben...", "Delete comment" : "Kommentar löschen", "Post" : "Speichern", "Cancel" : "Abbrechen", "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[gelöschter Benutzer]", "Comments" : "Kommentare", - "No other comments available" : "Keine anderen Kommentare verfügbar", + "No other comments available" : "Keine weiteren Kommentare verfügbar", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt", @@ -18,9 +18,9 @@ OC.L10N.register( "{count} unread comments" : "[count] ungelesene Kommentare", "Comment" : "Kommentar", "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Durch dich kommentiert", + "You commented" : "Sie haben kommentiert", "%1$s commented" : "%1$s kommentiert", - "You commented on %2$s" : "Du hast %2$s kommentiert", + "You commented on %2$s" : "Sie haben %2$s kommentiert", "%1$s commented on %2$s" : "%1$s kommentierte %2$s" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/comments/l10n/de_DE.json b/apps/comments/l10n/de_DE.json index 4c43f945ac3..ab4231e4155 100644 --- a/apps/comments/l10n/de_DE.json +++ b/apps/comments/l10n/de_DE.json @@ -1,12 +1,12 @@ { "translations": { - "Type in a new comment..." : "Neuer Kommentar...", + "Type in a new comment..." : "Neuen Kommentar eingeben...", "Delete comment" : "Kommentar löschen", "Post" : "Speichern", "Cancel" : "Abbrechen", "Edit comment" : "Kommentar bearbeiten", "[Deleted user]" : "[gelöschter Benutzer]", "Comments" : "Kommentare", - "No other comments available" : "Keine anderen Kommentare verfügbar", + "No other comments available" : "Keine weiteren Kommentare verfügbar", "More comments..." : "Weitere Kommentare...", "Save" : "Speichern", "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt", @@ -16,9 +16,9 @@ "{count} unread comments" : "[count] ungelesene Kommentare", "Comment" : "Kommentar", "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>", - "You commented" : "Durch dich kommentiert", + "You commented" : "Sie haben kommentiert", "%1$s commented" : "%1$s kommentiert", - "You commented on %2$s" : "Du hast %2$s kommentiert", + "You commented on %2$s" : "Sie haben %2$s kommentiert", "%1$s commented on %2$s" : "%1$s kommentierte %2$s" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/comments/l10n/it.js b/apps/comments/l10n/it.js index ce98270c06d..ae514ece113 100644 --- a/apps/comments/l10n/it.js +++ b/apps/comments/l10n/it.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Type in a new comment..." : "Digita un nuovo commento...", "Delete comment" : "Elimina commento", - "Post" : "Post", + "Post" : "Commento", "Cancel" : "Annulla", "Edit comment" : "Modifica commento", "[Deleted user]" : "[Utente eliminato]", diff --git a/apps/comments/l10n/it.json b/apps/comments/l10n/it.json index 50b8aa17698..20ff98ed181 100644 --- a/apps/comments/l10n/it.json +++ b/apps/comments/l10n/it.json @@ -1,7 +1,7 @@ { "translations": { "Type in a new comment..." : "Digita un nuovo commento...", "Delete comment" : "Elimina commento", - "Post" : "Post", + "Post" : "Commento", "Cancel" : "Annulla", "Edit comment" : "Modifica commento", "[Deleted user]" : "[Utente eliminato]", diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js index 99043491a87..560e1daf043 100644 --- a/apps/encryption/l10n/pt_BR.js +++ b/apps/encryption/l10n/pt_BR.js @@ -5,9 +5,9 @@ OC.L10N.register( "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação", "Repeated recovery key password does not match the provided recovery key password" : "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista", "Recovery key successfully enabled" : "Recuperação de chave habilitada com sucesso", - "Could not enable recovery key. Please check your recovery key password!" : "ImpossÃvel habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!", + "Could not enable recovery key. Please check your recovery key password!" : "ImpossÃvel habilitar recuperação de chave. Por favor, verifique sua senha para recuperação de chave!", "Recovery key successfully disabled" : "Recuperação de chave desabilitada com sucesso", - "Could not disable recovery key. Please check your recovery key password!" : "ImpossÃvel desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!", + "Could not disable recovery key. Please check your recovery key password!" : "ImpossÃvel desabilitar recuperação de chave. Por favor, verifique sua senha para recuperação de chave!", "Missing parameters" : "Parâmetros que faltam", "Please provide the old recovery password" : "Por favor, forneça a antiga senha de recuperação", "Please provide a new recovery password" : "Por favor, forneça a nova senha de recuperação", @@ -15,8 +15,8 @@ OC.L10N.register( "Password successfully changed." : "Senha alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possÃvel alterar a senha. Talvez a senha antiga não estava correta.", "Recovery Key disabled" : "Recuperação de chave desativada", - "Recovery Key enabled" : "Recuperar Chave habilitada", - "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possÃvel habilitar a chave recuperada, por favor tente novamente ou entre em contato com seu administrador", + "Recovery Key enabled" : "Recuperação de chave ativada", + "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possÃvel ativar a recuperação de chave. Tente novamente ou entre em contato com seu administrador", "Could not update the private key password." : "Não foi possÃvel atualizar a senha da chave privada.", "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente novamente.", "The current log-in password was not correct, please try again." : "A senha atual do log-in não estava correta, por favor, tente novamente.", @@ -25,15 +25,15 @@ 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." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente", "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto", - "Bad Signature" : "Assinatura Ruim", - "Missing Signature" : "Faltando Assinatura", + "Bad Signature" : "Assinatura ruim", + "Missing Signature" : "Faltando assinatura", "one-time password for server-side-encryption" : "senha de uso único para criptografia-lado-servidor", - "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor, peça ao dono do arquivo para compartilhá-lo com você.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possÃvel ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.", "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\nO administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha '%s'.\n\nPor favor faça o login para a interface da Web, vá para a seção 'módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.\n\n", "The share will expire on %s." : "O compartilhamento irá expirar em %s.", "Cheers!" : "Saudações!", - "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor faça o login para a interface da Web, vá para a seção 'módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login..<br><br>", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor, faça o login para a interface da Web, vá para a seção 'módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.<br><br>", "Encrypt the home storage" : "Criptografar a pasta de armazenamento home", "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativar essa opção de criptografia para todos os arquivos armazenados no armazenamento principal, caso contrário, apenas arquivos no armazenamento externo serão criptografados", "Enable recovery key" : "Habilitar recuperação de chave", @@ -45,16 +45,16 @@ OC.L10N.register( "Old recovery key password" : "Senha da chave de recuperação antiga", "New recovery key password" : "Nova senha da chave de recuperação", "Repeat new recovery key password" : "Repita a nova senha da chave de recuperação", - "Change Password" : "Trocar Senha", + "Change Password" : "Trocar senha", "basic encryption module" : "Modo de criptografia básico", "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.", "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:", " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.", "Old log-in password" : "Senha antiga de login", "Current log-in password" : "Senha de login atual", - "Update Private Key Password" : "Atualizar Senha de Chave Privada", + "Update Private Key Password" : "Atualizar senha de chave privada", "Enable password recovery:" : "Habilitar recuperação de senha:", - "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha", + "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ativar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos criptografados em caso de perda de senha", "Enabled" : "Habilitado", "Disabled" : "Desabilitado" }, diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json index eca7cdd72a6..cc788cc4e70 100644 --- a/apps/encryption/l10n/pt_BR.json +++ b/apps/encryption/l10n/pt_BR.json @@ -3,9 +3,9 @@ "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação", "Repeated recovery key password does not match the provided recovery key password" : "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista", "Recovery key successfully enabled" : "Recuperação de chave habilitada com sucesso", - "Could not enable recovery key. Please check your recovery key password!" : "ImpossÃvel habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!", + "Could not enable recovery key. Please check your recovery key password!" : "ImpossÃvel habilitar recuperação de chave. Por favor, verifique sua senha para recuperação de chave!", "Recovery key successfully disabled" : "Recuperação de chave desabilitada com sucesso", - "Could not disable recovery key. Please check your recovery key password!" : "ImpossÃvel desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!", + "Could not disable recovery key. Please check your recovery key password!" : "ImpossÃvel desabilitar recuperação de chave. Por favor, verifique sua senha para recuperação de chave!", "Missing parameters" : "Parâmetros que faltam", "Please provide the old recovery password" : "Por favor, forneça a antiga senha de recuperação", "Please provide a new recovery password" : "Por favor, forneça a nova senha de recuperação", @@ -13,8 +13,8 @@ "Password successfully changed." : "Senha alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." : "Não foi possÃvel alterar a senha. Talvez a senha antiga não estava correta.", "Recovery Key disabled" : "Recuperação de chave desativada", - "Recovery Key enabled" : "Recuperar Chave habilitada", - "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possÃvel habilitar a chave recuperada, por favor tente novamente ou entre em contato com seu administrador", + "Recovery Key enabled" : "Recuperação de chave ativada", + "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possÃvel ativar a recuperação de chave. Tente novamente ou entre em contato com seu administrador", "Could not update the private key password." : "Não foi possÃvel atualizar a senha da chave privada.", "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente novamente.", "The current log-in password was not correct, please try again." : "A senha atual do log-in não estava correta, por favor, tente novamente.", @@ -23,15 +23,15 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente", "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto", - "Bad Signature" : "Assinatura Ruim", - "Missing Signature" : "Faltando Assinatura", + "Bad Signature" : "Assinatura ruim", + "Missing Signature" : "Faltando assinatura", "one-time password for server-side-encryption" : "senha de uso único para criptografia-lado-servidor", - "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor, peça ao dono do arquivo para compartilhá-lo com você.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possÃvel ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.", "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\nO administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha '%s'.\n\nPor favor faça o login para a interface da Web, vá para a seção 'módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.\n\n", "The share will expire on %s." : "O compartilhamento irá expirar em %s.", "Cheers!" : "Saudações!", - "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor faça o login para a interface da Web, vá para a seção 'módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login..<br><br>", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor, faça o login para a interface da Web, vá para a seção 'módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.<br><br>", "Encrypt the home storage" : "Criptografar a pasta de armazenamento home", "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativar essa opção de criptografia para todos os arquivos armazenados no armazenamento principal, caso contrário, apenas arquivos no armazenamento externo serão criptografados", "Enable recovery key" : "Habilitar recuperação de chave", @@ -43,16 +43,16 @@ "Old recovery key password" : "Senha da chave de recuperação antiga", "New recovery key password" : "Nova senha da chave de recuperação", "Repeat new recovery key password" : "Repita a nova senha da chave de recuperação", - "Change Password" : "Trocar Senha", + "Change Password" : "Trocar senha", "basic encryption module" : "Modo de criptografia básico", "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.", "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:", " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.", "Old log-in password" : "Senha antiga de login", "Current log-in password" : "Senha de login atual", - "Update Private Key Password" : "Atualizar Senha de Chave Privada", + "Update Private Key Password" : "Atualizar senha de chave privada", "Enable password recovery:" : "Habilitar recuperação de senha:", - "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha", + "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ativar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos criptografados em caso de perda de senha", "Enabled" : "Habilitado", "Disabled" : "Desabilitado" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/federatedfilesharing/l10n/pt_BR.js b/apps/federatedfilesharing/l10n/pt_BR.js index 9ff351ba77e..3d2697d6bd2 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.js +++ b/apps/federatedfilesharing/l10n/pt_BR.js @@ -3,12 +3,12 @@ OC.L10N.register( { "Federated sharing" : "Compartilhamento federado", "Invalid Federated Cloud ID" : "Inválida Associação de Nuvem ID", - "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este Ãtem já está compartilhado com %s", + "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este item já está compartilhado com %s", "Not allowed to create a federated share with the same user" : "Não é permitido criar um compartilhamento associado com o mesmo usuário", "File is already shared with %s" : "O arquivo já é compartilhado com %s", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "O compartilhamento %s falhou, porque não foi possÃvel encontrar %s, talvez o servidor esteja inacessÃvel.", "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Você recebeu \"/%3$s\" como um compartilhamento remoto de %1$s (em nome de %2$s)", - "You received \"/%3$s\" as a remote share from %1$s" : "Você recebeu \"/%3$s\" como um compertilhamento remoto de %1$s", + "You received \"/%3$s\" as a remote share from %1$s" : "Você recebeu \"/%3$s\" como um compartilhamento remoto de %1$s", "Accept" : "Aceitar", "Decline" : "Rejeitar", "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #Nextcloud Nuvem ID Federada, veja %s", diff --git a/apps/federatedfilesharing/l10n/pt_BR.json b/apps/federatedfilesharing/l10n/pt_BR.json index c96c66aa12a..57c06af133d 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.json +++ b/apps/federatedfilesharing/l10n/pt_BR.json @@ -1,12 +1,12 @@ { "translations": { "Federated sharing" : "Compartilhamento federado", "Invalid Federated Cloud ID" : "Inválida Associação de Nuvem ID", - "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este Ãtem já está compartilhado com %s", + "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este item já está compartilhado com %s", "Not allowed to create a federated share with the same user" : "Não é permitido criar um compartilhamento associado com o mesmo usuário", "File is already shared with %s" : "O arquivo já é compartilhado com %s", "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "O compartilhamento %s falhou, porque não foi possÃvel encontrar %s, talvez o servidor esteja inacessÃvel.", "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Você recebeu \"/%3$s\" como um compartilhamento remoto de %1$s (em nome de %2$s)", - "You received \"/%3$s\" as a remote share from %1$s" : "Você recebeu \"/%3$s\" como um compertilhamento remoto de %1$s", + "You received \"/%3$s\" as a remote share from %1$s" : "Você recebeu \"/%3$s\" como um compartilhamento remoto de %1$s", "Accept" : "Aceitar", "Decline" : "Rejeitar", "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #Nextcloud Nuvem ID Federada, veja %s", diff --git a/apps/federation/l10n/it.js b/apps/federation/l10n/it.js index df9a46acb36..ab242a38b45 100644 --- a/apps/federation/l10n/it.js +++ b/apps/federation/l10n/it.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Aggiunto alla lista dei server affidabili", "Server is already in the list of trusted servers." : "Il server è già nell'elenco dei server affidabili.", - "No server to federate found" : "Non ho trovato nessun server per la federazione", + "No server to federate found" : "Non ho trovato alcun server per la federazione", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione consente di connettersi ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata.", diff --git a/apps/federation/l10n/it.json b/apps/federation/l10n/it.json index 294bd9f4e41..0102116dc26 100644 --- a/apps/federation/l10n/it.json +++ b/apps/federation/l10n/it.json @@ -1,7 +1,7 @@ { "translations": { "Added to the list of trusted servers" : "Aggiunto alla lista dei server affidabili", "Server is already in the list of trusted servers." : "Il server è già nell'elenco dei server affidabili.", - "No server to federate found" : "Non ho trovato nessun server per la federazione", + "No server to federate found" : "Non ho trovato alcun server per la federazione", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione consente di connettersi ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata.", diff --git a/apps/federation/l10n/pt_BR.js b/apps/federation/l10n/pt_BR.js index 0ff00394504..28032e7c33a 100644 --- a/apps/federation/l10n/pt_BR.js +++ b/apps/federation/l10n/pt_BR.js @@ -8,7 +8,7 @@ OC.L10N.register( "Federation" : "Associação", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite que você conecte com outros servidores confiáveis para trocar o diretório do usuário. Por exemplo, este atributo será usado para completar automaticamente usuários externos para compartilhamento federado.", "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito", - "Trusted Servers" : "Servidores Confiáveis", + "Trusted Servers" : "Servidores confiáveis", "+ Add ownCloud server" : "+ Adicionar servidor ownCloud", "ownCloud Server" : "Servidor ownCloud" }, diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json index f800a0334a3..75eb2b3989a 100644 --- a/apps/federation/l10n/pt_BR.json +++ b/apps/federation/l10n/pt_BR.json @@ -6,7 +6,7 @@ "Federation" : "Associação", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite que você conecte com outros servidores confiáveis para trocar o diretório do usuário. Por exemplo, este atributo será usado para completar automaticamente usuários externos para compartilhamento federado.", "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito", - "Trusted Servers" : "Servidores Confiáveis", + "Trusted Servers" : "Servidores confiáveis", "+ Add ownCloud server" : "+ Adicionar servidor ownCloud", "ownCloud Server" : "Servidor ownCloud" },"pluralForm" :"nplurals=2; plural=(n > 1);" diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index e8f88b17814..8ef62cbc126 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -25,11 +25,11 @@ OC.L10N.register( "Home" : "Home", "Close" : "Schließen", "Favorites" : "Favoriten", - "Upload cancelled." : "Upload abgebrochen.", + "Upload cancelled." : "Hochladen abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Du möchtest{size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", - "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", + "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "Uploading..." : "Hochladen…", "..." : "...", @@ -83,6 +83,7 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"], + "View in folder" : "In Ordner anzeigen", "Path" : "Pfad", "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 0e464014e4b..532aced68dc 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -23,11 +23,11 @@ "Home" : "Home", "Close" : "Schließen", "Favorites" : "Favoriten", - "Upload cancelled." : "Upload abgebrochen.", + "Upload cancelled." : "Hochladen abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Du möchtest{size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", - "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen von \"{fileName}\": {message}", + "Error uploading file \"{fileName}\": {message}" : "Fehler beim Hochladen der Datei \"{fileName}\": {message}", "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.", "Uploading..." : "Hochladen…", "..." : "...", @@ -81,6 +81,7 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"], + "View in folder" : "In Ordner anzeigen", "Path" : "Pfad", "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"], "Favorited" : "Favorisiert", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 6a2f0ab1f59..8be185156f8 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -22,10 +22,10 @@ OC.L10N.register( "Files" : "Dateien", "All files" : "Alle Dateien", "File could not be found" : "Datei konnte nicht gefunden werden", - "Home" : "Zuhause", + "Home" : "Home", "Close" : "Schließen", "Favorites" : "Favoriten", - "Upload cancelled." : "Upload abgebrochen.", + "Upload cancelled." : "Hochladen abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", @@ -55,8 +55,8 @@ OC.L10N.register( "Unable to determine date" : "Datum konnte nicht ermittelt werden", "This operation is forbidden" : "Diese Operation ist nicht erlaubt", "This directory is unavailable, please check the logs or contact the administrator" : "Dieses Verzeichnis ist nicht verfügbar, bitte überprüfen Sie die Logdateien oder kontaktieren Sie den Administrator", - "Could not move \"{file}\", target exists" : "Die Datei konnte nicht verschoben werden \"{file}\", da die Datei im Zielordner bereits existiert", - "Could not move \"{file}\"" : "Die Datei konnte nicht verschoben werden \"{file}\"", + "Could not move \"{file}\", target exists" : "\"{file}\" konnte nicht verschoben werden, Ziel existiert bereits", + "Could not move \"{file}\"" : "\"{file}\" konnte nicht verschoben werden", "{newName} already exists" : "{newName} existiert bereits", "Could not rename \"{fileName}\", it does not exist any more" : "Die Datei konnte nicht umbennant werden \"{fileName}\", da die Datei nicht mehr existiert", "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Der Name „{targetName}“ wird bereits im Ordner „{dir}“ benutzt. Bitte wählen Sie einen anderen Namen.", @@ -83,6 +83,7 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"], + "View in folder" : "In Ordner anzeigen", "Path" : "Pfad", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index 047299f9510..d96cbf265db 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -20,10 +20,10 @@ "Files" : "Dateien", "All files" : "Alle Dateien", "File could not be found" : "Datei konnte nicht gefunden werden", - "Home" : "Zuhause", + "Home" : "Home", "Close" : "Schließen", "Favorites" : "Favoriten", - "Upload cancelled." : "Upload abgebrochen.", + "Upload cancelled." : "Hochladen abgebrochen.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist", "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.", @@ -53,8 +53,8 @@ "Unable to determine date" : "Datum konnte nicht ermittelt werden", "This operation is forbidden" : "Diese Operation ist nicht erlaubt", "This directory is unavailable, please check the logs or contact the administrator" : "Dieses Verzeichnis ist nicht verfügbar, bitte überprüfen Sie die Logdateien oder kontaktieren Sie den Administrator", - "Could not move \"{file}\", target exists" : "Die Datei konnte nicht verschoben werden \"{file}\", da die Datei im Zielordner bereits existiert", - "Could not move \"{file}\"" : "Die Datei konnte nicht verschoben werden \"{file}\"", + "Could not move \"{file}\", target exists" : "\"{file}\" konnte nicht verschoben werden, Ziel existiert bereits", + "Could not move \"{file}\"" : "\"{file}\" konnte nicht verschoben werden", "{newName} already exists" : "{newName} existiert bereits", "Could not rename \"{fileName}\", it does not exist any more" : "Die Datei konnte nicht umbennant werden \"{fileName}\", da die Datei nicht mehr existiert", "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "Der Name „{targetName}“ wird bereits im Ordner „{dir}“ benutzt. Bitte wählen Sie einen anderen Namen.", @@ -81,6 +81,7 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"], + "View in folder" : "In Ordner anzeigen", "Path" : "Pfad", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorisiert", diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index bf0b9b54503..8298218481c 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -83,6 +83,7 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El almacén de {owner} está casi lleno en un ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"], + "View in folder" : "Ver en carpeta", "Path" : "Ruta", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index d623ed90c96..d6b1e78079e 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -81,6 +81,7 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El almacén de {owner} está casi lleno en un ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"], + "View in folder" : "Ver en carpeta", "Path" : "Ruta", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Agregado a Favoritos", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 9ca03c43a01..49f5204c977 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -83,6 +83,7 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "L'espace de stockage de {owner} est presque plein ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["correspond à '{filter}'","correspondent à '{filter}'"], + "View in folder" : "Voir dans le dossier", "Path" : "Chemin", "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Favorited" : "Marqué comme favori", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index 8090edb3d21..e0b5dba2186 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -81,6 +81,7 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "L'espace de stockage de {owner} est presque plein ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["correspond à '{filter}'","correspondent à '{filter}'"], + "View in folder" : "Voir dans le dossier", "Path" : "Chemin", "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Favorited" : "Marqué comme favori", diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index b560e6623ca..e5d5af78da8 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -83,6 +83,7 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione di {owner} è quasi pieno ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"], + "View in folder" : "Visualizza nella cartella", "Path" : "Percorso", "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 253fc5198aa..ee54db3a21f 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -81,6 +81,7 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione di {owner} è quasi pieno ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"], + "View in folder" : "Visualizza nella cartella", "Path" : "Percorso", "_%n byte_::_%n bytes_" : ["%n byte","%n byte"], "Favorited" : "Preferiti", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index 898a34946ab..44b46861fed 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -83,6 +83,7 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Opslagruimte van {owner} zit bijna vol ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Je opslagruimte zit bijna vol ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["komt overeen met '{filter}'","komen overeen met '{filter}'"], + "View in folder" : "Bekijken in map", "Path" : "Pad", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favoriet", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index c9ab8330281..29a1bada1ca 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -81,6 +81,7 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Opslagruimte van {owner} zit bijna vol ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Je opslagruimte zit bijna vol ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["komt overeen met '{filter}'","komen overeen met '{filter}'"], + "View in folder" : "Bekijken in map", "Path" : "Pad", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favoriet", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index 7bc2a94deb1..ab1ad524f5e 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -2,9 +2,9 @@ OC.L10N.register( "files", { "Storage not available" : "Armazanamento não disponÃvel", - "Storage invalid" : "Armazenamento invávilido", + "Storage invalid" : "Armazenamento inválido", "Unknown error" : "Erro desconhecido", - "Unable to set upload directory." : "ImpossÃvel configurar o diretório de envio", + "Unable to set upload directory." : "Não é possÃvel configurar o diretório de envio.", "Invalid Token" : "Token inválido", "No file was uploaded. Unknown error" : "Nenhum arquivo foi enviado. Erro desconhecido", "There is no error, the file uploaded with success" : "Sem erros, o arquivo foi enviado com sucesso", @@ -83,6 +83,7 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Armazenamento do {owner} está quase cheio ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"], + "View in folder" : "Exibir na pasta", "Path" : "Caminho", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorito", @@ -97,30 +98,30 @@ OC.L10N.register( "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limite de notificações sobre a criação e alterações em seus <strong>arquivos favoritos</strong> <em>(apenas Stream)</em>", "A file or folder has been <strong>deleted</strong>" : "Um arquivo ou pasta foi <strong>excluÃdo</strong>", - "A file or folder has been <strong>restored</strong>" : "Um arquivo ou pasta foi <strong>restautado</strong>", + "A file or folder has been <strong>restored</strong>" : "Um arquivo ou pasta foi <strong>restaurado</strong>", "You created %1$s" : "Você criou %1$s", "%2$s created %1$s" : "%2$s criou %1$s", "%1$s was created in a public folder" : "%1$s foi criado em uma pasta pública", "You changed %1$s" : "Você modificou %1$s", "%2$s changed %1$s" : "%2$s modificou %1$s", "You deleted %1$s" : "Você excluiu %1$s ", - "%2$s deleted %1$s" : "%2$s eliminou %1$s", + "%2$s deleted %1$s" : "%2$s excluiu %1$s", "You restored %1$s" : "Você restaurou %1$s", "%2$s restored %1$s" : "%2$s restaurou %1$s", "Changed by %2$s" : "Modificado por %2$s", - "Deleted by %2$s" : "Deletado por %2$s", + "Deleted by %2$s" : "ExcluÃdo por %2$s", "Restored by %2$s" : "Restaurado por %2$s", "Upload (max. %s)" : "Envio (max. %s)", - "File handling" : "Tratamento de Arquivo", + "File handling" : "Tratamento de arquivo", "Maximum upload size" : "Tamanho máximo para envio", "max. possible: " : "max. possÃvel:", "Save" : "Salvar", "With PHP-FPM it might take 5 minutes for changes to be applied." : "Com PHP-FPM pode demorar 5 minutos para que as alterações sejam aplicadas.", "Missing permissions to edit from here." : "Faltando permissões para editar a partir daqui.", "Settings" : "Configurações", - "Show hidden files" : "Mostrar arquivos escondidos", + "Show hidden files" : "Mostrar arquivos ocultos", "WebDAV" : "WebDAV", - "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus Arquivos via WebDAV</a>", + "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus arquivos via WebDAV</a>", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index f16c8c374a6..14994bdd2fb 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -1,8 +1,8 @@ { "translations": { "Storage not available" : "Armazanamento não disponÃvel", - "Storage invalid" : "Armazenamento invávilido", + "Storage invalid" : "Armazenamento inválido", "Unknown error" : "Erro desconhecido", - "Unable to set upload directory." : "ImpossÃvel configurar o diretório de envio", + "Unable to set upload directory." : "Não é possÃvel configurar o diretório de envio.", "Invalid Token" : "Token inválido", "No file was uploaded. Unknown error" : "Nenhum arquivo foi enviado. Erro desconhecido", "There is no error, the file uploaded with success" : "Sem erros, o arquivo foi enviado com sucesso", @@ -81,6 +81,7 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Armazenamento do {owner} está quase cheio ({usedSpacePercent}%)", "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"], + "View in folder" : "Exibir na pasta", "Path" : "Caminho", "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"], "Favorited" : "Favorito", @@ -95,30 +96,30 @@ "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>", "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limite de notificações sobre a criação e alterações em seus <strong>arquivos favoritos</strong> <em>(apenas Stream)</em>", "A file or folder has been <strong>deleted</strong>" : "Um arquivo ou pasta foi <strong>excluÃdo</strong>", - "A file or folder has been <strong>restored</strong>" : "Um arquivo ou pasta foi <strong>restautado</strong>", + "A file or folder has been <strong>restored</strong>" : "Um arquivo ou pasta foi <strong>restaurado</strong>", "You created %1$s" : "Você criou %1$s", "%2$s created %1$s" : "%2$s criou %1$s", "%1$s was created in a public folder" : "%1$s foi criado em uma pasta pública", "You changed %1$s" : "Você modificou %1$s", "%2$s changed %1$s" : "%2$s modificou %1$s", "You deleted %1$s" : "Você excluiu %1$s ", - "%2$s deleted %1$s" : "%2$s eliminou %1$s", + "%2$s deleted %1$s" : "%2$s excluiu %1$s", "You restored %1$s" : "Você restaurou %1$s", "%2$s restored %1$s" : "%2$s restaurou %1$s", "Changed by %2$s" : "Modificado por %2$s", - "Deleted by %2$s" : "Deletado por %2$s", + "Deleted by %2$s" : "ExcluÃdo por %2$s", "Restored by %2$s" : "Restaurado por %2$s", "Upload (max. %s)" : "Envio (max. %s)", - "File handling" : "Tratamento de Arquivo", + "File handling" : "Tratamento de arquivo", "Maximum upload size" : "Tamanho máximo para envio", "max. possible: " : "max. possÃvel:", "Save" : "Salvar", "With PHP-FPM it might take 5 minutes for changes to be applied." : "Com PHP-FPM pode demorar 5 minutos para que as alterações sejam aplicadas.", "Missing permissions to edit from here." : "Faltando permissões para editar a partir daqui.", "Settings" : "Configurações", - "Show hidden files" : "Mostrar arquivos escondidos", + "Show hidden files" : "Mostrar arquivos ocultos", "WebDAV" : "WebDAV", - "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus Arquivos via WebDAV</a>", + "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">para acessar seus arquivos via WebDAV</a>", "No files in here" : "Nenhum arquivo aqui", "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!", "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 3bb4e0c95e8..ab5f5eb260a 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -25,6 +25,7 @@ OC.L10N.register( "You can upload into this folder" : "In diesen Ordner kann hochgeladen werden", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-URL", + "No expiration date set" : "Kein Ablaufdatum gesetzt", "Shared by" : "Geteilt von ", "Sharing" : "Teilen", "Share API is disabled" : "Teilen-API ist deaktivert", @@ -95,6 +96,7 @@ OC.L10N.register( "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", "Share time" : "Freigabezeitpunkt", + "Expiration date" : "Ablaufdatum", "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", "Reasons might be:" : "Gründe könnten sein:", "the item was removed" : "Das Element wurde entfernt", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 4bb6907296d..3182de46a9d 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -23,6 +23,7 @@ "You can upload into this folder" : "In diesen Ordner kann hochgeladen werden", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-URL", + "No expiration date set" : "Kein Ablaufdatum gesetzt", "Shared by" : "Geteilt von ", "Sharing" : "Teilen", "Share API is disabled" : "Teilen-API ist deaktivert", @@ -93,6 +94,7 @@ "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", "Share time" : "Freigabezeitpunkt", + "Expiration date" : "Ablaufdatum", "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", "Reasons might be:" : "Gründe könnten sein:", "the item was removed" : "Das Element wurde entfernt", diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index b99e2790adb..3f356a25db7 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -25,6 +25,7 @@ OC.L10N.register( "You can upload into this folder" : "Sie können in diesen Ordner hochladen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse", + "No expiration date set" : "Kein Ablaufdatum gesetzt", "Shared by" : "Geteilt von", "Sharing" : "Teilen", "Share API is disabled" : "Teilen-API ist deaktivert", @@ -95,6 +96,7 @@ OC.L10N.register( "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", "Share time" : "Freigabezeitpunkt", + "Expiration date" : "Ablaufdatum", "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", "Reasons might be:" : "Gründe könnten sein:", "the item was removed" : "Das Element wurde entfernt", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index d0966273524..8f73b866eb8 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -23,6 +23,7 @@ "You can upload into this folder" : "Sie können in diesen Ordner hochladen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse", + "No expiration date set" : "Kein Ablaufdatum gesetzt", "Shared by" : "Geteilt von", "Sharing" : "Teilen", "Share API is disabled" : "Teilen-API ist deaktivert", @@ -93,6 +94,7 @@ "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden", "Name" : "Name", "Share time" : "Freigabezeitpunkt", + "Expiration date" : "Ablaufdatum", "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", "Reasons might be:" : "Gründe könnten sein:", "the item was removed" : "Das Element wurde entfernt", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 8bb1afa8597..36e1eb69630 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -25,6 +25,7 @@ OC.L10N.register( "You can upload into this folder" : "Usted puede cargar en esta carpeta", "No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}", "Invalid ownCloud url" : "URL de ownCloud inválida", + "No expiration date set" : "No se ha establecido fecha de caducidad", "Shared by" : "Compartido por", "Sharing" : "Compartiendo", "Share API is disabled" : "El API de compartir está deshabilitado", @@ -95,6 +96,7 @@ OC.L10N.register( "No entries found in this folder" : "No hay entradas en esta carpeta", "Name" : "Nombre", "Share time" : "Compartido hace", + "Expiration date" : "Fecha de caducidad", "Sorry, this link doesn’t seem to work anymore." : "Vaya, este enlace parece que no volverá a funcionar.", "Reasons might be:" : "Las causas podrÃan ser:", "the item was removed" : "el elemento fue eliminado", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 4a6f0133c92..87810f3139e 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -23,6 +23,7 @@ "You can upload into this folder" : "Usted puede cargar en esta carpeta", "No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}", "Invalid ownCloud url" : "URL de ownCloud inválida", + "No expiration date set" : "No se ha establecido fecha de caducidad", "Shared by" : "Compartido por", "Sharing" : "Compartiendo", "Share API is disabled" : "El API de compartir está deshabilitado", @@ -93,6 +94,7 @@ "No entries found in this folder" : "No hay entradas en esta carpeta", "Name" : "Nombre", "Share time" : "Compartido hace", + "Expiration date" : "Fecha de caducidad", "Sorry, this link doesn’t seem to work anymore." : "Vaya, este enlace parece que no volverá a funcionar.", "Reasons might be:" : "Las causas podrÃan ser:", "the item was removed" : "el elemento fue eliminado", diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 52259e88e5b..2e632f1a9d4 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -25,6 +25,7 @@ OC.L10N.register( "You can upload into this folder" : "Vous pouvez téléverser dans ce dossier", "No ownCloud installation (7 or higher) found at {remote}" : "Aucune installation ownCloud (7 ou supérieur) trouvée sur {remote}", "Invalid ownCloud url" : "URL ownCloud non valide", + "No expiration date set" : "Aucune date d'expiration définie", "Shared by" : "Partagé par", "Sharing" : "Partage", "Share API is disabled" : "l'API de partage est désactivée", @@ -95,6 +96,7 @@ OC.L10N.register( "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", "Share time" : "Date de partage", + "Expiration date" : "Date d'expiration", "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais ce lien semble ne plus fonctionner.", "Reasons might be:" : "Les raisons peuvent être :", "the item was removed" : "l'élément a été supprimé", diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 66ea6fab370..3594a3a3301 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -23,6 +23,7 @@ "You can upload into this folder" : "Vous pouvez téléverser dans ce dossier", "No ownCloud installation (7 or higher) found at {remote}" : "Aucune installation ownCloud (7 ou supérieur) trouvée sur {remote}", "Invalid ownCloud url" : "URL ownCloud non valide", + "No expiration date set" : "Aucune date d'expiration définie", "Shared by" : "Partagé par", "Sharing" : "Partage", "Share API is disabled" : "l'API de partage est désactivée", @@ -93,6 +94,7 @@ "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", "Share time" : "Date de partage", + "Expiration date" : "Date d'expiration", "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais ce lien semble ne plus fonctionner.", "Reasons might be:" : "Les raisons peuvent être :", "the item was removed" : "l'élément a été supprimé", diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index af19da26a07..8d869b5a8f1 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -25,6 +25,7 @@ OC.L10N.register( "You can upload into this folder" : "Puoi caricare in questa cartella", "No ownCloud installation (7 or higher) found at {remote}" : "Nessuna installazione di ownCloud (7 o superiore) trovata su {remote}", "Invalid ownCloud url" : "URL di ownCloud non valido", + "No expiration date set" : "Nessuna data di scandenza impostata", "Shared by" : "Condiviso da", "Sharing" : "Condivisione", "Share API is disabled" : "API di condivisione disabilitate", @@ -95,6 +96,7 @@ OC.L10N.register( "No entries found in this folder" : "Nessuna voce trovata in questa cartella", "Name" : "Nome", "Share time" : "Tempo di condivisione", + "Expiration date" : "Data di scadenza", "Sorry, this link doesn’t seem to work anymore." : "Spiacenti, questo collegamento sembra non essere più attivo.", "Reasons might be:" : "I motivi potrebbero essere:", "the item was removed" : "l'elemento è stato rimosso", diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index 1e179170ea8..06c471326f6 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -23,6 +23,7 @@ "You can upload into this folder" : "Puoi caricare in questa cartella", "No ownCloud installation (7 or higher) found at {remote}" : "Nessuna installazione di ownCloud (7 o superiore) trovata su {remote}", "Invalid ownCloud url" : "URL di ownCloud non valido", + "No expiration date set" : "Nessuna data di scandenza impostata", "Shared by" : "Condiviso da", "Sharing" : "Condivisione", "Share API is disabled" : "API di condivisione disabilitate", @@ -93,6 +94,7 @@ "No entries found in this folder" : "Nessuna voce trovata in questa cartella", "Name" : "Nome", "Share time" : "Tempo di condivisione", + "Expiration date" : "Data di scadenza", "Sorry, this link doesn’t seem to work anymore." : "Spiacenti, questo collegamento sembra non essere più attivo.", "Reasons might be:" : "I motivi potrebbero essere:", "the item was removed" : "l'elemento è stato rimosso", diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 680a9d94bd4..2d50e1fcc97 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -25,6 +25,7 @@ OC.L10N.register( "You can upload into this folder" : "Je kunt uploaden naar deze map", "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}", "Invalid ownCloud url" : "Ongeldige ownCloud url", + "No expiration date set" : "Geen vervaldatum ingesteld", "Shared by" : "Gedeeld door", "Sharing" : "Delen", "Share API is disabled" : "Delen API is uitgeschakeld", @@ -95,6 +96,7 @@ OC.L10N.register( "No entries found in this folder" : "Niets gevonden in deze map", "Name" : "Naam", "Share time" : "Deel tijd", + "Expiration date" : "Vervaldatm", "Sorry, this link doesn’t seem to work anymore." : "Sorry, deze link lijkt niet meer in gebruik te zijn.", "Reasons might be:" : "Redenen kunnen zijn:", "the item was removed" : "bestand was verwijderd", diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 3170ab55186..505becb5c97 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -23,6 +23,7 @@ "You can upload into this folder" : "Je kunt uploaden naar deze map", "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}", "Invalid ownCloud url" : "Ongeldige ownCloud url", + "No expiration date set" : "Geen vervaldatum ingesteld", "Shared by" : "Gedeeld door", "Sharing" : "Delen", "Share API is disabled" : "Delen API is uitgeschakeld", @@ -93,6 +94,7 @@ "No entries found in this folder" : "Niets gevonden in deze map", "Name" : "Naam", "Share time" : "Deel tijd", + "Expiration date" : "Vervaldatm", "Sorry, this link doesn’t seem to work anymore." : "Sorry, deze link lijkt niet meer in gebruik te zijn.", "Reasons might be:" : "Redenen kunnen zijn:", "the item was removed" : "bestand was verwijderd", diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index dbe3db3dcfa..27e7d299e24 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -25,6 +25,7 @@ OC.L10N.register( "You can upload into this folder" : "Você não pode enviar arquivos para esta pasta", "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação ownCloud (7 ou superior) foi encontrada em {remote}", "Invalid ownCloud url" : "Url invalida para ownCloud", + "No expiration date set" : "Nenhuma data de expiração definida", "Shared by" : "Compartilhado por", "Sharing" : "Compartilhamento", "Share API is disabled" : "O compartilhamento de API está desabilitado.", @@ -95,6 +96,7 @@ OC.L10N.register( "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", "Name" : "Nome", "Share time" : "Data compartilhado", + "Expiration date" : "Data de expiração", "Sorry, this link doesn’t seem to work anymore." : "Desculpe, este link parece não mais funcionar.", "Reasons might be:" : "As razões podem ser:", "the item was removed" : "o item foi removido", diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 28396902ccb..9f2312967fe 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -23,6 +23,7 @@ "You can upload into this folder" : "Você não pode enviar arquivos para esta pasta", "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação ownCloud (7 ou superior) foi encontrada em {remote}", "Invalid ownCloud url" : "Url invalida para ownCloud", + "No expiration date set" : "Nenhuma data de expiração definida", "Shared by" : "Compartilhado por", "Sharing" : "Compartilhamento", "Share API is disabled" : "O compartilhamento de API está desabilitado.", @@ -93,6 +94,7 @@ "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta", "Name" : "Nome", "Share time" : "Data compartilhado", + "Expiration date" : "Data de expiração", "Sorry, this link doesn’t seem to work anymore." : "Desculpe, este link parece não mais funcionar.", "Reasons might be:" : "As razões podem ser:", "the item was removed" : "o item foi removido", diff --git a/apps/files_versions/l10n/de.js b/apps/files_versions/l10n/de.js index d49a168a029..3d57e67c5e4 100644 --- a/apps/files_versions/l10n/de.js +++ b/apps/files_versions/l10n/de.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Could not revert: %s" : "%s konnte nicht zurückgesetzt werden", "Versions" : "Versionen", - "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", + "Failed to revert {file} to revision {timestamp}." : "Konnte {file} nicht auf Revision {timestamp} zurücksetzen.", "Restore" : "Wiederherstellen", "No other versions available" : "Keine anderen Versionen verfügbar", "More versions..." : "Weitere Versionen…" diff --git a/apps/files_versions/l10n/de.json b/apps/files_versions/l10n/de.json index 8eff3bf1868..48f89677beb 100644 --- a/apps/files_versions/l10n/de.json +++ b/apps/files_versions/l10n/de.json @@ -1,7 +1,7 @@ { "translations": { "Could not revert: %s" : "%s konnte nicht zurückgesetzt werden", "Versions" : "Versionen", - "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", + "Failed to revert {file} to revision {timestamp}." : "Konnte {file} nicht auf Revision {timestamp} zurücksetzen.", "Restore" : "Wiederherstellen", "No other versions available" : "Keine anderen Versionen verfügbar", "More versions..." : "Weitere Versionen…" diff --git a/apps/files_versions/l10n/de_DE.js b/apps/files_versions/l10n/de_DE.js index d49a168a029..3d57e67c5e4 100644 --- a/apps/files_versions/l10n/de_DE.js +++ b/apps/files_versions/l10n/de_DE.js @@ -3,7 +3,7 @@ OC.L10N.register( { "Could not revert: %s" : "%s konnte nicht zurückgesetzt werden", "Versions" : "Versionen", - "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", + "Failed to revert {file} to revision {timestamp}." : "Konnte {file} nicht auf Revision {timestamp} zurücksetzen.", "Restore" : "Wiederherstellen", "No other versions available" : "Keine anderen Versionen verfügbar", "More versions..." : "Weitere Versionen…" diff --git a/apps/files_versions/l10n/de_DE.json b/apps/files_versions/l10n/de_DE.json index 8eff3bf1868..48f89677beb 100644 --- a/apps/files_versions/l10n/de_DE.json +++ b/apps/files_versions/l10n/de_DE.json @@ -1,7 +1,7 @@ { "translations": { "Could not revert: %s" : "%s konnte nicht zurückgesetzt werden", "Versions" : "Versionen", - "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.", + "Failed to revert {file} to revision {timestamp}." : "Konnte {file} nicht auf Revision {timestamp} zurücksetzen.", "Restore" : "Wiederherstellen", "No other versions available" : "Keine anderen Versionen verfügbar", "More versions..." : "Weitere Versionen…" diff --git a/apps/updatenotification/l10n/de.js b/apps/updatenotification/l10n/de.js index c92ff0a3515..a4d7b3062fd 100644 --- a/apps/updatenotification/l10n/de.js +++ b/apps/updatenotification/l10n/de.js @@ -2,10 +2,10 @@ OC.L10N.register( "updatenotification", { "Update notifications" : "Update-Benachrichtigungen", - "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", - "Updated channel" : "Aktualisierter Kanal", + "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierung.", + "Updated channel" : "Update-Kanal", "Nextcloud core" : "Nextcloud Kern", - "Update for %1$s to version %2$s is available." : "Ein Update für %1$s auf Version %2$s ist verfügbar.", + "Update for %1$s to version %2$s is available." : "Ein Update von %1$s auf Version %2$s ist verfügbar.", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", diff --git a/apps/updatenotification/l10n/de.json b/apps/updatenotification/l10n/de.json index 640bcd27968..73a8e89d1c1 100644 --- a/apps/updatenotification/l10n/de.json +++ b/apps/updatenotification/l10n/de.json @@ -1,9 +1,9 @@ { "translations": { "Update notifications" : "Update-Benachrichtigungen", - "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", - "Updated channel" : "Aktualisierter Kanal", + "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierung.", + "Updated channel" : "Update-Kanal", "Nextcloud core" : "Nextcloud Kern", - "Update for %1$s to version %2$s is available." : "Ein Update für %1$s auf Version %2$s ist verfügbar.", + "Update for %1$s to version %2$s is available." : "Ein Update von %1$s auf Version %2$s ist verfügbar.", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", diff --git a/apps/updatenotification/l10n/de_DE.js b/apps/updatenotification/l10n/de_DE.js index cb0f4eef9ba..332f31cea33 100644 --- a/apps/updatenotification/l10n/de_DE.js +++ b/apps/updatenotification/l10n/de_DE.js @@ -2,14 +2,14 @@ OC.L10N.register( "updatenotification", { "Update notifications" : "Update-Benachrichtigungen", - "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", - "Updated channel" : "Aktualisierter Kanal", + "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierung.", + "Updated channel" : "Update-Kanal", "Nextcloud core" : "Nextcloud Kern", - "Update for %1$s to version %2$s is available." : "Ein Update für %1$s auf Version %2$s ist verfügbar.", + "Update for %1$s to version %2$s is available." : "Ein Update von %1$s auf Version %2$s ist verfügbar.", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", - "Your version is up to date." : "Die neuste Version ist installiert.", + "Your version is up to date." : "Ihre Version ist aktuell.", "Checked on %s" : "Ãœberprüft auf %s", "Update channel:" : "Update-Kanal:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Sie können immer auf eine neuere Version / experimentellen Kanal updaten, aber kein Downgrade auf einen stabileren Kanal durchführen.", diff --git a/apps/updatenotification/l10n/de_DE.json b/apps/updatenotification/l10n/de_DE.json index aa38d41b6a9..5dc8c420889 100644 --- a/apps/updatenotification/l10n/de_DE.json +++ b/apps/updatenotification/l10n/de_DE.json @@ -1,13 +1,13 @@ { "translations": { "Update notifications" : "Update-Benachrichtigungen", - "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierungen.", - "Updated channel" : "Aktualisierter Kanal", + "{version} is available. Get more information on how to update." : "{version} ist verfügbar. Weitere Informationen zur Aktualisierung.", + "Updated channel" : "Update-Kanal", "Nextcloud core" : "Nextcloud Kern", - "Update for %1$s to version %2$s is available." : "Ein Update für %1$s auf Version %2$s ist verfügbar.", + "Update for %1$s to version %2$s is available." : "Ein Update von %1$s auf Version %2$s ist verfügbar.", "Updater" : "Updater", "A new version is available: %s" : "Eine neue Version ist verfügbar: %s", "Open updater" : "Updater aufrufen", - "Your version is up to date." : "Die neuste Version ist installiert.", + "Your version is up to date." : "Ihre Version ist aktuell.", "Checked on %s" : "Ãœberprüft auf %s", "Update channel:" : "Update-Kanal:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Sie können immer auf eine neuere Version / experimentellen Kanal updaten, aber kein Downgrade auf einen stabileren Kanal durchführen.", diff --git a/apps/updatenotification/l10n/pt_BR.js b/apps/updatenotification/l10n/pt_BR.js index 025930335c1..d606b4278e7 100644 --- a/apps/updatenotification/l10n/pt_BR.js +++ b/apps/updatenotification/l10n/pt_BR.js @@ -9,7 +9,7 @@ OC.L10N.register( "Updater" : "Atualizador", "A new version is available: %s" : "Uma nova versão está disponÃvel: %s", "Open updater" : "Abrir o atualizador", - "Your version is up to date." : "Sua versão está atualizada", + "Your version is up to date." : "Sua versão está atualizada.", "Checked on %s" : "Verificada em %s", "Update channel:" : "Atualização do canal:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Você pode sempre atualizar para uma versão / canal experimental mais recente. Mas você nunca pode voltar para um canal mais estável.", diff --git a/apps/updatenotification/l10n/pt_BR.json b/apps/updatenotification/l10n/pt_BR.json index 3638b5703fe..02da300a086 100644 --- a/apps/updatenotification/l10n/pt_BR.json +++ b/apps/updatenotification/l10n/pt_BR.json @@ -7,7 +7,7 @@ "Updater" : "Atualizador", "A new version is available: %s" : "Uma nova versão está disponÃvel: %s", "Open updater" : "Abrir o atualizador", - "Your version is up to date." : "Sua versão está atualizada", + "Your version is up to date." : "Sua versão está atualizada.", "Checked on %s" : "Verificada em %s", "Update channel:" : "Atualização do canal:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Você pode sempre atualizar para uma versão / canal experimental mais recente. Mas você nunca pode voltar para um canal mais estável.", diff --git a/core/l10n/ca.js b/core/l10n/ca.js index 59bef89734d..6b8f700dd42 100644 --- a/core/l10n/ca.js +++ b/core/l10n/ca.js @@ -1,11 +1,13 @@ OC.L10N.register( "core", { + "Please select a file." : "Seleccioneu un fitxer.", "File is too big" : "El fitxer és massa gran", "Invalid file provided" : "L'arxiu proporcionat no és và lid", "No image or file provided" : "No s'han proporcionat imatges o fitxers", "Unknown filetype" : "Tipus de fitxer desconegut", "Invalid image" : "Imatge no và lida", + "An error occurred. Please contact your admin." : "Hi ha hagut un error. Contacteu amb l'administrador.", "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho", "No crop data provided" : "No heu proporcionat dades del retall", "No valid crop data provided" : "Les dades del retall proporcionades no són và lides", diff --git a/core/l10n/ca.json b/core/l10n/ca.json index 9b6f4664e49..6b0dc3ad502 100644 --- a/core/l10n/ca.json +++ b/core/l10n/ca.json @@ -1,9 +1,11 @@ { "translations": { + "Please select a file." : "Seleccioneu un fitxer.", "File is too big" : "El fitxer és massa gran", "Invalid file provided" : "L'arxiu proporcionat no és và lid", "No image or file provided" : "No s'han proporcionat imatges o fitxers", "Unknown filetype" : "Tipus de fitxer desconegut", "Invalid image" : "Imatge no và lida", + "An error occurred. Please contact your admin." : "Hi ha hagut un error. Contacteu amb l'administrador.", "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho", "No crop data provided" : "No heu proporcionat dades del retall", "No valid crop data provided" : "Les dades del retall proporcionades no són và lides", diff --git a/core/l10n/de.js b/core/l10n/de.js index b8cd48a3ff2..b11e4d1da78 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -23,7 +23,7 @@ OC.L10N.register( "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter", "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter", "Error untagging" : "Fehler beim Entfernen der Schlagwörter", - "Error favoriting" : "Fehler beim Favorisieren", + "Error favoriting" : "Fehler beim Hinzufügen zu den Favoriten", "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten", "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail versandt werden: %s", "Preparing update" : "Update vorbereiten", @@ -47,9 +47,9 @@ OC.L10N.register( "Reset log level" : "Ursprüngliches Log-Level wiederhergestellt", "Starting code integrity check" : "Code-Integrität wird überprüft", "Finished code integrity check" : "Code-Integritätsprüfung abgeschlossen", - "%s (3rdparty)" : "%s (3rdparty)", - "%s (incompatible)" : "%s (nicht kompatibel)", - "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", + "%s (3rdparty)" : "%s (Drittanbieter)", + "%s (incompatible)" : "%s (inkompatibel)", + "Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s", "Already up to date" : "Bereits aktuell", "Sunday" : "Sonntag", "Monday" : "Montag", @@ -118,7 +118,7 @@ OC.L10N.register( "New Files" : "Neue Dateien", "Already existing files" : "Bereits existierende Dateien", "Which files do you want to keep?" : "Welche Dateien sollen erhalten bleiben?", - "If you select both versions, the copied file will have a number added to its name." : "Falls beide Versionen gewählt werden, wird bei der kopierten Datei eine Zahl am Ende des Dateinamens ergänzt.", + "If you select both versions, the copied file will have a number added to its name." : "Falls beide Versionen gewählt werden, wird bei der kopierten Datei eine Zahl am Ende des Dateinamens hinzugefügt", "Cancel" : "Abbrechen", "Continue" : "Fortsetzen", "(all selected)" : "(Alle ausgewählt)", @@ -126,7 +126,7 @@ OC.L10N.register( "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage", "Very weak password" : "Sehr schwaches Passwort", "Weak password" : "Schwaches Passwort", - "So-so password" : "Durchschnittliches Passwort", + "So-so password" : "Passables Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich nicht funktioniert.", @@ -316,7 +316,7 @@ OC.L10N.register( "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen können Sie stattdessen den folgenden Befehl in Ihrem Installationsverzeichnis ausführen:", "Detailed logs" : "Detaillierte Fehlermeldungen", "Update needed" : "Update wird benötigt", - "Please use the command line updater because you have a big instance." : "Da Sie eine grosse Instanz nutzen, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.", + "Please use the command line updater because you have a big instance." : "Da Du eine grosse Instanz nutzt, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schaue bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." diff --git a/core/l10n/de.json b/core/l10n/de.json index d31b856ef7f..a96747b11e3 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -21,7 +21,7 @@ "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter", "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter", "Error untagging" : "Fehler beim Entfernen der Schlagwörter", - "Error favoriting" : "Fehler beim Favorisieren", + "Error favoriting" : "Fehler beim Hinzufügen zu den Favoriten", "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten", "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail versandt werden: %s", "Preparing update" : "Update vorbereiten", @@ -45,9 +45,9 @@ "Reset log level" : "Ursprüngliches Log-Level wiederhergestellt", "Starting code integrity check" : "Code-Integrität wird überprüft", "Finished code integrity check" : "Code-Integritätsprüfung abgeschlossen", - "%s (3rdparty)" : "%s (3rdparty)", - "%s (incompatible)" : "%s (nicht kompatibel)", - "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", + "%s (3rdparty)" : "%s (Drittanbieter)", + "%s (incompatible)" : "%s (inkompatibel)", + "Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s", "Already up to date" : "Bereits aktuell", "Sunday" : "Sonntag", "Monday" : "Montag", @@ -116,7 +116,7 @@ "New Files" : "Neue Dateien", "Already existing files" : "Bereits existierende Dateien", "Which files do you want to keep?" : "Welche Dateien sollen erhalten bleiben?", - "If you select both versions, the copied file will have a number added to its name." : "Falls beide Versionen gewählt werden, wird bei der kopierten Datei eine Zahl am Ende des Dateinamens ergänzt.", + "If you select both versions, the copied file will have a number added to its name." : "Falls beide Versionen gewählt werden, wird bei der kopierten Datei eine Zahl am Ende des Dateinamens hinzugefügt", "Cancel" : "Abbrechen", "Continue" : "Fortsetzen", "(all selected)" : "(Alle ausgewählt)", @@ -124,7 +124,7 @@ "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage", "Very weak password" : "Sehr schwaches Passwort", "Weak password" : "Schwaches Passwort", - "So-so password" : "Durchschnittliches Passwort", + "So-so password" : "Passables Passwort", "Good password" : "Gutes Passwort", "Strong password" : "Starkes Passwort", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich nicht funktioniert.", @@ -314,7 +314,7 @@ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen können Sie stattdessen den folgenden Befehl in Ihrem Installationsverzeichnis ausführen:", "Detailed logs" : "Detaillierte Fehlermeldungen", "Update needed" : "Update wird benötigt", - "Please use the command line updater because you have a big instance." : "Da Sie eine grosse Instanz nutzen, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.", + "Please use the command line updater because you have a big instance." : "Da Du eine grosse Instanz nutzt, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schaue bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 8efa5bf393c..5f537b934b0 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -49,7 +49,7 @@ OC.L10N.register( "Finished code integrity check" : "Code-Integritätsprüfung abgeschlossen", "%s (3rdparty)" : "%s (Drittanbieter)", "%s (incompatible)" : "%s (inkompatibel)", - "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", + "Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s", "Already up to date" : "Bereits aktuell", "Sunday" : "Sonntag", "Monday" : "Montag", @@ -96,7 +96,7 @@ OC.L10N.register( "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Dez.", - "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Information...</a>", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Informationen...</a>", "Settings" : "Einstellungen", "Problem loading page, reloading in 5 seconds" : "Problem beim Laden der Seite, Seite wird in 5 Sekunden nochmals geladen", "Saving..." : "Speichervorgang…", @@ -316,7 +316,7 @@ OC.L10N.register( "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen können Sie stattdessen den folgenden Befehl in Ihrem Installationsverzeichnis ausführen:", "Detailed logs" : "Detaillierte Fehlermeldungen", "Update needed" : "Update erforderlich", - "Please use the command line updater because you have a big instance." : "Da Sie eine große Instanz von Nextcloud besitzt, nutzen Sie bitte den Updater über die Kommandozeile.", + "Please use the command line updater because you have a big instance." : "Da Sie eine große Instanz von Nextcloud besitzen, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schauen Sie bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 6bcd79e7561..537feca57ea 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -47,7 +47,7 @@ "Finished code integrity check" : "Code-Integritätsprüfung abgeschlossen", "%s (3rdparty)" : "%s (Drittanbieter)", "%s (incompatible)" : "%s (inkompatibel)", - "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s", + "Following apps have been disabled: %s" : "Die folgenden Apps wurden deaktiviert: %s", "Already up to date" : "Bereits aktuell", "Sunday" : "Sonntag", "Monday" : "Montag", @@ -94,7 +94,7 @@ "Oct." : "Okt.", "Nov." : "Nov.", "Dec." : "Dez.", - "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Information...</a>", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Informationen...</a>", "Settings" : "Einstellungen", "Problem loading page, reloading in 5 seconds" : "Problem beim Laden der Seite, Seite wird in 5 Sekunden nochmals geladen", "Saving..." : "Speichervorgang…", @@ -314,7 +314,7 @@ "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen können Sie stattdessen den folgenden Befehl in Ihrem Installationsverzeichnis ausführen:", "Detailed logs" : "Detaillierte Fehlermeldungen", "Update needed" : "Update erforderlich", - "Please use the command line updater because you have a big instance." : "Da Sie eine große Instanz von Nextcloud besitzt, nutzen Sie bitte den Updater über die Kommandozeile.", + "Please use the command line updater because you have a big instance." : "Da Sie eine große Instanz von Nextcloud besitzen, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.", "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schauen Sie bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.", "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist." diff --git a/core/l10n/it.js b/core/l10n/it.js index 376997f8337..c5c41c73eea 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -47,7 +47,7 @@ OC.L10N.register( "Reset log level" : "Ripristina il livello del log", "Starting code integrity check" : "Avvio del controllo di integrità del codice", "Finished code integrity check" : "Controllo di integrità del codice terminato", - "%s (3rdparty)" : "%s (Terze parti)", + "%s (3rdparty)" : "%s (terze parti)", "%s (incompatible)" : "%s (incompatibile)", "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s", "Already up to date" : "Già aggiornato", diff --git a/core/l10n/it.json b/core/l10n/it.json index 6ef5c885ad5..0db226241f7 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -45,7 +45,7 @@ "Reset log level" : "Ripristina il livello del log", "Starting code integrity check" : "Avvio del controllo di integrità del codice", "Finished code integrity check" : "Controllo di integrità del codice terminato", - "%s (3rdparty)" : "%s (Terze parti)", + "%s (3rdparty)" : "%s (terze parti)", "%s (incompatible)" : "%s (incompatibile)", "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s", "Already up to date" : "Già aggiornato", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 650d1d83058..dd665a2abc5 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -15,7 +15,7 @@ OC.L10N.register( "Federated Cloud Sharing" : "Federated-Cloud-Sharing", "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebssystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfe Deine Logdateien (Fehler: %s)", - "Migration Completed" : "Migration komplett", + "Migration Completed" : "Migration abgeschlossen", "Group already exists." : "Gruppe existiert bereits.", "Unable to add group." : "Gruppe konnte nicht angelegt werden.", "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.", @@ -110,6 +110,7 @@ OC.L10N.register( "never" : "niemals", "deleted {userName}" : "{userName} gelöscht", "add group" : "Gruppe hinzufügen", + "Invalid quota value \"{val}\"" : "Ungültiger Grenzwert \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zu Datenverlust, weil die Datenwiederherstellung für diesen Benutzer nicht verfügbar ist", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Error creating user: {message}" : "Fehler beim Anlegen des Benutzers: {message}", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 8485a052889..198cc5f4d13 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -13,7 +13,7 @@ "Federated Cloud Sharing" : "Federated-Cloud-Sharing", "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebssystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.", "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfe Deine Logdateien (Fehler: %s)", - "Migration Completed" : "Migration komplett", + "Migration Completed" : "Migration abgeschlossen", "Group already exists." : "Gruppe existiert bereits.", "Unable to add group." : "Gruppe konnte nicht angelegt werden.", "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.", @@ -108,6 +108,7 @@ "never" : "niemals", "deleted {userName}" : "{userName} gelöscht", "add group" : "Gruppe hinzufügen", + "Invalid quota value \"{val}\"" : "Ungültiger Grenzwert \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zu Datenverlust, weil die Datenwiederherstellung für diesen Benutzer nicht verfügbar ist", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Error creating user: {message}" : "Fehler beim Anlegen des Benutzers: {message}", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index fbc467343a8..b81ae769905 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -110,6 +110,7 @@ OC.L10N.register( "never" : "niemals", "deleted {userName}" : "{userName} gelöscht", "add group" : "Gruppe hinzufügen", + "Invalid quota value \"{val}\"" : "Ungültiger Grenzwert \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zu Datenverlust, weil die Datenwiederherstellung für diesen Benutzer nicht verfügbar ist", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Error creating user: {message}" : "Fehler beim Erstellen eines Benutzers: {message}", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 3ee110e923d..d2eddf12053 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -108,6 +108,7 @@ "never" : "niemals", "deleted {userName}" : "{userName} gelöscht", "add group" : "Gruppe hinzufügen", + "Invalid quota value \"{val}\"" : "Ungültiger Grenzwert \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Die Änderung des Passworts führt zu Datenverlust, weil die Datenwiederherstellung für diesen Benutzer nicht verfügbar ist", "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", "Error creating user: {message}" : "Fehler beim Erstellen eines Benutzers: {message}", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 0743f8c346e..339ae36549b 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -110,6 +110,7 @@ OC.L10N.register( "never" : "nunca", "deleted {userName}" : "borrado {userName}", "add group" : "añadir grupo", + "Invalid quota value \"{val}\"" : "Valor de cuota inválido \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar la contraseña provocará pérdida de datos porque la recuperación de datos no está disponible para este usuario", "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido", "Error creating user: {message}" : "Error creando el usuario: {message}", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 17deeab3456..81e4bd3e762 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -108,6 +108,7 @@ "never" : "nunca", "deleted {userName}" : "borrado {userName}", "add group" : "añadir grupo", + "Invalid quota value \"{val}\"" : "Valor de cuota inválido \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Cambiar la contraseña provocará pérdida de datos porque la recuperación de datos no está disponible para este usuario", "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido", "Error creating user: {message}" : "Error creando el usuario: {message}", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index a541eeda863..ccd40e46686 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -110,6 +110,7 @@ OC.L10N.register( "never" : "jamais", "deleted {userName}" : "{userName} supprimé", "add group" : "ajouter un groupe", + "Invalid quota value \"{val}\"" : "Valeur de quota invalide \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "La modification du mot de passe entrainera la perte des données car la restauration de données n'est pas disponible pour cet utilisateur", "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi", "Error creating user: {message}" : "Erreur a la création d'un utilisateur : {message}", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 89e66e1c0c2..8ca1b537461 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -108,6 +108,7 @@ "never" : "jamais", "deleted {userName}" : "{userName} supprimé", "add group" : "ajouter un groupe", + "Invalid quota value \"{val}\"" : "Valeur de quota invalide \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "La modification du mot de passe entrainera la perte des données car la restauration de données n'est pas disponible pour cet utilisateur", "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi", "Error creating user: {message}" : "Erreur a la création d'un utilisateur : {message}", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 41a573fb3b5..4ce38d25e8e 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -110,6 +110,7 @@ OC.L10N.register( "never" : "mai", "deleted {userName}" : "{userName} eliminato", "add group" : "aggiungi gruppo", + "Invalid quota value \"{val}\"" : "Valore di quota \"{val}\" non valido", "Changing the password will result in data loss, because data recovery is not available for this user" : "Il cambiamento della password causerà una perdita di dati, poiché il ripristino dei dati non è disponibile per questo utente", "A valid username must be provided" : "Deve essere fornito un nome utente valido", "Error creating user: {message}" : "Errore durante la creazione dell'utente: {message}", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index 6cb53bd599c..47646259181 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -108,6 +108,7 @@ "never" : "mai", "deleted {userName}" : "{userName} eliminato", "add group" : "aggiungi gruppo", + "Invalid quota value \"{val}\"" : "Valore di quota \"{val}\" non valido", "Changing the password will result in data loss, because data recovery is not available for this user" : "Il cambiamento della password causerà una perdita di dati, poiché il ripristino dei dati non è disponibile per questo utente", "A valid username must be provided" : "Deve essere fornito un nome utente valido", "Error creating user: {message}" : "Errore durante la creazione dell'utente: {message}", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 185b63bd15e..aa7f91881b9 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -110,6 +110,7 @@ OC.L10N.register( "never" : "nunca", "deleted {userName}" : "eliminado {userName}", "add group" : "adicionar grupo", + "Invalid quota value \"{val}\"" : "Valor da quota inválido \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Trocar a senha irá resultar em perda de dados, porque recuperação de dados não está disponÃvel para este usuário", "A valid username must be provided" : "Forneça um nome de usuário válido", "Error creating user: {message}" : "Erro criando o usuário: {message}", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index 9c5e1f0eefb..9b6faf9349c 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -108,6 +108,7 @@ "never" : "nunca", "deleted {userName}" : "eliminado {userName}", "add group" : "adicionar grupo", + "Invalid quota value \"{val}\"" : "Valor da quota inválido \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Trocar a senha irá resultar em perda de dados, porque recuperação de dados não está disponÃvel para este usuário", "A valid username must be provided" : "Forneça um nome de usuário válido", "Error creating user: {message}" : "Erro criando o usuário: {message}", diff --git a/tests/lib/AppFramework/Controller/ApiControllerTest.php b/tests/lib/AppFramework/Controller/ApiControllerTest.php index 783eecf93e5..74231b8d6ac 100644 --- a/tests/lib/AppFramework/Controller/ApiControllerTest.php +++ b/tests/lib/AppFramework/Controller/ApiControllerTest.php @@ -32,27 +32,31 @@ class ChildApiController extends ApiController {}; class ApiControllerTest extends \Test\TestCase { - /** @var ChildApiController */ - protected $controller; - - public function testCors() { - $request = new Request( - ['server' => ['HTTP_ORIGIN' => 'test']], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') - ); - $this->controller = new ChildApiController('app', $request, 'verbs', - 'headers', 100); - - $response = $this->controller->preflightedCors(); - - $headers = $response->getHeaders(); - - $this->assertEquals('test', $headers['Access-Control-Allow-Origin']); - $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']); - $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']); - $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']); - $this->assertEquals(100, $headers['Access-Control-Max-Age']); - } + /** @var ChildApiController */ + protected $controller; + + public function testCors() { + $request = new Request( + ['server' => ['HTTP_ORIGIN' => 'test']], + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() + ); + $this->controller = new ChildApiController('app', $request, 'verbs', + 'headers', 100); + + $response = $this->controller->preflightedCors(); + + $headers = $response->getHeaders(); + + $this->assertEquals('test', $headers['Access-Control-Allow-Origin']); + $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']); + $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']); + $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']); + $this->assertEquals(100, $headers['Access-Control-Max-Age']); + } } diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index 521799a46ce..63cc2873575 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -76,12 +76,18 @@ class ControllerTest extends \Test\TestCase { 'session' => ['sezession' => 'kein'], 'method' => 'hi', ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); - $this->app = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', - array('getAppName'), array('test')); + $this->app = $this->getMockBuilder('OC\AppFramework\DependencyInjection\DIContainer') + ->setMethods(['getAppName']) + ->setConstructorArgs(['test']) + ->getMock(); $this->app->expects($this->any()) ->method('getAppName') ->will($this->returnValue('apptemplate_advanced')); diff --git a/tests/lib/AppFramework/Controller/OCSControllerTest.php b/tests/lib/AppFramework/Controller/OCSControllerTest.php index f69740d4496..7dcbd189cd5 100644 --- a/tests/lib/AppFramework/Controller/OCSControllerTest.php +++ b/tests/lib/AppFramework/Controller/OCSControllerTest.php @@ -33,9 +33,6 @@ class ChildOCSController extends OCSController {} class OCSControllerTest extends \Test\TestCase { - - private $controller; - public function testCors() { $request = new Request( [ @@ -43,8 +40,12 @@ class OCSControllerTest extends \Test\TestCase { 'HTTP_ORIGIN' => 'test', ], ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $controller = new ChildOCSController('app', $request, 'verbs', 'headers', 100); @@ -64,8 +65,12 @@ class OCSControllerTest extends \Test\TestCase { public function testXML() { $controller = new ChildOCSController('app', new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() )); $expected = "<?xml version=\"1.0\"?>\n" . "<ocs>\n" . @@ -96,8 +101,12 @@ class OCSControllerTest extends \Test\TestCase { public function testXMLDataResponse() { $controller = new ChildOCSController('app', new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() )); $expected = "<?xml version=\"1.0\"?>\n" . "<ocs>\n" . @@ -128,8 +137,12 @@ class OCSControllerTest extends \Test\TestCase { public function testJSON() { $controller = new ChildOCSController('app', new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() )); $expected = '{"ocs":{"meta":{"status":"failure","statuscode":400,"message":"OK",' . '"totalitems":"","itemsperpage":""},"data":{"test":"hi"}}}'; diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php index 5aa000fa25a..0edf96dd5a4 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php +++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php @@ -36,10 +36,13 @@ class DIContainerTest extends \Test\TestCase { protected function setUp(){ parent::setUp(); - $this->container = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', - ['isAdminUser'], ['name'] - ); - $this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi')); + $this->container = $this->getMockBuilder('OC\AppFramework\DependencyInjection\DIContainer') + ->setMethods(['isAdminUser']) + ->setConstructorArgs(['name']) + ->getMock(); + $this->api = $this->getMockBuilder('OC\AppFramework\Core\API') + ->setConstructorArgs(['hi']) + ->getMock(); } public function testProvidesAPI(){ @@ -75,8 +78,12 @@ class DIContainerTest extends \Test\TestCase { public function testMiddlewareDispatcherIncludesSecurityMiddleware(){ $this->container['Request'] = new Request( ['method' => 'GET'], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $security = $this->container['SecurityMiddleware']; $dispatcher = $this->container['MiddlewareDispatcher']; diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php index 6df6f7fa7fe..c2d73adfd7b 100644 --- a/tests/lib/AppFramework/Http/DispatcherTest.php +++ b/tests/lib/AppFramework/Http/DispatcherTest.php @@ -105,9 +105,11 @@ class DispatcherTest extends \Test\TestCase { '\OC\AppFramework\Middleware\MiddlewareDispatcher') ->disableOriginalConstructor() ->getMock(); - $this->controller = $this->getMock( - '\OCP\AppFramework\Controller', - array($this->controllerMethod), array($app, $request)); + $this->controller = $this->getMockBuilder( + '\OCP\AppFramework\Controller') + ->setMethods([$this->controllerMethod]) + ->setConstructorArgs([$app, $request]) + ->getMock(); $this->request = $this->getMockBuilder( '\OC\AppFramework\Http\Request') @@ -296,8 +298,12 @@ class DispatcherTest extends \Test\TestCase { ], 'method' => 'POST' ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $this->dispatcher = new Dispatcher( $this->http, $this->middlewareDispatcher, $this->reflector, @@ -323,8 +329,12 @@ class DispatcherTest extends \Test\TestCase { ], 'method' => 'POST', ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $this->dispatcher = new Dispatcher( $this->http, $this->middlewareDispatcher, $this->reflector, @@ -353,8 +363,12 @@ class DispatcherTest extends \Test\TestCase { ], 'method' => 'GET' ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $this->dispatcher = new Dispatcher( $this->http, $this->middlewareDispatcher, $this->reflector, @@ -382,8 +396,12 @@ class DispatcherTest extends \Test\TestCase { ], 'method' => 'GET' ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $this->dispatcher = new Dispatcher( $this->http, $this->middlewareDispatcher, $this->reflector, @@ -412,8 +430,12 @@ class DispatcherTest extends \Test\TestCase { ], 'method' => 'PUT' ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $this->dispatcher = new Dispatcher( $this->http, $this->middlewareDispatcher, $this->reflector, @@ -444,8 +466,12 @@ class DispatcherTest extends \Test\TestCase { ], 'method' => 'POST' ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock() ); $this->dispatcher = new Dispatcher( $this->http, $this->middlewareDispatcher, $this->reflector, diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php index 1f761d6b89c..c082b36e0ac 100644 --- a/tests/lib/AppFramework/Http/StreamResponseTest.php +++ b/tests/lib/AppFramework/Http/StreamResponseTest.php @@ -37,7 +37,9 @@ class StreamResponseTest extends \Test\TestCase { protected function setUp() { parent::setUp(); - $this->output = $this->getMock('OCP\\AppFramework\\Http\\IOutput'); + $this->output = $this->getMockBuilder('OCP\\AppFramework\\Http\\IOutput') + ->disableOriginalConstructor() + ->getMock(); } public function testOutputNotModified(){ diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php index 87fb6864f78..4f779e8c697 100644 --- a/tests/lib/AppFramework/Http/TemplateResponseTest.php +++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php @@ -43,8 +43,10 @@ class TemplateResponseTest extends \Test\TestCase { protected function setUp() { parent::setUp(); - $this->api = $this->getMock('OC\AppFramework\Core\API', - array('getAppName'), array('test')); + $this->api = $this->getMockBuilder('OC\AppFramework\Core\API') + ->setMethods(['getAppName']) + ->setConstructorArgs(['test']) + ->getMock(); $this->api->expects($this->any()) ->method('getAppName') ->will($this->returnValue('app')); diff --git a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php index f81aca106d6..2b7a79bae2f 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php @@ -126,17 +126,15 @@ class MiddlewareDispatcherTest extends \Test\TestCase { private function getControllerMock(){ - return $this->getMock( - 'OCP\AppFramework\Controller', - ['method'], - ['app', + return $this->getMockBuilder('OCP\AppFramework\Controller') + ->setMethods(['method']) + ->setConstructorArgs(['app', new Request( ['method' => 'GET'], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ) - ] - ); + ])->getMock(); } @@ -149,13 +147,15 @@ class MiddlewareDispatcherTest extends \Test\TestCase { public function testAfterExceptionShouldReturnResponseOfMiddleware(){ $response = new Response(); - $m1 = $this->getMock('\OCP\AppFramework\Middleware', - array('afterException', 'beforeController')); + $m1 = $this->getMockBuilder('\OCP\AppFramework\Middleware') + ->setMethods(['afterException', 'beforeController']) + ->getMock(); $m1->expects($this->never()) ->method('afterException'); - $m2 = $this->getMock('OCP\AppFramework\Middleware', - array('afterException', 'beforeController')); + $m2 = $this->getMockBuilder('OCP\AppFramework\Middleware') + ->setMethods(['afterException', 'beforeController']) + ->getMock(); $m2->expects($this->once()) ->method('afterException') ->will($this->returnValue($response)); @@ -274,7 +274,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase { public function testExceptionShouldRunAfterExceptionOfOnlyPreviouslyExecutedMiddlewares(){ $m1 = $this->getMiddleware(); $m2 = $this->getMiddleware(true); - $m3 = $this->getMock('\OCP\AppFramework\Middleware'); + $m3 = $this->getMockBuilder('\OCP\AppFramework\Middleware')->getMock(); $m3->expects($this->never()) ->method('afterException'); $m3->expects($this->never()) diff --git a/tests/lib/AppFramework/Middleware/MiddlewareTest.php b/tests/lib/AppFramework/Middleware/MiddlewareTest.php index 013403a9a4a..c5c812839b2 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareTest.php @@ -48,25 +48,22 @@ class MiddlewareTest extends \Test\TestCase { $this->middleware = new ChildMiddleware(); - $this->api = $this->getMockBuilder( - 'OC\AppFramework\DependencyInjection\DIContainer') + $this->api = $this->getMockBuilder('OC\AppFramework\DependencyInjection\DIContainer') ->disableOriginalConstructor() ->getMock(); - $this->controller = $this->getMock( - 'OCP\AppFramework\Controller', - [], - [ + $this->controller = $this->getMockBuilder('OCP\AppFramework\Controller') + ->setMethods([]) + ->setConstructorArgs([ $this->api, new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ) - ] - ); + ])->getMock(); $this->exception = new \Exception(); - $this->response = $this->getMock('OCP\AppFramework\Http\Response'); + $this->response = $this->getMockBuilder('OCP\AppFramework\Http\Response')->getMock(); } diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php index 54d2831d25f..a0dbcc6872a 100644 --- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php @@ -43,8 +43,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'HTTP_ORIGIN' => 'test' ] ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->reflector->reflect($this, __FUNCTION__); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); @@ -62,8 +62,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'HTTP_ORIGIN' => 'test' ] ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); @@ -79,8 +79,8 @@ class CORSMiddlewareTest extends \Test\TestCase { public function testNoOriginHeaderNoCORSHEADER() { $request = new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->reflector->reflect($this, __FUNCTION__); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); @@ -102,8 +102,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'HTTP_ORIGIN' => 'test' ] ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->reflector->reflect($this, __FUNCTION__); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); @@ -120,8 +120,8 @@ class CORSMiddlewareTest extends \Test\TestCase { public function testNoCORSShouldAllowCookieAuth() { $request = new Request( [], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->reflector->reflect($this, __FUNCTION__); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); @@ -145,8 +145,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'pass' ]], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->session->expects($this->once()) ->method('logout'); @@ -170,8 +170,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'pass' ]], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->session->expects($this->once()) ->method('logout'); @@ -195,8 +195,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'pass' ]], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->session->expects($this->once()) ->method('logout'); @@ -216,8 +216,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'pass' ]], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); $response = $middleware->afterException($this, __FUNCTION__, new SecurityException('A security exception')); @@ -232,8 +232,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'pass' ]], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); $response = $middleware->afterException($this, __FUNCTION__, new SecurityException('A security exception', 501)); @@ -252,8 +252,8 @@ class CORSMiddlewareTest extends \Test\TestCase { 'PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'pass' ]], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $middleware = new CORSMiddleware($request, $this->reflector, $this->session); $middleware->afterException($this, __FUNCTION__, new \Exception('A regular exception')); diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 8cdba76d835..a4f203bacd7 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -338,8 +338,8 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp' ] ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->middleware = $this->getMiddleware(false, false); $this->urlGenerator @@ -396,8 +396,8 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp' ] ], - $this->getMock('\OCP\Security\ISecureRandom'), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->middleware = $this->getMiddleware(false, false); $this->logger diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php index 17fcc1904c1..af2045cb7c1 100644 --- a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php @@ -36,7 +36,7 @@ class SessionMiddlewareTest extends \Test\TestCase { $this->request = new Request( [], $this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(), - $this->getMock('\OCP\IConfig') + $this->getMockBuilder('\OCP\IConfig')->getMock() ); $this->reflector = new ControllerMethodReflector(); } diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php index 326c156af98..52a5eb33ba9 100644 --- a/tests/lib/AppFramework/Routing/RoutingTest.php +++ b/tests/lib/AppFramework/Routing/RoutingTest.php @@ -74,7 +74,10 @@ class RoutingTest extends \Test\TestCase )); // router mock - $router = $this->getMock("\OC\Route\Router", array('create'), [\OC::$server->getLogger()]); + $router = $this->getMockBuilder('\OC\Route\Router') + ->setMethods(['create']) + ->setConstructorArgs([$this->getMockBuilder('\OCP\ILogger')->getMock()]) + ->getMock(); // load route configuration $container = new DIContainer('app1'); @@ -124,7 +127,10 @@ class RoutingTest extends \Test\TestCase $route = $this->mockRoute($container, $verb, $controllerName, $actionName, $requirements, $defaults); // router mock - $router = $this->getMock("\OC\Route\Router", array('create'), [\OC::$server->getLogger()]); + $router = $this->getMockBuilder('\OC\Route\Router') + ->setMethods(['create']) + ->setConstructorArgs([$this->getMockBuilder('\OCP\ILogger')->getMock()]) + ->getMock(); // we expect create to be called once: $router @@ -148,7 +154,10 @@ class RoutingTest extends \Test\TestCase private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName) { // router mock - $router = $this->getMock("\OC\Route\Router", array('create'), [\OC::$server->getLogger()]); + $router = $this->getMockBuilder('\OC\Route\Router') + ->setMethods(['create']) + ->setConstructorArgs([$this->getMockBuilder('\OCP\ILogger')->getMock()]) + ->getMock(); // route mocks $container = new DIContainer('app1'); @@ -214,7 +223,10 @@ class RoutingTest extends \Test\TestCase array $requirements=array(), array $defaults=array() ) { - $route = $this->getMock("\OC\Route\Route", array('method', 'action', 'requirements', 'defaults'), array(), '', false); + $route = $this->getMockBuilder('\OC\Route\Route') + ->setMethods(['method', 'action', 'requirements', 'defaults']) + ->disableOriginalConstructor() + ->getMock(); $route ->expects($this->exactly(1)) ->method('method') diff --git a/tests/lib/Files/Node/FileTest.php b/tests/lib/Files/Node/FileTest.php index 180c7b12ce4..1b665bd4c72 100644 --- a/tests/lib/Files/Node/FileTest.php +++ b/tests/lib/Files/Node/FileTest.php @@ -10,19 +10,35 @@ namespace Test\Files\Node; use OC\Files\FileInfo; use OCP\Files\NotFoundException; -use OCP\Files\NotPermittedException; -use OC\Files\View; class FileTest extends \Test\TestCase { + /** @var \OC\User\User */ private $user; + /** @var \OC\Files\Mount\Manager */ + private $manager; + + /** @var \OC\Files\View|\PHPUnit_Framework_MockObject_MockObject */ + private $view; + protected function setUp() { parent::setUp(); - $this->user = new \OC\User\User('', new \Test\Util\User\Dummy); + $config = $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock(); + $this->user = new \OC\User\User('', new \Test\Util\User\Dummy, null, $config); + + $this->manager = $this->getMockBuilder('\OC\Files\Mount\Manager') + ->disableOriginalConstructor() + ->getMock(); + $this->view = $this->getMockBuilder('\OC\Files\View') + ->disableOriginalConstructor() + ->getMock(); } protected function getMockStorage() { - $storage = $this->getMock('\OCP\Files\Storage'); + $storage = $this->getMockBuilder('\OCP\Files\Storage') + ->getMock(); $storage->expects($this->any()) ->method('getId') ->will($this->returnValue('home::someuser')); @@ -34,14 +50,11 @@ class FileTest extends \Test\TestCase { } public function testDelete() { - $manager = $this->getMock('\OC\Files\Mount\Manager'); - - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); $root->expects($this->exactly(2)) ->method('emit') ->will($this->returnValue(true)); @@ -49,17 +62,17 @@ class FileTest extends \Test\TestCase { ->method('getUser') ->will($this->returnValue($this->user)); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_ALL)))); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('unlink') ->with('/bar/foo') ->will($this->returnValue(true)); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->delete(); } @@ -89,34 +102,26 @@ class FileTest extends \Test\TestCase { $hooksRun++; }; - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = new \OC\Files\Node\Root($manager, $view, $this->user); + $root = new \OC\Files\Node\Root($this->manager, $this->view, $this->user); $root->listen('\OC\Files', 'preDelete', $preListener); $root->listen('\OC\Files', 'postDelete', $postListener); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 1, 'mimetype' => 'text/plain')))); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('unlink') ->with('/bar/foo') ->will($this->returnValue(true)); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('resolvePath') ->with('/bar/foo') ->will($this->returnValue(array(null, 'foo'))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->delete(); $this->assertEquals(2, $hooksRun); } @@ -125,36 +130,29 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testDeleteNotPermitted() { - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); $root->expects($this->any()) ->method('getUser') ->will($this->returnValue($this->user)); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_READ)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->delete(); } public function testGetContent() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = new \OC\Files\Node\Root($manager, $view, $this->user); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); $hook = function ($file) { throw new \Exception('Hooks are not supposed to be called'); @@ -163,17 +161,17 @@ class FileTest extends \Test\TestCase { $root->listen('\OC\Files', 'preWrite', $hook); $root->listen('\OC\Files', 'postWrite', $hook); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('file_get_contents') ->with('/bar/foo') ->will($this->returnValue('bar')); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_READ)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $this->assertEquals('bar', $node->getContent()); } @@ -181,49 +179,45 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testGetContentNotPermitted() { - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); $root->expects($this->any()) ->method('getUser') ->will($this->returnValue($this->user)); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => 0)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->getContent(); } public function testPutContent() { - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); $root->expects($this->any()) ->method('getUser') ->will($this->returnValue($this->user)); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_ALL)))); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('file_put_contents') ->with('/bar/foo', 'bar') ->will($this->returnValue(true)); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->putContent('bar'); } @@ -231,36 +225,32 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testPutContentNotPermitted() { - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_READ)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->putContent('bar'); } public function testGetMimeType() { - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('mimetype' => 'text/plain')))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $this->assertEquals('text/plain', $node->getMimeType()); } @@ -269,15 +259,7 @@ class FileTest extends \Test\TestCase { fwrite($stream, 'bar'); rewind($stream); - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = new \OC\Files\Node\Root($manager, $view, $this->user); + $root = new \OC\Files\Node\Root($this->manager, $this->view, $this->user); $hook = function ($file) { throw new \Exception('Hooks are not supposed to be called'); @@ -286,17 +268,17 @@ class FileTest extends \Test\TestCase { $root->listen('\OC\Files', 'preWrite', $hook); $root->listen('\OC\Files', 'postWrite', $hook); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('fopen') ->with('/bar/foo', 'r') ->will($this->returnValue($stream)); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_ALL)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $fh = $node->fopen('r'); $this->assertEquals($stream, $fh); $this->assertEquals('bar', fread($fh, 3)); @@ -305,15 +287,7 @@ class FileTest extends \Test\TestCase { public function testFOpenWrite() { $stream = fopen('php://memory', 'w+'); - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = new \OC\Files\Node\Root($manager, new $view, $this->user); + $root = new \OC\Files\Node\Root($this->manager, new $this->view, $this->user); $hooksCalled = 0; $hook = function ($file) use (&$hooksCalled) { @@ -323,17 +297,17 @@ class FileTest extends \Test\TestCase { $root->listen('\OC\Files', 'preWrite', $hook); $root->listen('\OC\Files', 'postWrite', $hook); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('fopen') ->with('/bar/foo', 'w') ->will($this->returnValue($stream)); - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_ALL)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $fh = $node->fopen('w'); $this->assertEquals($stream, $fh); fwrite($fh, 'bar'); @@ -346,26 +320,18 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testFOpenReadNotPermitted() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = new \OC\Files\Node\Root($manager, $view, $this->user); + $root = new \OC\Files\Node\Root($this->manager, $this->view, $this->user); $hook = function ($file) { throw new \Exception('Hooks are not supposed to be called'); }; - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => 0)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->fopen('r'); } @@ -373,26 +339,18 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testFOpenReadWriteNoReadPermissions() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = new \OC\Files\Node\Root($manager, $view, $this->user); + $root = new \OC\Files\Node\Root($this->manager, $this->view, $this->user); $hook = function () { throw new \Exception('Hooks are not supposed to be called'); }; - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_UPDATE)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->fopen('w'); } @@ -400,51 +358,38 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testFOpenReadWriteNoWritePermissions() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = new \OC\Files\Node\Root($manager, new $view, $this->user); + $root = new \OC\Files\Node\Root($this->manager, new $this->view, $this->user); $hook = function () { throw new \Exception('Hooks are not supposed to be called'); }; - $view->expects($this->once()) + $this->view->expects($this->once()) ->method('getFileInfo') ->with('/bar/foo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_READ)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $node->fopen('w'); } public function testCopySameStorage() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('copy') ->with('/bar/foo', '/bar/asd'); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('getFileInfo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 3)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); - $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); - $newNode = new \OC\Files\Node\File($root, $view, '/bar/asd'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $this->view, '/bar'); + $newNode = new \OC\Files\Node\File($root, $this->view, '/bar/asd'); $root->expects($this->exactly(2)) ->method('get') @@ -462,19 +407,17 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testCopyNotPermitted() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); + /** * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage */ - $storage = $this->getMock('\OC\Files\Storage\Storage'); + $storage = $this->getMockBuilder('\OC\Files\Storage\Storage') + ->disableOriginalConstructor() + ->getMock(); $root->expects($this->never()) ->method('getMount'); @@ -482,12 +425,12 @@ class FileTest extends \Test\TestCase { $storage->expects($this->never()) ->method('copy'); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('getFileInfo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_READ, 'fileid' => 3)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); - $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $this->view, '/bar'); $root->expects($this->once()) ->method('get') @@ -502,20 +445,15 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotFoundException */ public function testCopyNoParent() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->never()) + $this->view->expects($this->never()) ->method('copy'); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); $root->expects($this->once()) ->method('get') @@ -529,21 +467,16 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testCopyParentIsFile() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->never()) + $this->view->expects($this->never()) ->method('copy'); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); - $parentNode = new \OC\Files\Node\File($root, $view, '/bar'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); + $parentNode = new \OC\Files\Node\File($root, $this->view, '/bar'); $root->expects($this->once()) ->method('get') @@ -555,26 +488,21 @@ class FileTest extends \Test\TestCase { } public function testMoveSameStorage() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('rename') ->with('/bar/foo', '/bar/asd'); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('getFileInfo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 1)))); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); - $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $this->view, '/bar'); $root->expects($this->any()) ->method('get') @@ -590,25 +518,20 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testMoveNotPermitted() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->any()) + $this->view->expects($this->any()) ->method('getFileInfo') ->will($this->returnValue($this->getFileInfo(array('permissions' => \OCP\Constants::PERMISSION_READ)))); - $view->expects($this->never()) + $this->view->expects($this->never()) ->method('rename'); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); - $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $this->view, '/bar'); $root->expects($this->once()) ->method('get') @@ -622,25 +545,23 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotFoundException */ public function testMoveNoParent() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); + /** * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage */ - $storage = $this->getMock('\OC\Files\Storage\Storage'); + $storage = $this->getMockBuilder('\OC\Files\Storage\Storage') + ->disableOriginalConstructor() + ->getMock(); $storage->expects($this->never()) ->method('rename'); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); - $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); + $parentNode = new \OC\Files\Node\Folder($root, $this->view, '/bar'); $root->expects($this->once()) ->method('get') @@ -654,21 +575,16 @@ class FileTest extends \Test\TestCase { * @expectedException \OCP\Files\NotPermittedException */ public function testMoveParentIsFile() { - /** - * @var \OC\Files\Mount\Manager $manager - */ - $manager = $this->getMock('\OC\Files\Mount\Manager'); - /** - * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view - */ - $view = $this->getMock('\OC\Files\View'); - $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user)); + /** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */ + $root = $this->getMockBuilder('\OC\Files\Node\Root') + ->setConstructorArgs([$this->manager, $this->view, $this->user]) + ->getMock(); - $view->expects($this->never()) + $this->view->expects($this->never()) ->method('rename'); - $node = new \OC\Files\Node\File($root, $view, '/bar/foo'); - $parentNode = new \OC\Files\Node\File($root, $view, '/bar'); + $node = new \OC\Files\Node\File($root, $this->view, '/bar/foo'); + $parentNode = new \OC\Files\Node\File($root, $this->view, '/bar'); $root->expects($this->once()) ->method('get') diff --git a/tests/lib/PreviewTest.php b/tests/lib/PreviewTest.php index 6ca88253468..cd228801815 100644 --- a/tests/lib/PreviewTest.php +++ b/tests/lib/PreviewTest.php @@ -783,7 +783,7 @@ class PreviewTest extends TestCase { $filename = $this->samples[$sampleId]['sampleFileName']; $splitFileName = pathinfo($filename); $extension = $splitFileName['extension']; - $correction = ($extension === 'eps') ? 1 : 0; + $correction = ($extension === 'eps' && PHP_MAJOR_VERSION < 7) ? 1 : 0; $maxPreviewHeight = $this->samples[$sampleId]['maxPreviewHeight']; $maxPreviewHeight = $maxPreviewHeight - $correction; diff --git a/tests/lib/Traits/MountProviderTrait.php b/tests/lib/Traits/MountProviderTrait.php index bccb5b693ee..0437157e84f 100644 --- a/tests/lib/Traits/MountProviderTrait.php +++ b/tests/lib/Traits/MountProviderTrait.php @@ -41,7 +41,7 @@ trait MountProviderTrait { protected function setUpMountProviderTrait() { $this->storageFactory = new StorageFactory(); - $this->mountProvider = $this->getMock('\OCP\Files\Config\IMountProvider'); + $this->mountProvider = $this->getMockBuilder('\OCP\Files\Config\IMountProvider')->getMock(); $this->mountProvider->expects($this->any()) ->method('getMountsForUser') ->will($this->returnCallback(function (IUser $user) { |