diff options
32 files changed, 203 insertions, 119 deletions
diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php index 2af145ad4a2..d9e5e2a0d5a 100644 --- a/apps/files_external/lib/Lib/Storage/FTP.php +++ b/apps/files_external/lib/Lib/Storage/FTP.php @@ -35,6 +35,7 @@ namespace OCA\Files_External\Lib\Storage; use Icewind\Streams\CallbackWrapper; +use Icewind\Streams\IteratorDirectory; use Icewind\Streams\RetryWrapper; class FTP extends StreamWrapper { @@ -136,6 +137,22 @@ class FTP extends StreamWrapper { return false; } + public function opendir($path) { + $dh = parent::opendir($path); + if (is_resource($dh)) { + $files = []; + while (($file = readdir($dh)) !== false) { + if ($file != '.' && $file != '..' && strpos($file, '#') === false) { + $files[] = $file; + } + } + return IteratorDirectory::wrap($files); + } else { + return false; + } + } + + public function writeBack($tmpFile, $path) { $this->uploadFile($tmpFile, $path); unlink($tmpFile); diff --git a/apps/files_trashbin/l10n/br.js b/apps/files_trashbin/l10n/br.js new file mode 100644 index 00000000000..f7e63408170 --- /dev/null +++ b/apps/files_trashbin/l10n/br.js @@ -0,0 +1,16 @@ +OC.L10N.register( + "files_trashbin", + { + "Deleted files" : "Restroù diverket", + "Restore" : "Adkrouiñ", + "This operation is forbidden" : "Difennet eo an ober-mañ", + "This directory is unavailable, please check the logs or contact the administrator" : "N'eus ket tu da dizhout an teuliad-mañ, lennit al logoù pe kit e darempred gant ar merour", + "No deleted files" : "Restr lemet ebet", + "No entries found in this folder" : "Disoc'h ebet en teuliad-mañ", + "Select all" : "Dibab pep tra", + "Name" : "Anv", + "Actions" : "Oberoù", + "Deleted" : "Lamet", + "Delete" : "Dilemel" +}, +"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"); diff --git a/apps/files_trashbin/l10n/br.json b/apps/files_trashbin/l10n/br.json new file mode 100644 index 00000000000..f4fc37eb824 --- /dev/null +++ b/apps/files_trashbin/l10n/br.json @@ -0,0 +1,14 @@ +{ "translations": { + "Deleted files" : "Restroù diverket", + "Restore" : "Adkrouiñ", + "This operation is forbidden" : "Difennet eo an ober-mañ", + "This directory is unavailable, please check the logs or contact the administrator" : "N'eus ket tu da dizhout an teuliad-mañ, lennit al logoù pe kit e darempred gant ar merour", + "No deleted files" : "Restr lemet ebet", + "No entries found in this folder" : "Disoc'h ebet en teuliad-mañ", + "Select all" : "Dibab pep tra", + "Name" : "Anv", + "Actions" : "Oberoù", + "Deleted" : "Lamet", + "Delete" : "Dilemel" +},"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);" +}
\ No newline at end of file diff --git a/apps/settings/l10n/de.js b/apps/settings/l10n/de.js index 05f060d19c3..3d0f92d79c3 100644 --- a/apps/settings/l10n/de.js +++ b/apps/settings/l10n/de.js @@ -8,7 +8,11 @@ OC.L10N.register( "Sending…" : "Senden…", "Email sent" : "E-Mail gesendet", "Private" : "Privat", + "Don't synchronize to servers" : "Nicht mit Servern synchronisieren", + "Trusted" : "Vertrauenswürdig", + "Only synchronize to trusted servers" : "Nur mit vertrauenswürdigen Servern synchronisieren", "Public" : "Öffentlich", + "Synchronize to trusted servers and the global and public address book" : "Mit vertrauenswürdigen Servern und dem globalen und öffentlichen Adressbuch synchronisieren", "Verify" : "Überprüfen", "Verifying …" : "Überprüfe…", "Unable to change password" : "Passwort konnte nicht geändert werden", diff --git a/apps/settings/l10n/de.json b/apps/settings/l10n/de.json index e851a3df7c6..d08dd6ff1b2 100644 --- a/apps/settings/l10n/de.json +++ b/apps/settings/l10n/de.json @@ -6,7 +6,11 @@ "Sending…" : "Senden…", "Email sent" : "E-Mail gesendet", "Private" : "Privat", + "Don't synchronize to servers" : "Nicht mit Servern synchronisieren", + "Trusted" : "Vertrauenswürdig", + "Only synchronize to trusted servers" : "Nur mit vertrauenswürdigen Servern synchronisieren", "Public" : "Öffentlich", + "Synchronize to trusted servers and the global and public address book" : "Mit vertrauenswürdigen Servern und dem globalen und öffentlichen Adressbuch synchronisieren", "Verify" : "Überprüfen", "Verifying …" : "Überprüfe…", "Unable to change password" : "Passwort konnte nicht geändert werden", diff --git a/apps/settings/l10n/de_DE.js b/apps/settings/l10n/de_DE.js index c12bfaf581b..7630c786040 100644 --- a/apps/settings/l10n/de_DE.js +++ b/apps/settings/l10n/de_DE.js @@ -8,7 +8,11 @@ OC.L10N.register( "Sending…" : "Senden…", "Email sent" : "E-Mail gesendet", "Private" : "Privat", + "Don't synchronize to servers" : "Nicht mit Servern synchronisieren", + "Trusted" : "Vertrauenswürdig", + "Only synchronize to trusted servers" : "Nur mit vertrauenswürdigen Servern synchronisieren", "Public" : "Öffentlich", + "Synchronize to trusted servers and the global and public address book" : "Mit vertrauenswürdigen Servern und dem globalen und öffentlichen Adressbuch synchronisieren", "Verify" : "Überprüfen", "Verifying …" : "Überprüfe…", "Unable to change password" : "Passwort konnte nicht geändert werden", diff --git a/apps/settings/l10n/de_DE.json b/apps/settings/l10n/de_DE.json index c44f1d9c385..3b26a4549df 100644 --- a/apps/settings/l10n/de_DE.json +++ b/apps/settings/l10n/de_DE.json @@ -6,7 +6,11 @@ "Sending…" : "Senden…", "Email sent" : "E-Mail gesendet", "Private" : "Privat", + "Don't synchronize to servers" : "Nicht mit Servern synchronisieren", + "Trusted" : "Vertrauenswürdig", + "Only synchronize to trusted servers" : "Nur mit vertrauenswürdigen Servern synchronisieren", "Public" : "Öffentlich", + "Synchronize to trusted servers and the global and public address book" : "Mit vertrauenswürdigen Servern und dem globalen und öffentlichen Adressbuch synchronisieren", "Verify" : "Überprüfen", "Verifying …" : "Überprüfe…", "Unable to change password" : "Passwort konnte nicht geändert werden", diff --git a/apps/settings/l10n/es.js b/apps/settings/l10n/es.js index 955ff256081..0a0a6865698 100644 --- a/apps/settings/l10n/es.js +++ b/apps/settings/l10n/es.js @@ -8,7 +8,11 @@ OC.L10N.register( "Sending…" : "Enviando...", "Email sent" : "Correo electrónico enviado", "Private" : "Privado", + "Don't synchronize to servers" : "No sincronizar con servidores", + "Trusted" : "De confianza", + "Only synchronize to trusted servers" : "Sincronizar solo con servidores de confianza", "Public" : "Público", + "Synchronize to trusted servers and the global and public address book" : "Sincronizar con servidores de confianza y con la libreta de direcciones global y pública", "Verify" : "Verificar", "Verifying …" : "Verificando…", "Unable to change password" : "No se ha podido cambiar la contraseña", diff --git a/apps/settings/l10n/es.json b/apps/settings/l10n/es.json index 6e75e81113c..4406141551b 100644 --- a/apps/settings/l10n/es.json +++ b/apps/settings/l10n/es.json @@ -6,7 +6,11 @@ "Sending…" : "Enviando...", "Email sent" : "Correo electrónico enviado", "Private" : "Privado", + "Don't synchronize to servers" : "No sincronizar con servidores", + "Trusted" : "De confianza", + "Only synchronize to trusted servers" : "Sincronizar solo con servidores de confianza", "Public" : "Público", + "Synchronize to trusted servers and the global and public address book" : "Sincronizar con servidores de confianza y con la libreta de direcciones global y pública", "Verify" : "Verificar", "Verifying …" : "Verificando…", "Unable to change password" : "No se ha podido cambiar la contraseña", diff --git a/apps/settings/l10n/fr.js b/apps/settings/l10n/fr.js index 82eaa1edaeb..64040196e9b 100644 --- a/apps/settings/l10n/fr.js +++ b/apps/settings/l10n/fr.js @@ -8,6 +8,9 @@ OC.L10N.register( "Sending…" : "Envoi en cours...", "Email sent" : "E-mail envoyé", "Private" : "Privé", + "Don't synchronize to servers" : "Ne pas synchroniser avec les serveurs", + "Trusted" : "Approuvé", + "Only synchronize to trusted servers" : "Ne synchroniser qu'avec les serveurs de confiance", "Public" : "Publique", "Verify" : "Vérifier", "Verifying …" : "Vérification en cours...", diff --git a/apps/settings/l10n/fr.json b/apps/settings/l10n/fr.json index c5b051c7b7c..2173debcd21 100644 --- a/apps/settings/l10n/fr.json +++ b/apps/settings/l10n/fr.json @@ -6,6 +6,9 @@ "Sending…" : "Envoi en cours...", "Email sent" : "E-mail envoyé", "Private" : "Privé", + "Don't synchronize to servers" : "Ne pas synchroniser avec les serveurs", + "Trusted" : "Approuvé", + "Only synchronize to trusted servers" : "Ne synchroniser qu'avec les serveurs de confiance", "Public" : "Publique", "Verify" : "Vérifier", "Verifying …" : "Vérification en cours...", diff --git a/apps/settings/l10n/gl.js b/apps/settings/l10n/gl.js index 023078b640f..efc41e9d7a4 100644 --- a/apps/settings/l10n/gl.js +++ b/apps/settings/l10n/gl.js @@ -8,7 +8,11 @@ OC.L10N.register( "Sending…" : "Enviando...", "Email sent" : "Correo enviado", "Private" : "Privado", + "Don't synchronize to servers" : "Non sincronizar con servidores", + "Trusted" : "De confianza", + "Only synchronize to trusted servers" : "Sincronizar só con servidores de confianza", "Public" : "Público", + "Synchronize to trusted servers and the global and public address book" : "Sincronizar con servidores de confianza e co caderno de enderezos global e público", "Verify" : "Verificar", "Verifying …" : "Verificando…", "Unable to change password" : "Non é posíbel cambiar o contrasinal", diff --git a/apps/settings/l10n/gl.json b/apps/settings/l10n/gl.json index 13c78673a5a..c70c47aade1 100644 --- a/apps/settings/l10n/gl.json +++ b/apps/settings/l10n/gl.json @@ -6,7 +6,11 @@ "Sending…" : "Enviando...", "Email sent" : "Correo enviado", "Private" : "Privado", + "Don't synchronize to servers" : "Non sincronizar con servidores", + "Trusted" : "De confianza", + "Only synchronize to trusted servers" : "Sincronizar só con servidores de confianza", "Public" : "Público", + "Synchronize to trusted servers and the global and public address book" : "Sincronizar con servidores de confianza e co caderno de enderezos global e público", "Verify" : "Verificar", "Verifying …" : "Verificando…", "Unable to change password" : "Non é posíbel cambiar o contrasinal", diff --git a/apps/settings/l10n/it.js b/apps/settings/l10n/it.js index a2ac774fa9b..96e10244842 100644 --- a/apps/settings/l10n/it.js +++ b/apps/settings/l10n/it.js @@ -8,7 +8,11 @@ OC.L10N.register( "Sending…" : "Invio in corso...", "Email sent" : "Email inviata", "Private" : "Privato", + "Don't synchronize to servers" : "Non sincronizzazione con i server", + "Trusted" : "Affidabili", + "Only synchronize to trusted servers" : "Sincronizzazione solo con i server affidabili", "Public" : "Pubblico", + "Synchronize to trusted servers and the global and public address book" : "Sincronizza con server affidabili e la rubrica globale e pubblica", "Verify" : "Verifica", "Verifying …" : "Verifica in corso...", "Unable to change password" : "Impossibile cambiare la password", diff --git a/apps/settings/l10n/it.json b/apps/settings/l10n/it.json index 9a5f7db3266..2f201b3da15 100644 --- a/apps/settings/l10n/it.json +++ b/apps/settings/l10n/it.json @@ -6,7 +6,11 @@ "Sending…" : "Invio in corso...", "Email sent" : "Email inviata", "Private" : "Privato", + "Don't synchronize to servers" : "Non sincronizzazione con i server", + "Trusted" : "Affidabili", + "Only synchronize to trusted servers" : "Sincronizzazione solo con i server affidabili", "Public" : "Pubblico", + "Synchronize to trusted servers and the global and public address book" : "Sincronizza con server affidabili e la rubrica globale e pubblica", "Verify" : "Verifica", "Verifying …" : "Verifica in corso...", "Unable to change password" : "Impossibile cambiare la password", diff --git a/apps/settings/l10n/lt_LT.js b/apps/settings/l10n/lt_LT.js index 6c418a66a64..dcb3b80ecda 100644 --- a/apps/settings/l10n/lt_LT.js +++ b/apps/settings/l10n/lt_LT.js @@ -8,7 +8,10 @@ OC.L10N.register( "Sending…" : "Siunčiama…", "Email sent" : "El. paštas išsiųstas", "Private" : "Privatu", + "Don't synchronize to servers" : "Nesinchronizuoti į serverius", + "Only synchronize to trusted servers" : "Sinchronizuoti tik į patikimus serverius", "Public" : "Vieša", + "Synchronize to trusted servers and the global and public address book" : "Sinchronizuoti į patikimus serverius ir į visuotinę bei viešą adresų knygą", "Verify" : "Patikrinti", "Verifying …" : "Tikrinama...", "Unable to change password" : "Nepavyksta pakeisti slaptažodžio", diff --git a/apps/settings/l10n/lt_LT.json b/apps/settings/l10n/lt_LT.json index 200c35c368f..43c96b93a2b 100644 --- a/apps/settings/l10n/lt_LT.json +++ b/apps/settings/l10n/lt_LT.json @@ -6,7 +6,10 @@ "Sending…" : "Siunčiama…", "Email sent" : "El. paštas išsiųstas", "Private" : "Privatu", + "Don't synchronize to servers" : "Nesinchronizuoti į serverius", + "Only synchronize to trusted servers" : "Sinchronizuoti tik į patikimus serverius", "Public" : "Vieša", + "Synchronize to trusted servers and the global and public address book" : "Sinchronizuoti į patikimus serverius ir į visuotinę bei viešą adresų knygą", "Verify" : "Patikrinti", "Verifying …" : "Tikrinama...", "Unable to change password" : "Nepavyksta pakeisti slaptažodžio", diff --git a/apps/settings/l10n/pl.js b/apps/settings/l10n/pl.js index 6957b952533..4faf3545a66 100644 --- a/apps/settings/l10n/pl.js +++ b/apps/settings/l10n/pl.js @@ -8,7 +8,11 @@ OC.L10N.register( "Sending…" : "Wysyłam…", "Email sent" : "E-mail został wysłany", "Private" : "Prywatny", + "Don't synchronize to servers" : "Nie synchronizuj z serwerami", + "Trusted" : "Zaufany", + "Only synchronize to trusted servers" : "Synchronizuj tylko z zaufanymi serwerami", "Public" : "Publiczny", + "Synchronize to trusted servers and the global and public address book" : "Synchronizuj z zaufanymi serwerami oraz globalną i publiczną książką adresową", "Verify" : "Zweryfikuj", "Verifying …" : "Weryfikacja…", "Unable to change password" : "Nie można zmienić hasła", diff --git a/apps/settings/l10n/pl.json b/apps/settings/l10n/pl.json index 08208926e7f..1e7cad9d0ae 100644 --- a/apps/settings/l10n/pl.json +++ b/apps/settings/l10n/pl.json @@ -6,7 +6,11 @@ "Sending…" : "Wysyłam…", "Email sent" : "E-mail został wysłany", "Private" : "Prywatny", + "Don't synchronize to servers" : "Nie synchronizuj z serwerami", + "Trusted" : "Zaufany", + "Only synchronize to trusted servers" : "Synchronizuj tylko z zaufanymi serwerami", "Public" : "Publiczny", + "Synchronize to trusted servers and the global and public address book" : "Synchronizuj z zaufanymi serwerami oraz globalną i publiczną książką adresową", "Verify" : "Zweryfikuj", "Verifying …" : "Weryfikacja…", "Unable to change password" : "Nie można zmienić hasła", diff --git a/apps/settings/l10n/pt_BR.js b/apps/settings/l10n/pt_BR.js index c928a5db83f..986c31dd77f 100644 --- a/apps/settings/l10n/pt_BR.js +++ b/apps/settings/l10n/pt_BR.js @@ -1,14 +1,18 @@ OC.L10N.register( "settings", { - "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até esteja finalizada", + "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que esteja finalizada", "Migration started …" : "Migração iniciada...", "Saved" : "Salvo", "Not saved" : "Não salvo", "Sending…" : "Enviando...", "Email sent" : "E-mail enviado", "Private" : "Privado", + "Don't synchronize to servers" : "Não sincronize com servidores", + "Trusted" : "Confiável", + "Only synchronize to trusted servers" : "Sincronize apenas com servidores confiáveis", "Public" : "Público", + "Synchronize to trusted servers and the global and public address book" : "Sincronize com servidores confiáveis e catálogo de endereços global e público", "Verify" : "Verificar", "Verifying …" : "Verificando...", "Unable to change password" : "Não foi possível alterar a senha", diff --git a/apps/settings/l10n/pt_BR.json b/apps/settings/l10n/pt_BR.json index 2df909c8a80..181fba5eacf 100644 --- a/apps/settings/l10n/pt_BR.json +++ b/apps/settings/l10n/pt_BR.json @@ -1,12 +1,16 @@ { "translations": { - "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até esteja finalizada", + "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que esteja finalizada", "Migration started …" : "Migração iniciada...", "Saved" : "Salvo", "Not saved" : "Não salvo", "Sending…" : "Enviando...", "Email sent" : "E-mail enviado", "Private" : "Privado", + "Don't synchronize to servers" : "Não sincronize com servidores", + "Trusted" : "Confiável", + "Only synchronize to trusted servers" : "Sincronize apenas com servidores confiáveis", "Public" : "Público", + "Synchronize to trusted servers and the global and public address book" : "Sincronize com servidores confiáveis e catálogo de endereços global e público", "Verify" : "Verificar", "Verifying …" : "Verificando...", "Unable to change password" : "Não foi possível alterar a senha", diff --git a/apps/settings/l10n/tr.js b/apps/settings/l10n/tr.js index 711b456b146..66f5ee78516 100644 --- a/apps/settings/l10n/tr.js +++ b/apps/settings/l10n/tr.js @@ -8,7 +8,11 @@ OC.L10N.register( "Sending…" : "Gönderiliyor …", "Email sent" : "E-posta gönderildi", "Private" : "Özel", + "Don't synchronize to servers" : "Sunucular ile eşitlenmesin", + "Trusted" : "Güvenilen", + "Only synchronize to trusted servers" : "Yalnız güvenilen sunucular ile eşitlensin", "Public" : "Herkese açık", + "Synchronize to trusted servers and the global and public address book" : "Genel ve herkese açık adres defteri ile ve güvenilen sunucularla eşitlenir", "Verify" : "Doğrula", "Verifying …" : "Doğrulanıyor …", "Unable to change password" : "Parola değiştirilemedi", diff --git a/apps/settings/l10n/tr.json b/apps/settings/l10n/tr.json index da38cdc3dcb..9718c76cead 100644 --- a/apps/settings/l10n/tr.json +++ b/apps/settings/l10n/tr.json @@ -6,7 +6,11 @@ "Sending…" : "Gönderiliyor …", "Email sent" : "E-posta gönderildi", "Private" : "Özel", + "Don't synchronize to servers" : "Sunucular ile eşitlenmesin", + "Trusted" : "Güvenilen", + "Only synchronize to trusted servers" : "Yalnız güvenilen sunucular ile eşitlensin", "Public" : "Herkese açık", + "Synchronize to trusted servers and the global and public address book" : "Genel ve herkese açık adres defteri ile ve güvenilen sunucularla eşitlenir", "Verify" : "Doğrula", "Verifying …" : "Doğrulanıyor …", "Unable to change password" : "Parola değiştirilemedi", diff --git a/apps/settings/l10n/uk.js b/apps/settings/l10n/uk.js index 9ef0c5e4c4e..19a9fc210c1 100644 --- a/apps/settings/l10n/uk.js +++ b/apps/settings/l10n/uk.js @@ -8,6 +8,9 @@ OC.L10N.register( "Sending…" : "Відправка...", "Email sent" : "Лист надіслано", "Private" : "Закритий", + "Don't synchronize to servers" : "Не синхронізовувати з серверами", + "Trusted" : "Довіряємо", + "Only synchronize to trusted servers" : "Синхронізовувати лише з серверами, яким довіряємо", "Public" : "Відкритий", "Verify" : "Перевірити", "Verifying …" : "Перевірка ...", diff --git a/apps/settings/l10n/uk.json b/apps/settings/l10n/uk.json index d760261dfb2..50dd68689a9 100644 --- a/apps/settings/l10n/uk.json +++ b/apps/settings/l10n/uk.json @@ -6,6 +6,9 @@ "Sending…" : "Відправка...", "Email sent" : "Лист надіслано", "Private" : "Закритий", + "Don't synchronize to servers" : "Не синхронізовувати з серверами", + "Trusted" : "Довіряємо", + "Only synchronize to trusted servers" : "Синхронізовувати лише з серверами, яким довіряємо", "Public" : "Відкритий", "Verify" : "Перевірити", "Verifying …" : "Перевірка ...", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index b98acb5be5e..bc5ffcb54e0 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -310,6 +310,7 @@ OC.L10N.register( "Confirm your password" : "Confirmer votre mot de passe", "Connect to your account" : "Connectez vous à votre compte", "Please log in before granting %1$s access to your %2$s account." : "Veuillez vous connecter avant d'autoriser %1$s à accéder à votre compte %2$s.", + "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact your system administrator." : "Si vous n'essayez pas d'ajouter un nouveau périphérique ou une nouvelle application, quelqu'un fait une tentative d'accès à vos données. Dans ce cas, ne continuez pas et contactez votre administrateur système.", "App token" : "Jeton d'application", "Grant access" : "Autoriser l'accès", "Alternative log in using app token" : "Authentification alternative en utilisant un jeton d'application", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index ac5405b55f5..ed4a81c9da3 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -308,6 +308,7 @@ "Confirm your password" : "Confirmer votre mot de passe", "Connect to your account" : "Connectez vous à votre compte", "Please log in before granting %1$s access to your %2$s account." : "Veuillez vous connecter avant d'autoriser %1$s à accéder à votre compte %2$s.", + "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact your system administrator." : "Si vous n'essayez pas d'ajouter un nouveau périphérique ou une nouvelle application, quelqu'un fait une tentative d'accès à vos données. Dans ce cas, ne continuez pas et contactez votre administrateur système.", "App token" : "Jeton d'application", "Grant access" : "Autoriser l'accès", "Alternative log in using app token" : "Authentification alternative en utilisant un jeton d'application", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 4ac6fa266af..c248d5640de 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -310,6 +310,7 @@ OC.L10N.register( "Confirm your password" : "确认您的密码", "Connect to your account" : "连接到您的账号", "Please log in before granting %1$s access to your %2$s account." : "在授权 %1$s 访问您的账号 %2$s 之前，请先登录。", + "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact your system administrator." : "如果您不打算设置新设备或应用程序，则有人试图欺骗您，以授予他们访问数据的权限。 在这种情况下，请勿继续操作，而应与系统管理员联系。", "App token" : "App 令牌", "Grant access" : "授权访问", "Alternative log in using app token" : "使用应用程序令牌替代登录", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index f1528523b12..820e4a23098 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -308,6 +308,7 @@ "Confirm your password" : "确认您的密码", "Connect to your account" : "连接到您的账号", "Please log in before granting %1$s access to your %2$s account." : "在授权 %1$s 访问您的账号 %2$s 之前，请先登录。", + "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact your system administrator." : "如果您不打算设置新设备或应用程序，则有人试图欺骗您，以授予他们访问数据的权限。 在这种情况下，请勿继续操作，而应与系统管理员联系。", "App token" : "App 令牌", "Grant access" : "授权访问", "Alternative log in using app token" : "使用应用程序令牌替代登录", diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 6c57405619a..a62b7d727fb 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -876,7 +876,10 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { while (($file = readdir($dh)) !== false) { if (!Filesystem::isIgnoredDir($file) && !Filesystem::isFileBlacklisted($file)) { $childPath = $basePath . '/' . trim($file, '/'); - yield $this->getMetaData($childPath); + $metadata = $this->getMetaData($childPath); + if ($metadata !== null) { + yield $metadata; + } } } } diff --git a/package-lock.json b/package-lock.json index 1b7c40f7e65..7b0dd54822d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3787,9 +3787,9 @@ } }, "@babel/runtime-corejs2": { - "version": "7.10.3", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.10.3.tgz", - "integrity": "sha512-enKvnR/kKFbZFgXYo165wtSA5OeiTlgsnU4jV3vpKRhfWUJjLS6dfVcjIPeRcgJbgEgdgu0I+UyBWqu6c0GumQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.10.4.tgz", + "integrity": "sha512-9sArmpZDQsnR1yyAcU51DxQrntWxt0LUKjPp3pIyo7kVLfaqKt8muppcT87QmFkXV5H50qXAF8JWOjk0jaXRYA==", "dev": true, "requires": { "core-js": "^2.6.5", @@ -4160,9 +4160,9 @@ "dev": true }, "@types/glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", "dev": true, "requires": { "@types/minimatch": "*", @@ -4193,9 +4193,9 @@ "dev": true }, "@types/node": { - "version": "14.0.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz", - "integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==", + "version": "14.0.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz", + "integrity": "sha512-emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g==", "dev": true }, "@types/semver": { @@ -4436,9 +4436,9 @@ }, "dependencies": { "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", + "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", "dev": true } } @@ -4450,9 +4450,9 @@ "dev": true }, "acorn-walk": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz", - "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", "dev": true }, "ajv": { @@ -5934,9 +5934,9 @@ "dev": true }, "cssstyle": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", - "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", "dev": true, "requires": { "cssom": "~0.3.6" @@ -6359,9 +6359,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", - "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "dev": true, "requires": { "esprima": "^4.0.1", @@ -8991,9 +8991,9 @@ "dev": true }, "jsdom": { - "version": "16.2.2", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz", - "integrity": "sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==", + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.3.0.tgz", + "integrity": "sha512-zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg==", "dev": true, "requires": { "abab": "^2.0.3", @@ -9016,7 +9016,7 @@ "tough-cookie": "^3.0.1", "w3c-hr-time": "^1.0.2", "w3c-xmlserializer": "^2.0.0", - "webidl-conversions": "^6.0.0", + "webidl-conversions": "^6.1.0", "whatwg-encoding": "^1.0.5", "whatwg-mimetype": "^2.3.0", "whatwg-url": "^8.0.0", @@ -9025,67 +9025,10 @@ }, "dependencies": { "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", + "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", "dev": true - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - } - } - }, - "tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", - "dev": true, - "requires": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" - } } } }, @@ -9908,9 +9851,9 @@ } }, "mochapack": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/mochapack/-/mochapack-2.0.2.tgz", - "integrity": "sha512-pUbUD5D7xv/kvwQHQbX8lU3ZGFgNLC8SWnWuu4ZLYjOiB/PG6sakmW3AYyg2c7KTGsqJO3fykZ97rtJ1on0oaw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/mochapack/-/mochapack-2.0.3.tgz", + "integrity": "sha512-rz822NBaSN0+aK9jzIc6r3ctuSP11LIbWpkVllLiSIhr+cWeueuaMbpMBMUQ9JDQ4O9UMYLfN9cWjqNcpAVTpg==", "dev": true, "requires": { "@babel/runtime-corejs2": "^7.0.0", @@ -11287,6 +11230,18 @@ "request-promise-core": "1.1.3", "stealthy-require": "^1.1.1", "tough-cookie": "^2.3.3" + }, + "dependencies": { + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } } }, "require-directory": { @@ -11547,9 +11502,9 @@ } }, "saxes": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.0.tgz", - "integrity": "sha512-LXTZygxhf8lfwKaTP/8N9CsVdjTlea3teze4lL6u37ivbgGbV0GGMuNtS/I9rnD/HC2/txUM7Df4S2LVl1qhiA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", "dev": true, "requires": { "xmlchars": "^2.2.0" @@ -12382,21 +12337,14 @@ "dev": true }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" } }, "tr46": { @@ -13004,9 +12952,9 @@ } }, "webidl-conversions": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.0.0.tgz", - "integrity": "sha512-jTZAeJnc6D+yAOjygbJOs33kVQIk5H6fj9SFDOhIKjsf9HiAzL/c+tAJsc8ASWafvhNkH+wJZms47pmajkhatA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "dev": true }, "webpack": { @@ -13201,13 +13149,13 @@ "dev": true }, "whatwg-url": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.0.0.tgz", - "integrity": "sha512-41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz", + "integrity": "sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==", "dev": true, "requires": { "lodash.sortby": "^4.7.0", - "tr46": "^2.0.0", + "tr46": "^2.0.2", "webidl-conversions": "^5.0.0" }, "dependencies": { @@ -13314,9 +13262,9 @@ } }, "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", + "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", "dev": true }, "xml-name-validator": { diff --git a/package.json b/package.json index 04e9cdd0031..43b4f616dfa 100644 --- a/package.json +++ b/package.json @@ -106,10 +106,10 @@ "exports-loader": "^1.1.0", "file-loader": "^6.0.0", "handlebars-loader": "^1.7.1", - "jsdom": "^16.2.2", + "jsdom": "^16.3.0", "jsdom-global": "^3.0.2", "mocha": "^7.1.2", - "mochapack": "^2.0.2", + "mochapack": "^2.0.3", "node-sass": "^4.14.1", "sass-loader": "^9.0.1", "sinon": "^9.0.2", |