summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------3rdparty0
-rw-r--r--README.md2
-rw-r--r--apps/encryption/l10n/fr.js4
-rw-r--r--apps/encryption/l10n/fr.json4
-rw-r--r--apps/encryption/lib/crypto/decryptall.php2
-rw-r--r--apps/files/css/detailsView.css5
-rw-r--r--apps/files/templates/fileexists.html12
-rw-r--r--apps/files_external/js/settings.js7
-rw-r--r--apps/files_external/l10n/it.js1
-rw-r--r--apps/files_external/l10n/it.json1
-rw-r--r--apps/files_external/l10n/nb_NO.js1
-rw-r--r--apps/files_external/l10n/nb_NO.json1
-rw-r--r--apps/files_external/l10n/pt_BR.js1
-rw-r--r--apps/files_external/l10n/pt_BR.json1
-rw-r--r--apps/files_external/templates/settings.php16
-rw-r--r--apps/files_sharing/l10n/da.js3
-rw-r--r--apps/files_sharing/l10n/da.json3
-rw-r--r--apps/files_sharing/l10n/fi_FI.js3
-rw-r--r--apps/files_sharing/l10n/fi_FI.json3
-rw-r--r--apps/files_sharing/l10n/it.js5
-rw-r--r--apps/files_sharing/l10n/it.json5
-rw-r--r--apps/files_sharing/l10n/nb_NO.js4
-rw-r--r--apps/files_sharing/l10n/nb_NO.json4
-rw-r--r--apps/files_sharing/l10n/nl.js3
-rw-r--r--apps/files_sharing/l10n/nl.json3
-rw-r--r--apps/files_sharing/l10n/pt_BR.js3
-rw-r--r--apps/files_sharing/l10n/pt_BR.json3
-rw-r--r--apps/files_sharing/lib/middleware/sharingcheckmiddleware.php5
-rw-r--r--apps/files_sharing/tests/locking.php4
-rw-r--r--apps/files_sharing/tests/middleware/sharingcheckmiddleware.php35
-rw-r--r--apps/files_sharing/tests/testcase.php2
-rw-r--r--apps/files_trashbin/lib/helper.php4
-rw-r--r--apps/files_versions/tests/versions.php2
-rw-r--r--apps/user_webdavauth/appinfo/app.php39
-rw-r--r--apps/user_webdavauth/appinfo/info.xml15
-rw-r--r--apps/user_webdavauth/appinfo/version1
-rw-r--r--apps/user_webdavauth/img/app.svg5
-rw-r--r--apps/user_webdavauth/l10n/.gitkeep0
-rw-r--r--apps/user_webdavauth/l10n/ar.js9
-rw-r--r--apps/user_webdavauth/l10n/ar.json7
-rw-r--r--apps/user_webdavauth/l10n/ast.js9
-rw-r--r--apps/user_webdavauth/l10n/ast.json7
-rw-r--r--apps/user_webdavauth/l10n/az.js9
-rw-r--r--apps/user_webdavauth/l10n/az.json7
-rw-r--r--apps/user_webdavauth/l10n/bg_BG.js9
-rw-r--r--apps/user_webdavauth/l10n/bg_BG.json7
-rw-r--r--apps/user_webdavauth/l10n/bn_BD.js9
-rw-r--r--apps/user_webdavauth/l10n/bn_BD.json7
-rw-r--r--apps/user_webdavauth/l10n/bn_IN.js9
-rw-r--r--apps/user_webdavauth/l10n/bn_IN.json7
-rw-r--r--apps/user_webdavauth/l10n/bs.js9
-rw-r--r--apps/user_webdavauth/l10n/bs.json7
-rw-r--r--apps/user_webdavauth/l10n/ca.js9
-rw-r--r--apps/user_webdavauth/l10n/ca.json7
-rw-r--r--apps/user_webdavauth/l10n/cs_CZ.js9
-rw-r--r--apps/user_webdavauth/l10n/cs_CZ.json7
-rw-r--r--apps/user_webdavauth/l10n/cy_GB.js6
-rw-r--r--apps/user_webdavauth/l10n/cy_GB.json4
-rw-r--r--apps/user_webdavauth/l10n/da.js9
-rw-r--r--apps/user_webdavauth/l10n/da.json7
-rw-r--r--apps/user_webdavauth/l10n/de.js9
-rw-r--r--apps/user_webdavauth/l10n/de.json7
-rw-r--r--apps/user_webdavauth/l10n/de_AT.js6
-rw-r--r--apps/user_webdavauth/l10n/de_AT.json4
-rw-r--r--apps/user_webdavauth/l10n/de_DE.js9
-rw-r--r--apps/user_webdavauth/l10n/de_DE.json7
-rw-r--r--apps/user_webdavauth/l10n/el.js9
-rw-r--r--apps/user_webdavauth/l10n/el.json7
-rw-r--r--apps/user_webdavauth/l10n/en_GB.js9
-rw-r--r--apps/user_webdavauth/l10n/en_GB.json7
-rw-r--r--apps/user_webdavauth/l10n/eo.js7
-rw-r--r--apps/user_webdavauth/l10n/eo.json5
-rw-r--r--apps/user_webdavauth/l10n/es.js9
-rw-r--r--apps/user_webdavauth/l10n/es.json7
-rw-r--r--apps/user_webdavauth/l10n/es_AR.js8
-rw-r--r--apps/user_webdavauth/l10n/es_AR.json6
-rw-r--r--apps/user_webdavauth/l10n/es_MX.js8
-rw-r--r--apps/user_webdavauth/l10n/es_MX.json6
-rw-r--r--apps/user_webdavauth/l10n/et_EE.js9
-rw-r--r--apps/user_webdavauth/l10n/et_EE.json7
-rw-r--r--apps/user_webdavauth/l10n/eu.js9
-rw-r--r--apps/user_webdavauth/l10n/eu.json7
-rw-r--r--apps/user_webdavauth/l10n/fa.js9
-rw-r--r--apps/user_webdavauth/l10n/fa.json7
-rw-r--r--apps/user_webdavauth/l10n/fi_FI.js9
-rw-r--r--apps/user_webdavauth/l10n/fi_FI.json7
-rw-r--r--apps/user_webdavauth/l10n/fr.js9
-rw-r--r--apps/user_webdavauth/l10n/fr.json7
-rw-r--r--apps/user_webdavauth/l10n/gl.js9
-rw-r--r--apps/user_webdavauth/l10n/gl.json7
-rw-r--r--apps/user_webdavauth/l10n/he.js7
-rw-r--r--apps/user_webdavauth/l10n/he.json5
-rw-r--r--apps/user_webdavauth/l10n/hi.js6
-rw-r--r--apps/user_webdavauth/l10n/hi.json4
-rw-r--r--apps/user_webdavauth/l10n/hr.js9
-rw-r--r--apps/user_webdavauth/l10n/hr.json7
-rw-r--r--apps/user_webdavauth/l10n/hu_HU.js9
-rw-r--r--apps/user_webdavauth/l10n/hu_HU.json7
-rw-r--r--apps/user_webdavauth/l10n/hy.js8
-rw-r--r--apps/user_webdavauth/l10n/hy.json6
-rw-r--r--apps/user_webdavauth/l10n/ia.js6
-rw-r--r--apps/user_webdavauth/l10n/ia.json4
-rw-r--r--apps/user_webdavauth/l10n/id.js9
-rw-r--r--apps/user_webdavauth/l10n/id.json7
-rw-r--r--apps/user_webdavauth/l10n/is.js9
-rw-r--r--apps/user_webdavauth/l10n/is.json7
-rw-r--r--apps/user_webdavauth/l10n/it.js9
-rw-r--r--apps/user_webdavauth/l10n/it.json7
-rw-r--r--apps/user_webdavauth/l10n/ja.js9
-rw-r--r--apps/user_webdavauth/l10n/ja.json7
-rw-r--r--apps/user_webdavauth/l10n/ka_GE.js7
-rw-r--r--apps/user_webdavauth/l10n/ka_GE.json5
-rw-r--r--apps/user_webdavauth/l10n/km.js8
-rw-r--r--apps/user_webdavauth/l10n/km.json6
-rw-r--r--apps/user_webdavauth/l10n/kn.js6
-rw-r--r--apps/user_webdavauth/l10n/kn.json4
-rw-r--r--apps/user_webdavauth/l10n/ko.js9
-rw-r--r--apps/user_webdavauth/l10n/ko.json7
-rw-r--r--apps/user_webdavauth/l10n/ku_IQ.js6
-rw-r--r--apps/user_webdavauth/l10n/ku_IQ.json4
-rw-r--r--apps/user_webdavauth/l10n/lb.js6
-rw-r--r--apps/user_webdavauth/l10n/lb.json4
-rw-r--r--apps/user_webdavauth/l10n/lt_LT.js9
-rw-r--r--apps/user_webdavauth/l10n/lt_LT.json7
-rw-r--r--apps/user_webdavauth/l10n/lv.js7
-rw-r--r--apps/user_webdavauth/l10n/lv.json5
-rw-r--r--apps/user_webdavauth/l10n/mk.js6
-rw-r--r--apps/user_webdavauth/l10n/mk.json4
-rw-r--r--apps/user_webdavauth/l10n/mn.js8
-rw-r--r--apps/user_webdavauth/l10n/mn.json6
-rw-r--r--apps/user_webdavauth/l10n/ms_MY.js9
-rw-r--r--apps/user_webdavauth/l10n/ms_MY.json7
-rw-r--r--apps/user_webdavauth/l10n/nb_NO.js9
-rw-r--r--apps/user_webdavauth/l10n/nb_NO.json7
-rw-r--r--apps/user_webdavauth/l10n/nl.js9
-rw-r--r--apps/user_webdavauth/l10n/nl.json7
-rw-r--r--apps/user_webdavauth/l10n/nn_NO.js8
-rw-r--r--apps/user_webdavauth/l10n/nn_NO.json6
-rw-r--r--apps/user_webdavauth/l10n/oc.js9
-rw-r--r--apps/user_webdavauth/l10n/oc.json7
-rw-r--r--apps/user_webdavauth/l10n/pl.js9
-rw-r--r--apps/user_webdavauth/l10n/pl.json7
-rw-r--r--apps/user_webdavauth/l10n/pt_BR.js9
-rw-r--r--apps/user_webdavauth/l10n/pt_BR.json7
-rw-r--r--apps/user_webdavauth/l10n/pt_PT.js9
-rw-r--r--apps/user_webdavauth/l10n/pt_PT.json7
-rw-r--r--apps/user_webdavauth/l10n/ro.js8
-rw-r--r--apps/user_webdavauth/l10n/ro.json6
-rw-r--r--apps/user_webdavauth/l10n/ru.js9
-rw-r--r--apps/user_webdavauth/l10n/ru.json7
-rw-r--r--apps/user_webdavauth/l10n/si_LK.js6
-rw-r--r--apps/user_webdavauth/l10n/si_LK.json4
-rw-r--r--apps/user_webdavauth/l10n/sk_SK.js9
-rw-r--r--apps/user_webdavauth/l10n/sk_SK.json7
-rw-r--r--apps/user_webdavauth/l10n/sl.js9
-rw-r--r--apps/user_webdavauth/l10n/sl.json7
-rw-r--r--apps/user_webdavauth/l10n/sq.js6
-rw-r--r--apps/user_webdavauth/l10n/sq.json4
-rw-r--r--apps/user_webdavauth/l10n/sr.js9
-rw-r--r--apps/user_webdavauth/l10n/sr.json7
-rw-r--r--apps/user_webdavauth/l10n/sr@latin.js9
-rw-r--r--apps/user_webdavauth/l10n/sr@latin.json7
-rw-r--r--apps/user_webdavauth/l10n/sv.js9
-rw-r--r--apps/user_webdavauth/l10n/sv.json7
-rw-r--r--apps/user_webdavauth/l10n/ta_LK.js6
-rw-r--r--apps/user_webdavauth/l10n/ta_LK.json4
-rw-r--r--apps/user_webdavauth/l10n/te.js6
-rw-r--r--apps/user_webdavauth/l10n/te.json4
-rw-r--r--apps/user_webdavauth/l10n/th_TH.js9
-rw-r--r--apps/user_webdavauth/l10n/th_TH.json7
-rw-r--r--apps/user_webdavauth/l10n/tr.js9
-rw-r--r--apps/user_webdavauth/l10n/tr.json7
-rw-r--r--apps/user_webdavauth/l10n/ug.js7
-rw-r--r--apps/user_webdavauth/l10n/ug.json5
-rw-r--r--apps/user_webdavauth/l10n/uk.js9
-rw-r--r--apps/user_webdavauth/l10n/uk.json7
-rw-r--r--apps/user_webdavauth/l10n/ur_PK.js6
-rw-r--r--apps/user_webdavauth/l10n/ur_PK.json4
-rw-r--r--apps/user_webdavauth/l10n/vi.js9
-rw-r--r--apps/user_webdavauth/l10n/vi.json7
-rw-r--r--apps/user_webdavauth/l10n/zh_CN.js9
-rw-r--r--apps/user_webdavauth/l10n/zh_CN.json7
-rw-r--r--apps/user_webdavauth/l10n/zh_HK.js9
-rw-r--r--apps/user_webdavauth/l10n/zh_HK.json7
-rw-r--r--apps/user_webdavauth/l10n/zh_TW.js8
-rw-r--r--apps/user_webdavauth/l10n/zh_TW.json6
-rw-r--r--apps/user_webdavauth/settings.php41
-rw-r--r--apps/user_webdavauth/templates/settings.php7
-rw-r--r--apps/user_webdavauth/user_webdavauth.php101
-rwxr-xr-xautotest.sh2
-rw-r--r--config/config.sample.php2
-rw-r--r--core/command/encryption/decryptall.php21
-rw-r--r--core/command/encryption/encryptall.php27
-rw-r--r--core/css/styles.css8
-rw-r--r--core/js/oc-dialogs.js5
-rw-r--r--core/js/share.js2
-rw-r--r--core/l10n/nb_NO.js2
-rw-r--r--core/l10n/nb_NO.json2
-rw-r--r--core/l10n/pt_BR.js2
-rw-r--r--core/l10n/pt_BR.json2
-rw-r--r--core/templates/login.php3
-rw-r--r--cron.php2
-rw-r--r--lib/base.php6
-rw-r--r--lib/private/activity/event.php2
-rw-r--r--lib/private/connector/sabre/file.php7
-rw-r--r--lib/private/encryption/decryptall.php5
-rw-r--r--lib/private/files/storage/dav.php9
-rw-r--r--lib/private/share/share.php5
-rw-r--r--lib/private/user.php14
-rw-r--r--settings/l10n/it.js2
-rw-r--r--settings/l10n/it.json2
-rw-r--r--tests/core/command/encryption/decryptalltest.php7
-rw-r--r--tests/core/command/encryption/encryptalltest.php4
-rw-r--r--tests/lib/cache/file.php2
-rw-r--r--tests/lib/connector/sabre/file.php17
-rw-r--r--tests/lib/encryption/decryptalltest.php15
-rw-r--r--tests/lib/files/etagtest.php4
-rw-r--r--tests/lib/files/filesystem.php4
-rw-r--r--tests/lib/files/node/file.php2
-rw-r--r--tests/lib/files/node/folder.php2
-rw-r--r--tests/lib/files/node/integration.php2
-rw-r--r--tests/lib/files/node/node.php2
-rw-r--r--tests/lib/files/node/root.php2
-rw-r--r--tests/lib/files/utils/scanner.php4
-rw-r--r--tests/lib/files/view.php2
-rw-r--r--tests/lib/group.php6
-rw-r--r--tests/lib/preview.php2
-rw-r--r--tests/lib/preview/provider.php2
-rw-r--r--tests/lib/traits/usertrait.php4
-rw-r--r--tests/lib/user.php2
-rw-r--r--tests/lib/user/avataruserdummy.php2
-rw-r--r--tests/lib/user/dummy.php2
-rw-r--r--tests/lib/user/manager.php92
-rw-r--r--tests/lib/user/session.php22
-rw-r--r--tests/lib/user/user.php24
-rw-r--r--tests/lib/util/user/dummy.php (renamed from lib/private/user/dummy.php)6
-rw-r--r--tests/settings/controller/userscontrollertest.php36
-rw-r--r--version.php4
238 files changed, 373 insertions, 1463 deletions
diff --git a/3rdparty b/3rdparty
-Subproject 6b6575b04c01e30e5f38dbb373fd5166cce0ef5
+Subproject 338ab170afcb4770e79cc4427a9803cb29a0a23
diff --git a/README.md b/README.md
index a705074d6be..1085d516263 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Quality:
- Scrutinizer: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
- CodeClimate: [![Code Climate](https://codeclimate.com/github/owncloud/core/badges/gpa.svg)](https://codeclimate.com/github/owncloud/core)
-Depencencies:
+Dependencies:
[![Dependency Status](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16)
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 0de35f8ec1c..3ee1c05ffa7 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -28,10 +28,10 @@ OC.L10N.register(
"one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ",
- "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 'ownCloud 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" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
+ "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 'ownCloud 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" : "Bonjour,\n\nL'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.\n",
"The share will expire on %s." : "Le partage expirera le %s.",
"Cheers!" : "À bientôt !",
- "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 \"ownCloud 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>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <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 \"ownCloud 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>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>.<br><br>\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.<br><br>",
"Enable recovery key" : "Activer la clé de récupération",
"Disable recovery key" : "Désactiver la clé de récupération",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 3fa598a72ce..3694682d8bc 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -26,10 +26,10 @@
"one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ",
- "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 'ownCloud 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" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
+ "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 'ownCloud 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" : "Bonjour,\n\nL'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.\n",
"The share will expire on %s." : "Le partage expirera le %s.",
"Cheers!" : "À bientôt !",
- "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 \"ownCloud 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>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <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 \"ownCloud 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>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>.<br><br>\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.<br><br>",
"Enable recovery key" : "Activer la clé de récupération",
"Disable recovery key" : "Désactiver la clé de récupération",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/crypto/decryptall.php
index 599cd82aa4d..d7cd422c5e9 100644
--- a/apps/encryption/lib/crypto/decryptall.php
+++ b/apps/encryption/lib/crypto/decryptall.php
@@ -90,7 +90,7 @@ class DecryptAll {
);
$useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword);
if ($useLoginPassword) {
- $question = new Question('Please enter the users login password: ');
+ $question = new Question('Please enter the user\'s login password: ');
} else if ($this->util->isRecoveryEnabledForUser($user) === false) {
$output->writeln('No recovery key available for user ' . $user);
return false;
diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index ea9d48b470c..8acf884f219 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -71,17 +71,14 @@
#app-sidebar .fileName h3 {
max-width: 300px;
- float:left;
+ display: inline-block;
padding: 5px 0;
margin: -5px 0;
}
#app-sidebar .file-details {
- margin-top: 3px;
- margin-bottom: 15px;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
opacity: .5;
- float:left;
}
#app-sidebar .action-favorite {
vertical-align: text-bottom;
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index 5360a7c8e8f..c783f9a05c7 100644
--- a/apps/files/templates/fileexists.html
+++ b/apps/files/templates/fileexists.html
@@ -3,24 +3,28 @@
<span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/>
<br/>
<table>
- <th><label><input class="allnewfiles" type="checkbox" />{allnewfiles}<span class="count"></span></label></th>
- <th><label><input class="allexistingfiles" type="checkbox" />{allexistingfiles}<span class="count"></span></label></th>
+ <th><input id="checkbox-allnewfiles" class="allnewfiles" type="checkbox" /><label for="checkbox-allnewfiles">{allnewfiles}<span class="count"></span></label></th>
+ <th><input id="checkbox-allexistingfiles" class="allexistingfiles" type="checkbox" /><label for="checkbox-allexistingfiles">{allexistingfiles}<span class="count"></span></label></th>
</table>
<div class="conflicts">
<div class="template">
<div class="filename"></div>
<div class="replacement">
- <input type="checkbox" />
+ <input type="checkbox" class="u-left"/>
+ <label>
<span class="svg icon"></span>
<div class="mtime"></div>
<div class="size"></div>
+ </label>
</div>
<div class="original">
- <input type="checkbox" />
+ <input type="checkbox" class="u-left" />
+ <label>
<span class="svg icon"></span>
<div class="mtime"></div>
<div class="size"></div>
<div class="message"></div>
+ </label>
</div>
</div>
</div>
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index bf9981adabf..4319677f4f4 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -15,12 +15,12 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
'<div class="drop dropdown mountOptionsDropdown">' +
// FIXME: options are hard-coded for now
' <div class="optionRow">' +
- ' <label for="mountOptionsEncrypt">{{t "files_external" "Enable encryption"}}</label>' +
' <input id="mountOptionsEncrypt" name="encrypt" type="checkbox" value="true" checked="checked"/>' +
+ ' <label for="mountOptionsEncrypt">{{t "files_external" "Enable encryption"}}</label>' +
' </div>' +
' <div class="optionRow">' +
- ' <label for="mountOptionsPreviews">{{t "files_external" "Enable previews"}}</label>' +
' <input id="mountOptionsPreviews" name="previews" type="checkbox" value="true" checked="checked"/>' +
+ ' <label for="mountOptionsPreviews">{{t "files_external" "Enable previews"}}</label>' +
' </div>' +
' <div class="optionRow">' +
' <label for="mountOptionsFilesystemCheck">{{t "files_external" "Check for changes"}}</label>' +
@@ -808,7 +808,8 @@ MountConfigListView.prototype = _.extend({
if (placeholder.indexOf('*') === 0) {
newElement = $('<input type="password" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
} else if (placeholder.indexOf('!') === 0) {
- newElement = $('<label><input type="checkbox" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>');
+ var checkboxId = _.uniqueId('checkbox_');
+ newElement = $('<input type="checkbox" id="'+checkboxId+'" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" /><label for="'+checkboxId+'">'+placeholder.substring(1)+'</label>');
} else if (placeholder.indexOf('#') === 0) {
newElement = $('<input type="hidden" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" />');
} else {
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 368ff49195e..0844e90b903 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -47,6 +47,7 @@ OC.L10N.register(
"Username" : "Nome utente",
"Password" : "Password",
"Tenant name" : "Nome tenant",
+ "Identity endpoint URL" : "URL endpoint delle identità",
"Rackspace" : "Rackspace",
"API key" : "Chiave API",
"Username and password" : "Nome utente e password",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 4da556760f6..cfe633bc328 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -45,6 +45,7 @@
"Username" : "Nome utente",
"Password" : "Password",
"Tenant name" : "Nome tenant",
+ "Identity endpoint URL" : "URL endpoint delle identità",
"Rackspace" : "Rackspace",
"API key" : "Chiave API",
"Username and password" : "Nome utente e password",
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 0089d42288d..ea912e4cf7a 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -78,6 +78,7 @@ OC.L10N.register(
"SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Delt ressurs",
+ "Domain" : "Domene",
"SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
"Username as share" : "Brukernavn som share",
"OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index 8ee2713f329..800234a931a 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -76,6 +76,7 @@
"SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Delt ressurs",
+ "Domain" : "Domene",
"SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
"Username as share" : "Brukernavn som share",
"OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 9b9d1c49a49..68b1c671c3c 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -78,6 +78,7 @@ OC.L10N.register(
"SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Compartilhar",
+ "Domain" : "Domínio",
"SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
"Username as share" : "Nome de usuário como compartilhado",
"OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index a863e6abffb..bb4c5b88a2d 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -76,6 +76,7 @@
"SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
"SMB / CIFS" : "SMB / CIFS",
"Share" : "Compartilhar",
+ "Domain" : "Domínio",
"SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
"Username as share" : "Nome de usuário como compartilhado",
"OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 63a3a19de2f..7762ff60333 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -23,14 +23,14 @@
<?php
break;
case DefinitionParameter::VALUE_BOOLEAN: ?>
- <label>
- <input type="checkbox"
- <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
- data-parameter="<?php p($parameter->getName()); ?>"
- <?php if ($value === true): ?> checked="checked"<?php endif; ?>
- />
- <?php p($placeholder); ?>
- </label>
+ <?php $checkboxId = uniqid("checkbox_"); ?>
+ <input type="checkbox"
+ id="<?php p($checkboxId); ?>"
+ <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
+ data-parameter="<?php p($parameter->getName()); ?>"
+ <?php if ($value === true): ?> checked="checked"<?php endif; ?>
+ />
+ <label for="<?php p($checkboxId); ?>"><?php p($placeholder); ?></label>
<?php
break;
case DefinitionParameter::VALUE_HIDDEN: ?>
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 7b54b361d8d..d31acc37760 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -38,6 +38,9 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Den offentligt delte fil %1$s blev downloadet",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s delt %1$s med %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s delt %1$s med gruppen %3$s",
+ "%2$s shared %1$s via link" : "%2$s delt %1$s via link",
"%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
"You shared %1$s via link" : "Du delte %1$s via link",
"Shares" : "Delt",
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index f430935e8bc..fe702de52e8 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -36,6 +36,9 @@
"Public shared file %1$s was downloaded" : "Den offentligt delte fil %1$s blev downloadet",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s delt %1$s med %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s delt %1$s med gruppen %3$s",
+ "%2$s shared %1$s via link" : "%2$s delt %1$s via link",
"%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
"You shared %1$s via link" : "Du delte %1$s via link",
"Shares" : "Delt",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 060efce51dd..2e4a32480b1 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -38,6 +38,9 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Julkisesti jaettu tiedosto %1$s ladattiin",
"You shared %1$s with %2$s" : "Jaoit kohteen %1$s käyttäjän %2$s kanssa",
"You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
+ "%2$s shared %1$s with %3$s" : "%2$s jakoi kohteen %1$s käyttäjän %3$s kanssa",
+ "%2$s shared %1$s with group %3$s" : "%2$s jakoi kohteen %1$s ryhmän %3$s kanssa",
+ "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
"%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
"You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
"Shares" : "Jaot",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 091f7aec81f..2b938d95c0e 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -36,6 +36,9 @@
"Public shared file %1$s was downloaded" : "Julkisesti jaettu tiedosto %1$s ladattiin",
"You shared %1$s with %2$s" : "Jaoit kohteen %1$s käyttäjän %2$s kanssa",
"You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
+ "%2$s shared %1$s with %3$s" : "%2$s jakoi kohteen %1$s käyttäjän %3$s kanssa",
+ "%2$s shared %1$s with group %3$s" : "%2$s jakoi kohteen %1$s ryhmän %3$s kanssa",
+ "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
"%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
"You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
"Shares" : "Jaot",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 0167ef4625d..d6fcab9c788 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -38,6 +38,9 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
"You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
+ "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
"%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
"You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
"Shares" : "Condivisioni",
@@ -46,7 +49,7 @@ OC.L10N.register(
"Decline" : "Rifiuta",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
"Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
- "This share is password-protected" : "Questa condivione è protetta da password",
+ "This share is password-protected" : "Questa condivisione è protetta da password",
"The password is wrong. Try again." : "La password è errata. Prova ancora.",
"Password" : "Password",
"No entries found in this folder" : "Nessuna voce trovata in questa cartella",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index ae26579572a..1ae87296032 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -36,6 +36,9 @@
"Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
"You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
"You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
+ "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
"%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
"You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
"Shares" : "Condivisioni",
@@ -44,7 +47,7 @@
"Decline" : "Rifiuta",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
"Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
- "This share is password-protected" : "Questa condivione è protetta da password",
+ "This share is password-protected" : "Questa condivisione è protetta da password",
"The password is wrong. Try again." : "La password è errata. Prova ancora.",
"Password" : "Password",
"No entries found in this folder" : "Nessuna voce trovata in questa cartella",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index b8b6c634959..a8f7fbdbc9b 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -38,9 +38,13 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
+ "%2$s shared %1$s via link" : "%2$s delte %1$s via lenke",
"%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"You shared %1$s via link" : "Du delte %1$s via lenke",
"Shares" : "Delinger",
+ "You received %2$s as a remote share from %1$s" : "Du mottok %2$s som en ekstern deling fra %1$s",
"Accept" : "Aksepter",
"Decline" : "Avslå",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index 9382119e5c4..e9c67955708 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -36,9 +36,13 @@
"Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
"You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
"You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
+ "%2$s shared %1$s via link" : "%2$s delte %1$s via lenke",
"%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
"You shared %1$s via link" : "Du delte %1$s via lenke",
"Shares" : "Delinger",
+ "You received %2$s as a remote share from %1$s" : "Du mottok %2$s som en ekstern deling fra %1$s",
"Accept" : "Aksepter",
"Decline" : "Avslå",
"Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index 2ccddb5d9a7..f1edae5f8eb 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -38,6 +38,9 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
"You shared %1$s with %2$s" : "U deelde %1$s met %2$s",
"You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
+ "%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
"%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
"You shared %1$s via link" : "U deelde %1$s via link",
"Shares" : "Gedeeld",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 53cd8954898..a285071ca30 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -36,6 +36,9 @@
"Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
"You shared %1$s with %2$s" : "U deelde %1$s met %2$s",
"You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
+ "%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
"%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
"You shared %1$s via link" : "U deelde %1$s via link",
"Shares" : "Gedeeld",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index bb455487186..cb167dfb5a4 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -38,6 +38,9 @@ OC.L10N.register(
"Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
"You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
"You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
+ "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
"%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
"You shared %1$s via link" : "Você compartilhou %1$s via link",
"Shares" : "Compartilhamentos",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 7db2b1f0494..b42a56f03ce 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -36,6 +36,9 @@
"Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
"You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
"You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
+ "%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
+ "%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
+ "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
"%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
"You shared %1$s via link" : "Você compartilhou %1$s via link",
"Shares" : "Compartilhamentos",
diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
index 3787ef42d9f..1c29b1da736 100644
--- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
@@ -87,6 +87,11 @@ class SharingCheckMiddleware extends Middleware {
return false;
}
+ // Check if the shareAPI is enabled
+ if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+ return false;
+ }
+
// Check whether public sharing is enabled
if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
return false;
diff --git a/apps/files_sharing/tests/locking.php b/apps/files_sharing/tests/locking.php
index 6d13fc1cda5..269c924d142 100644
--- a/apps/files_sharing/tests/locking.php
+++ b/apps/files_sharing/tests/locking.php
@@ -30,7 +30,7 @@ use OCP\Lock\ILockingProvider;
class Locking extends TestCase {
/**
- * @var \OC_User_Dummy
+ * @var \Test\Util\User\Dummy
*/
private $userBackend;
@@ -40,7 +40,7 @@ class Locking extends TestCase {
public function setUp() {
parent::setUp();
- $this->userBackend = new \OC_User_Dummy();
+ $this->userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($this->userBackend);
$this->ownerUid = $this->getUniqueID('owner_');
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index 0db8a1ed5bc..58f4b841339 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -54,7 +54,13 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
->will($this->returnValue(true));
$this->config
- ->expects($this->once())
+ ->expects($this->at(0))
+ ->method('getAppValue')
+ ->with('core', 'shareapi_enabled', 'yes')
+ ->will($this->returnValue('yes'));
+
+ $this->config
+ ->expects($this->at(1))
->method('getAppValue')
->with('core', 'shareapi_allow_links', 'yes')
->will($this->returnValue('yes'));
@@ -72,7 +78,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
}
- public function testIsSharingEnabledWithSharingDisabled() {
+ public function testIsSharingEnabledWithLinkSharingDisabled() {
$this->appManager
->expects($this->once())
->method('isEnabledForUser')
@@ -80,11 +86,34 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
->will($this->returnValue(true));
$this->config
- ->expects($this->once())
+ ->expects($this->at(0))
+ ->method('getAppValue')
+ ->with('core', 'shareapi_enabled', 'yes')
+ ->will($this->returnValue('yes'));
+
+ $this->config
+ ->expects($this->at(1))
->method('getAppValue')
->with('core', 'shareapi_allow_links', 'yes')
->will($this->returnValue('no'));
$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
}
+
+ public function testIsSharingEnabledWithSharingAPIDisabled() {
+ $this->appManager
+ ->expects($this->once())
+ ->method('isEnabledForUser')
+ ->with('files_sharing')
+ ->will($this->returnValue(true));
+
+ $this->config
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->with('core', 'shareapi_enabled', 'yes')
+ ->will($this->returnValue('no'));
+
+ $this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+ }
+
}
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 7533b13f79d..c91734a5b03 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -72,7 +72,7 @@ abstract class TestCase extends \Test\TestCase {
\OC::registerShareHooks();
// create users
- $backend = new \OC_User_Dummy();
+ $backend = new \Test\Util\User\Dummy();
\OC_User::useBackend($backend);
$backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1);
$backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2);
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index f51185712a9..0baa2b5414b 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -65,11 +65,14 @@ class Helper
if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
$id = $entryName;
if ($dir === '' || $dir === '/') {
+ $size = $view->filesize($id);
$pathparts = pathinfo($entryName);
$timestamp = substr($pathparts['extension'], 1);
$id = $pathparts['filename'];
+
} else if ($timestamp === null) {
// for subfolders we need to calculate the timestamp only once
+ $size = $view->filesize($dir . '/' . $id);
$parts = explode('/', ltrim($dir, '/'));
$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
}
@@ -86,6 +89,7 @@ class Helper
'mimetype' => $view->is_dir($dir . '/' . $entryName) ? 'httpd/unix-directory' : \OC_Helper::getFileNameMimeType($id),
'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file',
'directory' => ($dir === '/') ? '' : $dir,
+ 'size' => $size,
);
if ($originalPath) {
$i['extraData'] = $originalPath.'/'.$id;
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 7cca409ed6c..da214ead60a 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -749,7 +749,7 @@ class Test_Files_Versioning extends \Test\TestCase {
public static function loginHelper($user, $create = false) {
if ($create) {
- $backend = new \OC_User_Dummy();
+ $backend = new \Test\Util\User\Dummy();
$backend->createUser($user, $user);
\OC::$server->getUserManager()->registerBackend($backend);
}
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
deleted file mode 100644
index 3f76f803efd..00000000000
--- a/apps/user_webdavauth/appinfo/app.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @author Felix Moeller <mail@felixmoeller.de>
- * @author Frank Karlitschek <frank@owncloud.org>
- * @author j-ed <juergen@eisfair.org>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-require_once OC_App::getAppPath('user_webdavauth').'/user_webdavauth.php';
-
-OC_APP::registerAdmin('user_webdavauth', 'settings');
-
-OC_User::registerBackend("WEBDAVAUTH");
-OC_User::useBackend( "WEBDAVAUTH" );
-
-// add settings page to navigation
-$entry = array(
- 'id' => "user_webdavauth_settings",
- 'order'=>1,
- 'href' => \OCP\Util::linkTo( "user_webdavauth", "settings.php" ),
- 'name' => 'WEBDAVAUTH'
-);
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
deleted file mode 100644
index b0827fb51f8..00000000000
--- a/apps/user_webdavauth/appinfo/info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<info>
- <id>user_webdavauth</id>
- <name>User backend using remote HTTP servers</name>
- <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other web server to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.
-
- Attention: This app is not compatible with the LDAP user and group backend. This app is not the WebDAV interface of ownCloud, if you don't understand what it does then do not enable it.</description>
- <licence>AGPL</licence>
- <author>Frank Karlitschek</author>
- <requiremin>4.93</requiremin>
- <shipped>true</shipped>
- <types>
- <authentication/>
- </types>
-</info>
diff --git a/apps/user_webdavauth/appinfo/version b/apps/user_webdavauth/appinfo/version
deleted file mode 100644
index a3fdef3af89..00000000000
--- a/apps/user_webdavauth/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.0.2
diff --git a/apps/user_webdavauth/img/app.svg b/apps/user_webdavauth/img/app.svg
deleted file mode 100644
index 0ce7ed867bd..00000000000
--- a/apps/user_webdavauth/img/app.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" fill="#fff" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/>
-</svg>
diff --git a/apps/user_webdavauth/l10n/.gitkeep b/apps/user_webdavauth/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/apps/user_webdavauth/l10n/.gitkeep
+++ /dev/null
diff --git a/apps/user_webdavauth/l10n/ar.js b/apps/user_webdavauth/l10n/ar.js
deleted file mode 100644
index 4b78f99ec6f..00000000000
--- a/apps/user_webdavauth/l10n/ar.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "تأكد شخصية ال WebDAV",
- "Address:" : "العنوان:",
- "Save" : "حفظ",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "سيتم إرسال معلومات المستخدم إلى هذا العنوان. يقوم هذا البرنامج بالتحقق من البيانات ويقوم بإعتبار رودود حالة HTTP برقم 401 و403 كمعلومات غير صحيحة, أما غيرها فسيعتبر صحيح."
-},
-"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/user_webdavauth/l10n/ar.json b/apps/user_webdavauth/l10n/ar.json
deleted file mode 100644
index d424faf0abc..00000000000
--- a/apps/user_webdavauth/l10n/ar.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "تأكد شخصية ال WebDAV",
- "Address:" : "العنوان:",
- "Save" : "حفظ",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "سيتم إرسال معلومات المستخدم إلى هذا العنوان. يقوم هذا البرنامج بالتحقق من البيانات ويقوم بإعتبار رودود حالة HTTP برقم 401 و403 كمعلومات غير صحيحة, أما غيرها فسيعتبر صحيح."
-},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ast.js b/apps/user_webdavauth/l10n/ast.js
deleted file mode 100644
index 87a890666cb..00000000000
--- a/apps/user_webdavauth/l10n/ast.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticación per aciu de WevDAV",
- "Address:" : "Direición:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credenciales d'usuariu van unviase a esta direición. Esti complementu verifica la rempuesta y va interpretar los códigos de rempuesta HTTP 401 y 403 como credenciales inválides y toles otres rempuestes como credenciales válides."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ast.json b/apps/user_webdavauth/l10n/ast.json
deleted file mode 100644
index 52172d5afb9..00000000000
--- a/apps/user_webdavauth/l10n/ast.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticación per aciu de WevDAV",
- "Address:" : "Direición:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credenciales d'usuariu van unviase a esta direición. Esti complementu verifica la rempuesta y va interpretar los códigos de rempuesta HTTP 401 y 403 como credenciales inválides y toles otres rempuestes como credenciales válides."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/az.js b/apps/user_webdavauth/l10n/az.js
deleted file mode 100644
index e39b9a160e0..00000000000
--- a/apps/user_webdavauth/l10n/az.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV qeydiyyatı",
- "Address:" : "Ünvan: ",
- "Save" : "Saxla",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "İstifadəçi verilənləri bu ünvana göndəriləcək. Bu əlavə imkan cavabı yoxlayır və HTTP status code-lari 401,403-ü yalnış verilənlər kimi interpretasiya edir. Bütün digər cavablar isə dügün verilənlərdir."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/az.json b/apps/user_webdavauth/l10n/az.json
deleted file mode 100644
index cd63759e75c..00000000000
--- a/apps/user_webdavauth/l10n/az.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV qeydiyyatı",
- "Address:" : "Ünvan: ",
- "Save" : "Saxla",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "İstifadəçi verilənləri bu ünvana göndəriləcək. Bu əlavə imkan cavabı yoxlayır və HTTP status code-lari 401,403-ü yalnış verilənlər kimi interpretasiya edir. Bütün digər cavablar isə dügün verilənlərdir."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bg_BG.js b/apps/user_webdavauth/l10n/bg_BG.js
deleted file mode 100644
index 7a1272be90c..00000000000
--- a/apps/user_webdavauth/l10n/bg_BG.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV Идентификация",
- "Address:" : "Адрес:",
- "Save" : "Запиши",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Потребителското име и парола ще да бъдат изптатени до този адрес. Добавката ще провери отговора и ще интрепретира HTTP кодове 401 и 403 като невалидни, а всички останали като потвърдена идентификация."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/bg_BG.json b/apps/user_webdavauth/l10n/bg_BG.json
deleted file mode 100644
index 4ab9458e8e4..00000000000
--- a/apps/user_webdavauth/l10n/bg_BG.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV Идентификация",
- "Address:" : "Адрес:",
- "Save" : "Запиши",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Потребителското име и парола ще да бъдат изптатени до този адрес. Добавката ще провери отговора и ще интрепретира HTTP кодове 401 и 403 като невалидни, а всички останали като потвърдена идентификация."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bn_BD.js b/apps/user_webdavauth/l10n/bn_BD.js
deleted file mode 100644
index 9773db8bef6..00000000000
--- a/apps/user_webdavauth/l10n/bn_BD.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV অনুমোদন",
- "Address:" : "ঠিকানা",
- "Save" : "সংরক্ষণ",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর তথ্যাদি এই ঠিকানায় পাঠানো হবে। এই প্লাগইন প্রত্যুত্তর পরীক্ষা করে দেখবে এবং HTTP statuscodes 401 and 403 কে অবৈধ তথ্যাদিরূপে অনুবাদ করে অন্য সকল প্রত্যুত্তরকে বৈধতা দেবে। "
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/bn_BD.json b/apps/user_webdavauth/l10n/bn_BD.json
deleted file mode 100644
index cda6cf08e31..00000000000
--- a/apps/user_webdavauth/l10n/bn_BD.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV অনুমোদন",
- "Address:" : "ঠিকানা",
- "Save" : "সংরক্ষণ",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর তথ্যাদি এই ঠিকানায় পাঠানো হবে। এই প্লাগইন প্রত্যুত্তর পরীক্ষা করে দেখবে এবং HTTP statuscodes 401 and 403 কে অবৈধ তথ্যাদিরূপে অনুবাদ করে অন্য সকল প্রত্যুত্তরকে বৈধতা দেবে। "
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bn_IN.js b/apps/user_webdavauth/l10n/bn_IN.js
deleted file mode 100644
index 6790de24520..00000000000
--- a/apps/user_webdavauth/l10n/bn_IN.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV প্রমাণীকরণ",
- "Address:" : "ঠিকানা",
- "Save" : "সেভ",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর শংসাপত্র এই ঠিকানায় পাঠানো হবে।এই প্লাগিন প্রতিক্রিয়া পরীক্ষা করে এবং HTTP-statuscodes 401 এবং 403 কে অবৈধ প্রমাণপত্রাদি হিসাবে ব্যাখা করে,এবং সমস্ত অন্যান্য প্রত্যুত্তর বৈধ প্রমাণপত্রাদি হিসেবে ব্যাখ্যা করে।"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/bn_IN.json b/apps/user_webdavauth/l10n/bn_IN.json
deleted file mode 100644
index 3542f14a7b1..00000000000
--- a/apps/user_webdavauth/l10n/bn_IN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV প্রমাণীকরণ",
- "Address:" : "ঠিকানা",
- "Save" : "সেভ",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর শংসাপত্র এই ঠিকানায় পাঠানো হবে।এই প্লাগিন প্রতিক্রিয়া পরীক্ষা করে এবং HTTP-statuscodes 401 এবং 403 কে অবৈধ প্রমাণপত্রাদি হিসাবে ব্যাখা করে,এবং সমস্ত অন্যান্য প্রত্যুত্তর বৈধ প্রমাণপত্রাদি হিসেবে ব্যাখ্যা করে।"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bs.js b/apps/user_webdavauth/l10n/bs.js
deleted file mode 100644
index 5cdb03a07f1..00000000000
--- a/apps/user_webdavauth/l10n/bs.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV autentifikacija",
- "Address:" : "Adresa:",
- "Save" : "Spasi",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnikovi akreditivi biti će poslani na ovu adresu. Ovaj plugin proverava odgovor i tumači status HTTP kodova 401 i 403 kao nevažeće akreditive, i sve druge odgovore kao validne akreditive."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/bs.json b/apps/user_webdavauth/l10n/bs.json
deleted file mode 100644
index 823be754a41..00000000000
--- a/apps/user_webdavauth/l10n/bs.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV autentifikacija",
- "Address:" : "Adresa:",
- "Save" : "Spasi",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnikovi akreditivi biti će poslani na ovu adresu. Ovaj plugin proverava odgovor i tumači status HTTP kodova 401 i 403 kao nevažeće akreditive, i sve druge odgovore kao validne akreditive."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ca.js b/apps/user_webdavauth/l10n/ca.js
deleted file mode 100644
index baaa239098f..00000000000
--- a/apps/user_webdavauth/l10n/ca.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticació WebDAV",
- "Address:" : "Adreça:",
- "Save" : "Desa",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credencials d'usuari s'enviaran a aquesta adreça. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ca.json b/apps/user_webdavauth/l10n/ca.json
deleted file mode 100644
index 715c286af48..00000000000
--- a/apps/user_webdavauth/l10n/ca.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticació WebDAV",
- "Address:" : "Adreça:",
- "Save" : "Desa",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credencials d'usuari s'enviaran a aquesta adreça. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/cs_CZ.js b/apps/user_webdavauth/l10n/cs_CZ.js
deleted file mode 100644
index 0fbf38d53ef..00000000000
--- a/apps/user_webdavauth/l10n/cs_CZ.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Ověření WebDAV",
- "Address:" : "Adresa:",
- "Save" : "Uložit",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uživatelské přihlašovací údaje budou odeslány na tuto adresu. Tento plugin zkontroluje odpověď serveru a interpretuje návratový kód HTTP 401 a 403 jako neplatné přihlašovací údaje a jakýkoli jiný jako platné přihlašovací údaje."
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/cs_CZ.json b/apps/user_webdavauth/l10n/cs_CZ.json
deleted file mode 100644
index 0ee73e9a9dd..00000000000
--- a/apps/user_webdavauth/l10n/cs_CZ.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Ověření WebDAV",
- "Address:" : "Adresa:",
- "Save" : "Uložit",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uživatelské přihlašovací údaje budou odeslány na tuto adresu. Tento plugin zkontroluje odpověď serveru a interpretuje návratový kód HTTP 401 a 403 jako neplatné přihlašovací údaje a jakýkoli jiný jako platné přihlašovací údaje."
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/cy_GB.js b/apps/user_webdavauth/l10n/cy_GB.js
deleted file mode 100644
index 739908abf4b..00000000000
--- a/apps/user_webdavauth/l10n/cy_GB.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "Cadw"
-},
-"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/user_webdavauth/l10n/cy_GB.json b/apps/user_webdavauth/l10n/cy_GB.json
deleted file mode 100644
index e0ec790857f..00000000000
--- a/apps/user_webdavauth/l10n/cy_GB.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "Cadw"
-},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/da.js b/apps/user_webdavauth/l10n/da.js
deleted file mode 100644
index f545d82413b..00000000000
--- a/apps/user_webdavauth/l10n/da.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-godkendelse",
- "Address:" : "Adresse:",
- "Save" : "Gem",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/da.json b/apps/user_webdavauth/l10n/da.json
deleted file mode 100644
index c0e7a709b57..00000000000
--- a/apps/user_webdavauth/l10n/da.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-godkendelse",
- "Address:" : "Adresse:",
- "Save" : "Gem",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de.js b/apps/user_webdavauth/l10n/de.js
deleted file mode 100644
index 6e667dca0b7..00000000000
--- a/apps/user_webdavauth/l10n/de.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-Authentifizierung",
- "Address:" : "Adresse:",
- "Save" : "Speichern",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de.json b/apps/user_webdavauth/l10n/de.json
deleted file mode 100644
index f347f7724e5..00000000000
--- a/apps/user_webdavauth/l10n/de.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-Authentifizierung",
- "Address:" : "Adresse:",
- "Save" : "Speichern",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de_AT.js b/apps/user_webdavauth/l10n/de_AT.js
deleted file mode 100644
index 61b244f4ae4..00000000000
--- a/apps/user_webdavauth/l10n/de_AT.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "Speichern"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de_AT.json b/apps/user_webdavauth/l10n/de_AT.json
deleted file mode 100644
index a61814a0978..00000000000
--- a/apps/user_webdavauth/l10n/de_AT.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "Speichern"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de_DE.js b/apps/user_webdavauth/l10n/de_DE.js
deleted file mode 100644
index 6e667dca0b7..00000000000
--- a/apps/user_webdavauth/l10n/de_DE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-Authentifizierung",
- "Address:" : "Adresse:",
- "Save" : "Speichern",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de_DE.json b/apps/user_webdavauth/l10n/de_DE.json
deleted file mode 100644
index f347f7724e5..00000000000
--- a/apps/user_webdavauth/l10n/de_DE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-Authentifizierung",
- "Address:" : "Adresse:",
- "Save" : "Speichern",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/el.js b/apps/user_webdavauth/l10n/el.js
deleted file mode 100644
index 81a2cea52fd..00000000000
--- a/apps/user_webdavauth/l10n/el.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Πιστοποίηση μέσω WebDAV ",
- "Address:" : "Διεύθυνση:",
- "Save" : "Αποθήκευση",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Τα διαπιστευτήρια του χρήστη θα σταλούν σε αυτή την διεύθυνση. Αυτό το πρόσθετο ελέγχει την απόκριση και θα ερμηνεύσει τους κωδικούς κατάστασης HTTP 401 και 402 ως μη έγκυρα διαπιστευτήρια και όλες τις άλλες αποκρίσεις ως έγκυρα διαπιστευτήρια."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/el.json b/apps/user_webdavauth/l10n/el.json
deleted file mode 100644
index 2335801c723..00000000000
--- a/apps/user_webdavauth/l10n/el.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Πιστοποίηση μέσω WebDAV ",
- "Address:" : "Διεύθυνση:",
- "Save" : "Αποθήκευση",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Τα διαπιστευτήρια του χρήστη θα σταλούν σε αυτή την διεύθυνση. Αυτό το πρόσθετο ελέγχει την απόκριση και θα ερμηνεύσει τους κωδικούς κατάστασης HTTP 401 και 402 ως μη έγκυρα διαπιστευτήρια και όλες τις άλλες αποκρίσεις ως έγκυρα διαπιστευτήρια."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/en_GB.js b/apps/user_webdavauth/l10n/en_GB.js
deleted file mode 100644
index 5eaa8449d4d..00000000000
--- a/apps/user_webdavauth/l10n/en_GB.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV Authentication",
- "Address:" : "Address:",
- "Save" : "Save",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/en_GB.json b/apps/user_webdavauth/l10n/en_GB.json
deleted file mode 100644
index 12957ea2b02..00000000000
--- a/apps/user_webdavauth/l10n/en_GB.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV Authentication",
- "Address:" : "Address:",
- "Save" : "Save",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/eo.js b/apps/user_webdavauth/l10n/eo.js
deleted file mode 100644
index 657042a08f6..00000000000
--- a/apps/user_webdavauth/l10n/eo.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-aŭtentigo",
- "Save" : "Konservi"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/eo.json b/apps/user_webdavauth/l10n/eo.json
deleted file mode 100644
index 17bb6935824..00000000000
--- a/apps/user_webdavauth/l10n/eo.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-aŭtentigo",
- "Save" : "Konservi"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/es.js b/apps/user_webdavauth/l10n/es.js
deleted file mode 100644
index 107e7332e4e..00000000000
--- a/apps/user_webdavauth/l10n/es.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticación mediante WevDAV",
- "Address:" : "Dirección:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/es.json b/apps/user_webdavauth/l10n/es.json
deleted file mode 100644
index 57d2c4f7027..00000000000
--- a/apps/user_webdavauth/l10n/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticación mediante WevDAV",
- "Address:" : "Dirección:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/es_AR.js b/apps/user_webdavauth/l10n/es_AR.js
deleted file mode 100644
index ab1e59432ba..00000000000
--- a/apps/user_webdavauth/l10n/es_AR.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticación de WebDAV",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/es_AR.json b/apps/user_webdavauth/l10n/es_AR.json
deleted file mode 100644
index 36947d9c1a6..00000000000
--- a/apps/user_webdavauth/l10n/es_AR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticación de WebDAV",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/es_MX.js b/apps/user_webdavauth/l10n/es_MX.js
deleted file mode 100644
index 57412d0c230..00000000000
--- a/apps/user_webdavauth/l10n/es_MX.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticación mediante WevDAV",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/es_MX.json b/apps/user_webdavauth/l10n/es_MX.json
deleted file mode 100644
index 26b45a98600..00000000000
--- a/apps/user_webdavauth/l10n/es_MX.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticación mediante WevDAV",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/et_EE.js b/apps/user_webdavauth/l10n/et_EE.js
deleted file mode 100644
index 3644bb8cd8d..00000000000
--- a/apps/user_webdavauth/l10n/et_EE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV autentimine",
- "Address:" : "Aadress:",
- "Save" : "Salvesta",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab ning tõlgendab HTTP olekukoodid 401 ja 403 valedeks andmeteks ning kõik teised vastused korrektseteks andmeteks."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/et_EE.json b/apps/user_webdavauth/l10n/et_EE.json
deleted file mode 100644
index 5893006b4a5..00000000000
--- a/apps/user_webdavauth/l10n/et_EE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV autentimine",
- "Address:" : "Aadress:",
- "Save" : "Salvesta",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab ning tõlgendab HTTP olekukoodid 401 ja 403 valedeks andmeteks ning kõik teised vastused korrektseteks andmeteks."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/eu.js b/apps/user_webdavauth/l10n/eu.js
deleted file mode 100644
index abc45c1adf3..00000000000
--- a/apps/user_webdavauth/l10n/eu.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV Autentikazioa",
- "Address:" : "Helbidea:",
- "Save" : "Gorde",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/eu.json b/apps/user_webdavauth/l10n/eu.json
deleted file mode 100644
index 83763ecaaff..00000000000
--- a/apps/user_webdavauth/l10n/eu.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV Autentikazioa",
- "Address:" : "Helbidea:",
- "Save" : "Gorde",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fa.js b/apps/user_webdavauth/l10n/fa.js
deleted file mode 100644
index 13f994c5520..00000000000
--- a/apps/user_webdavauth/l10n/fa.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "اعتبار سنجی WebDAV ",
- "Address:" : "آدرس:",
- "Save" : "ذخیره",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "جزئیات کاربر به این آدرس ارسال خواهد شد. این پلاگین پاسخ را بررسی خواهد کرد و کدهای حالت HTTP شماره 401 و 403 را به عنوان اعتبارات غیر معتبر ترجمه می کند، و باقی موارد را به عنوان موارد معتبر تشخیص می دهد."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/fa.json b/apps/user_webdavauth/l10n/fa.json
deleted file mode 100644
index e200dc46986..00000000000
--- a/apps/user_webdavauth/l10n/fa.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "اعتبار سنجی WebDAV ",
- "Address:" : "آدرس:",
- "Save" : "ذخیره",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "جزئیات کاربر به این آدرس ارسال خواهد شد. این پلاگین پاسخ را بررسی خواهد کرد و کدهای حالت HTTP شماره 401 و 403 را به عنوان اعتبارات غیر معتبر ترجمه می کند، و باقی موارد را به عنوان موارد معتبر تشخیص می دهد."
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fi_FI.js b/apps/user_webdavauth/l10n/fi_FI.js
deleted file mode 100644
index 4d98c51d778..00000000000
--- a/apps/user_webdavauth/l10n/fi_FI.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-todennus",
- "Address:" : "Osoite:",
- "Save" : "Tallenna",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Käyttäjätiedot lähetetään tähän osoitteeseen. Liitännäinen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vääriksi käyttäjätiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi käyttäjätiedoiksi."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/fi_FI.json b/apps/user_webdavauth/l10n/fi_FI.json
deleted file mode 100644
index 412813eea4a..00000000000
--- a/apps/user_webdavauth/l10n/fi_FI.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-todennus",
- "Address:" : "Osoite:",
- "Save" : "Tallenna",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Käyttäjätiedot lähetetään tähän osoitteeseen. Liitännäinen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vääriksi käyttäjätiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi käyttäjätiedoiksi."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fr.js b/apps/user_webdavauth/l10n/fr.js
deleted file mode 100644
index 5a89cf211ef..00000000000
--- a/apps/user_webdavauth/l10n/fr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Authentification WebDAV",
- "Address:" : "Adresse :",
- "Save" : "Sauvegarder",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/fr.json b/apps/user_webdavauth/l10n/fr.json
deleted file mode 100644
index 72336cad0b2..00000000000
--- a/apps/user_webdavauth/l10n/fr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Authentification WebDAV",
- "Address:" : "Adresse :",
- "Save" : "Sauvegarder",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/gl.js b/apps/user_webdavauth/l10n/gl.js
deleted file mode 100644
index cd561a4ee56..00000000000
--- a/apps/user_webdavauth/l10n/gl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticación WebDAV",
- "Address:" : "Enderezo:",
- "Save" : "Gardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do usuario serán enviadas a este enderezo. Este engadido comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/gl.json b/apps/user_webdavauth/l10n/gl.json
deleted file mode 100644
index 54a2af90867..00000000000
--- a/apps/user_webdavauth/l10n/gl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticación WebDAV",
- "Address:" : "Enderezo:",
- "Save" : "Gardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do usuario serán enviadas a este enderezo. Este engadido comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/he.js b/apps/user_webdavauth/l10n/he.js
deleted file mode 100644
index b88c6b72aac..00000000000
--- a/apps/user_webdavauth/l10n/he.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "הזדהות מול WebDAV",
- "Save" : "שמירה"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/he.json b/apps/user_webdavauth/l10n/he.json
deleted file mode 100644
index fc168aae3d6..00000000000
--- a/apps/user_webdavauth/l10n/he.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "הזדהות מול WebDAV",
- "Save" : "שמירה"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hi.js b/apps/user_webdavauth/l10n/hi.js
deleted file mode 100644
index 840317d2906..00000000000
--- a/apps/user_webdavauth/l10n/hi.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "सहेजें"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hi.json b/apps/user_webdavauth/l10n/hi.json
deleted file mode 100644
index 8ddb046ec63..00000000000
--- a/apps/user_webdavauth/l10n/hi.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "सहेजें"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hr.js b/apps/user_webdavauth/l10n/hr.js
deleted file mode 100644
index 1c3044b69b3..00000000000
--- a/apps/user_webdavauth/l10n/hr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV autentifikacija",
- "Address:" : "Adresa:",
- "Save" : "Spremi",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički podaci će biti poslani na tu adresu. Ovaj dodatak provjerava odgovor i interpretira HTTP status 401 i 403 kao neuspječnu prijavu, svi ostali statusi znače da je prijava uspješna i da su korisnički podaci točni."
-},
-"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/hr.json b/apps/user_webdavauth/l10n/hr.json
deleted file mode 100644
index 20ff7796fbb..00000000000
--- a/apps/user_webdavauth/l10n/hr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV autentifikacija",
- "Address:" : "Adresa:",
- "Save" : "Spremi",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički podaci će biti poslani na tu adresu. Ovaj dodatak provjerava odgovor i interpretira HTTP status 401 i 403 kao neuspječnu prijavu, svi ostali statusi znače da je prijava uspješna i da su korisnički podaci točni."
-},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hu_HU.js b/apps/user_webdavauth/l10n/hu_HU.js
deleted file mode 100644
index 354283be7b9..00000000000
--- a/apps/user_webdavauth/l10n/hu_HU.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV hitelesítés",
- "Address:" : "Cím:",
- "Save" : "Mentés",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hu_HU.json b/apps/user_webdavauth/l10n/hu_HU.json
deleted file mode 100644
index 6631ee61c63..00000000000
--- a/apps/user_webdavauth/l10n/hu_HU.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV hitelesítés",
- "Address:" : "Cím:",
- "Save" : "Mentés",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hy.js b/apps/user_webdavauth/l10n/hy.js
deleted file mode 100644
index 83f869e3dbd..00000000000
--- a/apps/user_webdavauth/l10n/hy.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV նույնականացում",
- "Address:" : "Հասցե՝",
- "Save" : "Պահպանել"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hy.json b/apps/user_webdavauth/l10n/hy.json
deleted file mode 100644
index 17703f4e54e..00000000000
--- a/apps/user_webdavauth/l10n/hy.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV նույնականացում",
- "Address:" : "Հասցե՝",
- "Save" : "Պահպանել"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ia.js b/apps/user_webdavauth/l10n/ia.js
deleted file mode 100644
index 651840bf0c1..00000000000
--- a/apps/user_webdavauth/l10n/ia.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "Salveguardar"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ia.json b/apps/user_webdavauth/l10n/ia.json
deleted file mode 100644
index 91d310a33b7..00000000000
--- a/apps/user_webdavauth/l10n/ia.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "Salveguardar"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/id.js b/apps/user_webdavauth/l10n/id.js
deleted file mode 100644
index d71da240e27..00000000000
--- a/apps/user_webdavauth/l10n/id.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Otentikasi WebDAV",
- "Address:" : "Alamat:",
- "Save" : "Simpan",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan mengartikan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/id.json b/apps/user_webdavauth/l10n/id.json
deleted file mode 100644
index ba327c72dda..00000000000
--- a/apps/user_webdavauth/l10n/id.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Otentikasi WebDAV",
- "Address:" : "Alamat:",
- "Save" : "Simpan",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan mengartikan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/is.js b/apps/user_webdavauth/l10n/is.js
deleted file mode 100644
index 1a09c2729e5..00000000000
--- a/apps/user_webdavauth/l10n/is.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV Auðkenni",
- "Address:" : "Netfang:",
- "Save" : "Vista",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Notanda auðkenni verður sent á þetta netfang. Þessi viðbót fer yfir viðbrögð og túlkar HTTP statuscodes 401 og 403 sem ógilda auðkenni, og öll önnur svör sem gilt auðkenni."
-},
-"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/user_webdavauth/l10n/is.json b/apps/user_webdavauth/l10n/is.json
deleted file mode 100644
index 08ff2d6df30..00000000000
--- a/apps/user_webdavauth/l10n/is.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV Auðkenni",
- "Address:" : "Netfang:",
- "Save" : "Vista",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Notanda auðkenni verður sent á þetta netfang. Þessi viðbót fer yfir viðbrögð og túlkar HTTP statuscodes 401 og 403 sem ógilda auðkenni, og öll önnur svör sem gilt auðkenni."
-},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/it.js b/apps/user_webdavauth/l10n/it.js
deleted file mode 100644
index cd129949e0b..00000000000
--- a/apps/user_webdavauth/l10n/it.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticazione WebDAV",
- "Address:" : "Indirizzo:",
- "Save" : "Salva",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterà i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/it.json b/apps/user_webdavauth/l10n/it.json
deleted file mode 100644
index c842c6c19e6..00000000000
--- a/apps/user_webdavauth/l10n/it.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticazione WebDAV",
- "Address:" : "Indirizzo:",
- "Save" : "Salva",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterà i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ja.js b/apps/user_webdavauth/l10n/ja.js
deleted file mode 100644
index 52e8445ff00..00000000000
--- a/apps/user_webdavauth/l10n/ja.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV認証",
- "Address:" : "アドレス:",
- "Save" : "保存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ユーザー資格情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTPステータスコードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ja.json b/apps/user_webdavauth/l10n/ja.json
deleted file mode 100644
index dbf17d776e0..00000000000
--- a/apps/user_webdavauth/l10n/ja.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV認証",
- "Address:" : "アドレス:",
- "Save" : "保存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ユーザー資格情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTPステータスコードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ka_GE.js b/apps/user_webdavauth/l10n/ka_GE.js
deleted file mode 100644
index c8eb069dc21..00000000000
--- a/apps/user_webdavauth/l10n/ka_GE.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV აუთენთიფიკაცია",
- "Save" : "შენახვა"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ka_GE.json b/apps/user_webdavauth/l10n/ka_GE.json
deleted file mode 100644
index 05851e83eed..00000000000
--- a/apps/user_webdavauth/l10n/ka_GE.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV აუთენთიფიკაცია",
- "Save" : "შენახვა"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/km.js b/apps/user_webdavauth/l10n/km.js
deleted file mode 100644
index 118d2c483d9..00000000000
--- a/apps/user_webdavauth/l10n/km.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ WebDAV",
- "Save" : "រក្សាទុក",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "អត្តសញ្ញាណ​អ្នក​ប្រើ​នឹង​ត្រូវ​ផ្ញើ​ទៅ​អាសយដ្ឋាន​នេះ។ កម្មវិធី​បន្ថែម​នេះ​ពិនិត្យ​ចម្លើយ​តប ហើយ​នឹង​បក​ស្រាយ​កូដ​ស្ថានភាព HTTP ដូច​ជា 401 និង 403 ថា​ជា​អត្តសញ្ញាណ​មិន​ត្រឹម​ត្រូវ ហើយ​និង​ចម្លើយ​តប​ផ្សេងៗ​ថា​ត្រឹម​ត្រូវ។"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/km.json b/apps/user_webdavauth/l10n/km.json
deleted file mode 100644
index a93f04a0e31..00000000000
--- a/apps/user_webdavauth/l10n/km.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ WebDAV",
- "Save" : "រក្សាទុក",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "អត្តសញ្ញាណ​អ្នក​ប្រើ​នឹង​ត្រូវ​ផ្ញើ​ទៅ​អាសយដ្ឋាន​នេះ។ កម្មវិធី​បន្ថែម​នេះ​ពិនិត្យ​ចម្លើយ​តប ហើយ​នឹង​បក​ស្រាយ​កូដ​ស្ថានភាព HTTP ដូច​ជា 401 និង 403 ថា​ជា​អត្តសញ្ញាណ​មិន​ត្រឹម​ត្រូវ ហើយ​និង​ចម្លើយ​តប​ផ្សេងៗ​ថា​ត្រឹម​ត្រូវ។"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/kn.js b/apps/user_webdavauth/l10n/kn.js
deleted file mode 100644
index 2c7f6526c06..00000000000
--- a/apps/user_webdavauth/l10n/kn.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "ಉಳಿಸಿ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/kn.json b/apps/user_webdavauth/l10n/kn.json
deleted file mode 100644
index 5699698e22c..00000000000
--- a/apps/user_webdavauth/l10n/kn.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "ಉಳಿಸಿ"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ko.js b/apps/user_webdavauth/l10n/ko.js
deleted file mode 100644
index 331e65c0200..00000000000
--- a/apps/user_webdavauth/l10n/ko.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV 인증",
- "Address:" : "주소:",
- "Save" : "저장",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ko.json b/apps/user_webdavauth/l10n/ko.json
deleted file mode 100644
index 7e42e9d3fd7..00000000000
--- a/apps/user_webdavauth/l10n/ko.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV 인증",
- "Address:" : "주소:",
- "Save" : "저장",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ku_IQ.js b/apps/user_webdavauth/l10n/ku_IQ.js
deleted file mode 100644
index cdfe62f14ba..00000000000
--- a/apps/user_webdavauth/l10n/ku_IQ.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "پاشکه‌وتکردن"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ku_IQ.json b/apps/user_webdavauth/l10n/ku_IQ.json
deleted file mode 100644
index 63f5aac1d28..00000000000
--- a/apps/user_webdavauth/l10n/ku_IQ.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "پاشکه‌وتکردن"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/lb.js b/apps/user_webdavauth/l10n/lb.js
deleted file mode 100644
index b358220a867..00000000000
--- a/apps/user_webdavauth/l10n/lb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "Späicheren"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/lb.json b/apps/user_webdavauth/l10n/lb.json
deleted file mode 100644
index e6ae53e9625..00000000000
--- a/apps/user_webdavauth/l10n/lb.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "Späicheren"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/lt_LT.js b/apps/user_webdavauth/l10n/lt_LT.js
deleted file mode 100644
index 33b674d7a73..00000000000
--- a/apps/user_webdavauth/l10n/lt_LT.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV autentikacija",
- "Address:" : "Adresas:",
- "Save" : "Išsaugoti",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/lt_LT.json b/apps/user_webdavauth/l10n/lt_LT.json
deleted file mode 100644
index 0d43b99518d..00000000000
--- a/apps/user_webdavauth/l10n/lt_LT.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV autentikacija",
- "Address:" : "Adresas:",
- "Save" : "Išsaugoti",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/lv.js b/apps/user_webdavauth/l10n/lv.js
deleted file mode 100644
index 4fe05c1e1f3..00000000000
--- a/apps/user_webdavauth/l10n/lv.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV autentifikācija",
- "Save" : "Saglabāt"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/lv.json b/apps/user_webdavauth/l10n/lv.json
deleted file mode 100644
index 5887d845d79..00000000000
--- a/apps/user_webdavauth/l10n/lv.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV autentifikācija",
- "Save" : "Saglabāt"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/mk.js b/apps/user_webdavauth/l10n/mk.js
deleted file mode 100644
index 6a853ecbd9e..00000000000
--- a/apps/user_webdavauth/l10n/mk.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "Сними"
-},
-"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/user_webdavauth/l10n/mk.json b/apps/user_webdavauth/l10n/mk.json
deleted file mode 100644
index 2960717f448..00000000000
--- a/apps/user_webdavauth/l10n/mk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "Сними"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/mn.js b/apps/user_webdavauth/l10n/mn.js
deleted file mode 100644
index ecbe9c6693c..00000000000
--- a/apps/user_webdavauth/l10n/mn.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV Нотолгоо",
- "Address:" : "Хаяг:",
- "Save" : "Хадгалах"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/mn.json b/apps/user_webdavauth/l10n/mn.json
deleted file mode 100644
index ba322132591..00000000000
--- a/apps/user_webdavauth/l10n/mn.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV Нотолгоо",
- "Address:" : "Хаяг:",
- "Save" : "Хадгалах"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ms_MY.js b/apps/user_webdavauth/l10n/ms_MY.js
deleted file mode 100644
index 50d5a443e6a..00000000000
--- a/apps/user_webdavauth/l10n/ms_MY.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Pengesahan WebDAV",
- "Address:" : "Alamat:",
- "Save" : "Simpan",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Butiran pengguna akan dihantar ke alamat ini. Plugin ini memeriksa maklum balas dan akan mentafsir kod status HTTP 401 dan 403 sebagai butiran tidak sah, dan semua maklum balas lain sebagai butiran yang sah."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ms_MY.json b/apps/user_webdavauth/l10n/ms_MY.json
deleted file mode 100644
index 875c2f6c288..00000000000
--- a/apps/user_webdavauth/l10n/ms_MY.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Pengesahan WebDAV",
- "Address:" : "Alamat:",
- "Save" : "Simpan",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Butiran pengguna akan dihantar ke alamat ini. Plugin ini memeriksa maklum balas dan akan mentafsir kod status HTTP 401 dan 403 sebagai butiran tidak sah, dan semua maklum balas lain sebagai butiran yang sah."
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/nb_NO.js b/apps/user_webdavauth/l10n/nb_NO.js
deleted file mode 100644
index 72a099875e9..00000000000
--- a/apps/user_webdavauth/l10n/nb_NO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-autentisering",
- "Address:" : "Adresse:",
- "Save" : "Lagre",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Brukerens påloggingsinformasjon vil bli sendt til denne adressen. Denne utvidelsen sjekker svaret og vil tolke HTTP-statuskodene 401 og 403 som ugyldig bruker eller passord, og alle andre svar tolkes som gyldig påloggings."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/nb_NO.json b/apps/user_webdavauth/l10n/nb_NO.json
deleted file mode 100644
index 0ef46124f93..00000000000
--- a/apps/user_webdavauth/l10n/nb_NO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-autentisering",
- "Address:" : "Adresse:",
- "Save" : "Lagre",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Brukerens påloggingsinformasjon vil bli sendt til denne adressen. Denne utvidelsen sjekker svaret og vil tolke HTTP-statuskodene 401 og 403 som ugyldig bruker eller passord, og alle andre svar tolkes som gyldig påloggings."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/nl.js b/apps/user_webdavauth/l10n/nl.js
deleted file mode 100644
index 8633c851fbc..00000000000
--- a/apps/user_webdavauth/l10n/nl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV authenticatie",
- "Address:" : "Adres:",
- "Save" : "Bewaren",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "De inloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert HTTP statuscodes 401 en 403 als ongeldige inloggegevens en alle andere terugkoppelingen als valide inloggegevens."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/nl.json b/apps/user_webdavauth/l10n/nl.json
deleted file mode 100644
index 73bb6f40e51..00000000000
--- a/apps/user_webdavauth/l10n/nl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV authenticatie",
- "Address:" : "Adres:",
- "Save" : "Bewaren",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "De inloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert HTTP statuscodes 401 en 403 als ongeldige inloggegevens en alle andere terugkoppelingen als valide inloggegevens."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/nn_NO.js b/apps/user_webdavauth/l10n/nn_NO.js
deleted file mode 100644
index 4777921772f..00000000000
--- a/apps/user_webdavauth/l10n/nn_NO.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-autentisering",
- "Save" : "Lagra",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/nn_NO.json b/apps/user_webdavauth/l10n/nn_NO.json
deleted file mode 100644
index 2ad0b5b6448..00000000000
--- a/apps/user_webdavauth/l10n/nn_NO.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-autentisering",
- "Save" : "Lagra",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/oc.js b/apps/user_webdavauth/l10n/oc.js
deleted file mode 100644
index 704e791756b..00000000000
--- a/apps/user_webdavauth/l10n/oc.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autentificacion WebDAV",
- "Address:" : "Adreça :",
- "Save" : "Salvar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las informacions de connexion de l'utilizaire seràn mandadas a aquesta adreça. Aqueste modul analisa lo còde de la responsa HTTP e considèra los còdes 401 e 403 coma una autentificacion invalida e tota autra valor coma una autentificacion valida."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/oc.json b/apps/user_webdavauth/l10n/oc.json
deleted file mode 100644
index a2e3daa93c3..00000000000
--- a/apps/user_webdavauth/l10n/oc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autentificacion WebDAV",
- "Address:" : "Adreça :",
- "Save" : "Salvar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las informacions de connexion de l'utilizaire seràn mandadas a aquesta adreça. Aqueste modul analisa lo còde de la responsa HTTP e considèra los còdes 401 e 403 coma una autentificacion invalida e tota autra valor coma una autentificacion valida."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/pl.js b/apps/user_webdavauth/l10n/pl.js
deleted file mode 100644
index 4104adfa6b0..00000000000
--- a/apps/user_webdavauth/l10n/pl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Uwierzytelnienie WebDAV",
- "Address:" : "Adres:",
- "Save" : "Zapisz",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Dane uwierzytelniające użytkownika zostaną wysłane na ten adres. Ta wtyczka sprawdza odpowiedź i będzie interpretować kody 401 i 403 statusów HTTP jako nieprawidłowe dane uwierzytelniające, a wszystkie inne odpowiedzi jako prawidłowe uwierzytelnienie."
-},
-"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/pl.json b/apps/user_webdavauth/l10n/pl.json
deleted file mode 100644
index 64cc4899d07..00000000000
--- a/apps/user_webdavauth/l10n/pl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Uwierzytelnienie WebDAV",
- "Address:" : "Adres:",
- "Save" : "Zapisz",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Dane uwierzytelniające użytkownika zostaną wysłane na ten adres. Ta wtyczka sprawdza odpowiedź i będzie interpretować kody 401 i 403 statusów HTTP jako nieprawidłowe dane uwierzytelniające, a wszystkie inne odpowiedzi jako prawidłowe uwierzytelnienie."
-},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/pt_BR.js b/apps/user_webdavauth/l10n/pt_BR.js
deleted file mode 100644
index b553c1b50fc..00000000000
--- a/apps/user_webdavauth/l10n/pt_BR.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticação WebDAV",
- "Address:" : "Endereço:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais de usuário serão enviadas para este endereço. Este plugin verifica a resposta e interpretará os códigos de status HTTP 401 e 403 como \"credenciais inválidas\", e todas as outras respostas como \"credenciais válidas\"."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/pt_BR.json b/apps/user_webdavauth/l10n/pt_BR.json
deleted file mode 100644
index b42d7a6b514..00000000000
--- a/apps/user_webdavauth/l10n/pt_BR.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticação WebDAV",
- "Address:" : "Endereço:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais de usuário serão enviadas para este endereço. Este plugin verifica a resposta e interpretará os códigos de status HTTP 401 e 403 como \"credenciais inválidas\", e todas as outras respostas como \"credenciais válidas\"."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/pt_PT.js b/apps/user_webdavauth/l10n/pt_PT.js
deleted file mode 100644
index c06d80a3e7d..00000000000
--- a/apps/user_webdavauth/l10n/pt_PT.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autenticação WebDAV",
- "Address:" : "Endereço:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do utilizador vão ser enviadas para endereço URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como válidas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/pt_PT.json b/apps/user_webdavauth/l10n/pt_PT.json
deleted file mode 100644
index c2a7ebf3685..00000000000
--- a/apps/user_webdavauth/l10n/pt_PT.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autenticação WebDAV",
- "Address:" : "Endereço:",
- "Save" : "Guardar",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do utilizador vão ser enviadas para endereço URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como válidas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ro.js b/apps/user_webdavauth/l10n/ro.js
deleted file mode 100644
index 46637452e5f..00000000000
--- a/apps/user_webdavauth/l10n/ro.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Autentificare WebDAV",
- "Address:" : "Adresa:",
- "Save" : "Salvează"
-},
-"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/user_webdavauth/l10n/ro.json b/apps/user_webdavauth/l10n/ro.json
deleted file mode 100644
index c3b2bcdc970..00000000000
--- a/apps/user_webdavauth/l10n/ro.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Autentificare WebDAV",
- "Address:" : "Adresa:",
- "Save" : "Salvează"
-},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ru.js b/apps/user_webdavauth/l10n/ru.js
deleted file mode 100644
index 2af520e8396..00000000000
--- a/apps/user_webdavauth/l10n/ru.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Аутентификация WebDAV",
- "Address:" : "Адрес:",
- "Save" : "Сохранить",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Учётные данные пользователя будут отправлены на этот адрес. Плагин проверит ответ и будет рассматривать HTTP коды 401 и 403 как неверные учётные данные, при любом другом ответе - учётные данные пользователя верны."
-},
-"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/user_webdavauth/l10n/ru.json b/apps/user_webdavauth/l10n/ru.json
deleted file mode 100644
index 88b53330acc..00000000000
--- a/apps/user_webdavauth/l10n/ru.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Аутентификация WebDAV",
- "Address:" : "Адрес:",
- "Save" : "Сохранить",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Учётные данные пользователя будут отправлены на этот адрес. Плагин проверит ответ и будет рассматривать HTTP коды 401 и 403 как неверные учётные данные, при любом другом ответе - учётные данные пользователя верны."
-},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/si_LK.js b/apps/user_webdavauth/l10n/si_LK.js
deleted file mode 100644
index 4a408625e4f..00000000000
--- a/apps/user_webdavauth/l10n/si_LK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "සුරකින්න"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/si_LK.json b/apps/user_webdavauth/l10n/si_LK.json
deleted file mode 100644
index cf286f67edf..00000000000
--- a/apps/user_webdavauth/l10n/si_LK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "සුරකින්න"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sk_SK.js b/apps/user_webdavauth/l10n/sk_SK.js
deleted file mode 100644
index 455d18213e3..00000000000
--- a/apps/user_webdavauth/l10n/sk_SK.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV overenie",
- "Address:" : "Adresa:",
- "Save" : "Uložiť",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/sk_SK.json b/apps/user_webdavauth/l10n/sk_SK.json
deleted file mode 100644
index bffebf3f253..00000000000
--- a/apps/user_webdavauth/l10n/sk_SK.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV overenie",
- "Address:" : "Adresa:",
- "Save" : "Uložiť",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sl.js b/apps/user_webdavauth/l10n/sl.js
deleted file mode 100644
index e175c9b3c0c..00000000000
--- a/apps/user_webdavauth/l10n/sl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Overitev WebDAV",
- "Address:" : "Naslov:",
- "Save" : "Shrani",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uporabniška poverila bodo poslana na naveden naslov. Vstavek preveri odziv in kodi stanja 401 in 403 obravnava kot neveljavna poverila, vse ostale odzive pa kot veljavna."
-},
-"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/user_webdavauth/l10n/sl.json b/apps/user_webdavauth/l10n/sl.json
deleted file mode 100644
index 184d2df74b2..00000000000
--- a/apps/user_webdavauth/l10n/sl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Overitev WebDAV",
- "Address:" : "Naslov:",
- "Save" : "Shrani",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uporabniška poverila bodo poslana na naveden naslov. Vstavek preveri odziv in kodi stanja 401 in 403 obravnava kot neveljavna poverila, vse ostale odzive pa kot veljavna."
-},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sq.js b/apps/user_webdavauth/l10n/sq.js
deleted file mode 100644
index 73b3024dce2..00000000000
--- a/apps/user_webdavauth/l10n/sq.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "Ruaj"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/sq.json b/apps/user_webdavauth/l10n/sq.json
deleted file mode 100644
index c3290a31319..00000000000
--- a/apps/user_webdavauth/l10n/sq.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "Ruaj"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sr.js b/apps/user_webdavauth/l10n/sr.js
deleted file mode 100644
index a68c0e94395..00000000000
--- a/apps/user_webdavauth/l10n/sr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "ВебДАВ аутентификација",
- "Address:" : "Адреса:",
- "Save" : "Сачувај",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Кориснички акредитиви биће послати на ову адресу. Прикључак проверава одговор и ХТТП кодове 401 и 403 тумачиће као неисправне акредитиве а све остале одговоре као исправне."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/sr.json b/apps/user_webdavauth/l10n/sr.json
deleted file mode 100644
index 5a999a10e71..00000000000
--- a/apps/user_webdavauth/l10n/sr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "ВебДАВ аутентификација",
- "Address:" : "Адреса:",
- "Save" : "Сачувај",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Кориснички акредитиви биће послати на ову адресу. Прикључак проверава одговор и ХТТП кодове 401 и 403 тумачиће као неисправне акредитиве а све остале одговоре као исправне."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sr@latin.js b/apps/user_webdavauth/l10n/sr@latin.js
deleted file mode 100644
index cd7a973d450..00000000000
--- a/apps/user_webdavauth/l10n/sr@latin.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV autentifikacija",
- "Address:" : "Adresa:",
- "Save" : "Sačuvaj",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički akreditivi biće poslati na ovu adresu. Priključak proverava odgovor i HTTP kodove 401 i 403 tumačiće kao neispravne akreditive a sve ostale odgovore kao ispravne."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/sr@latin.json b/apps/user_webdavauth/l10n/sr@latin.json
deleted file mode 100644
index a26e0f73765..00000000000
--- a/apps/user_webdavauth/l10n/sr@latin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV autentifikacija",
- "Address:" : "Adresa:",
- "Save" : "Sačuvaj",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički akreditivi biće poslati na ovu adresu. Priključak proverava odgovor i HTTP kodove 401 i 403 tumačiće kao neispravne akreditive a sve ostale odgovore kao ispravne."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sv.js b/apps/user_webdavauth/l10n/sv.js
deleted file mode 100644
index b16f60985ea..00000000000
--- a/apps/user_webdavauth/l10n/sv.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV-autentisering",
- "Address:" : "Adress:",
- "Save" : "Spara",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/sv.json b/apps/user_webdavauth/l10n/sv.json
deleted file mode 100644
index fa09724c784..00000000000
--- a/apps/user_webdavauth/l10n/sv.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV-autentisering",
- "Address:" : "Adress:",
- "Save" : "Spara",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ta_LK.js b/apps/user_webdavauth/l10n/ta_LK.js
deleted file mode 100644
index d71f18fe198..00000000000
--- a/apps/user_webdavauth/l10n/ta_LK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "சேமிக்க "
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ta_LK.json b/apps/user_webdavauth/l10n/ta_LK.json
deleted file mode 100644
index e881e682241..00000000000
--- a/apps/user_webdavauth/l10n/ta_LK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "சேமிக்க "
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/te.js b/apps/user_webdavauth/l10n/te.js
deleted file mode 100644
index e632cc07e4f..00000000000
--- a/apps/user_webdavauth/l10n/te.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "భద్రపరచు"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/te.json b/apps/user_webdavauth/l10n/te.json
deleted file mode 100644
index d250e26411e..00000000000
--- a/apps/user_webdavauth/l10n/te.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "భద్రపరచు"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/th_TH.js b/apps/user_webdavauth/l10n/th_TH.js
deleted file mode 100644
index 4dd22b61ed5..00000000000
--- a/apps/user_webdavauth/l10n/th_TH.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "ยืนยันตัวตน WebDAV",
- "Address:" : "ที่อยู่:",
- "Save" : "บันทึก",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "สิทธิของผู้ใช้จะถูกส่งไปยังที่อยู่นี้ ปลั๊กอินนี้จะตรวจสอบการตอบสนองและจะแปลรหัสสถานะ HTTP 401 และ 403 ข้อมูลประจำตัวที่ไม่ถูกต้องและการตอบสนองอื่นๆ ทั้งหมดให้เป็นข้อมูลประจำตัวที่ถูกต้อง"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/th_TH.json b/apps/user_webdavauth/l10n/th_TH.json
deleted file mode 100644
index cbbe7b60c36..00000000000
--- a/apps/user_webdavauth/l10n/th_TH.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "ยืนยันตัวตน WebDAV",
- "Address:" : "ที่อยู่:",
- "Save" : "บันทึก",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "สิทธิของผู้ใช้จะถูกส่งไปยังที่อยู่นี้ ปลั๊กอินนี้จะตรวจสอบการตอบสนองและจะแปลรหัสสถานะ HTTP 401 และ 403 ข้อมูลประจำตัวที่ไม่ถูกต้องและการตอบสนองอื่นๆ ทั้งหมดให้เป็นข้อมูลประจำตัวที่ถูกต้อง"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/tr.js b/apps/user_webdavauth/l10n/tr.js
deleted file mode 100644
index dd0a66a45ef..00000000000
--- a/apps/user_webdavauth/l10n/tr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV Kimlik Doğrulaması",
- "Address:" : "Adres:",
- "Save" : "Kaydet",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kullanıcı kimlik bilgileri bu adrese gönderilecek. Bu eklenti yanıtı kontrol edecek ve 401 ile 403 HTTP durum kodlarını geçersiz kimlik bilgileri olarak, diğer yanıtları ise doğru kimlik bilgileri olarak algılayacaktır."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/tr.json b/apps/user_webdavauth/l10n/tr.json
deleted file mode 100644
index 3c8845256c3..00000000000
--- a/apps/user_webdavauth/l10n/tr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV Kimlik Doğrulaması",
- "Address:" : "Adres:",
- "Save" : "Kaydet",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kullanıcı kimlik bilgileri bu adrese gönderilecek. Bu eklenti yanıtı kontrol edecek ve 401 ile 403 HTTP durum kodlarını geçersiz kimlik bilgileri olarak, diğer yanıtları ise doğru kimlik bilgileri olarak algılayacaktır."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ug.js b/apps/user_webdavauth/l10n/ug.js
deleted file mode 100644
index 2fe5c26fe23..00000000000
--- a/apps/user_webdavauth/l10n/ug.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV سالاھىيەت دەلىللەش",
- "Save" : "ساقلا"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ug.json b/apps/user_webdavauth/l10n/ug.json
deleted file mode 100644
index a897a27d54a..00000000000
--- a/apps/user_webdavauth/l10n/ug.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV سالاھىيەت دەلىللەش",
- "Save" : "ساقلا"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/uk.js b/apps/user_webdavauth/l10n/uk.js
deleted file mode 100644
index f0febc1d21c..00000000000
--- a/apps/user_webdavauth/l10n/uk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Аутентифікація WebDAV",
- "Address:" : "Адреси:",
- "Save" : "Зберегти",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Облікові дані користувача буде надіслано на цю адресу. Цей плагін перевіряє відповідь і буде інтерпретувати коди статусу HTTP 401 і 403, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/uk.json b/apps/user_webdavauth/l10n/uk.json
deleted file mode 100644
index 1bec19cbbdd..00000000000
--- a/apps/user_webdavauth/l10n/uk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Аутентифікація WebDAV",
- "Address:" : "Адреси:",
- "Save" : "Зберегти",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Облікові дані користувача буде надіслано на цю адресу. Цей плагін перевіряє відповідь і буде інтерпретувати коди статусу HTTP 401 і 403, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ur_PK.js b/apps/user_webdavauth/l10n/ur_PK.js
deleted file mode 100644
index 45493bf7bf3..00000000000
--- a/apps/user_webdavauth/l10n/ur_PK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "Save" : "حفظ"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ur_PK.json b/apps/user_webdavauth/l10n/ur_PK.json
deleted file mode 100644
index 2c8f5af7ae5..00000000000
--- a/apps/user_webdavauth/l10n/ur_PK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Save" : "حفظ"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/vi.js b/apps/user_webdavauth/l10n/vi.js
deleted file mode 100644
index 7b8d7949ba5..00000000000
--- a/apps/user_webdavauth/l10n/vi.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "Xác thực WebDAV",
- "Address:" : "Địa chỉ:",
- "Save" : "Lưu",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/vi.json b/apps/user_webdavauth/l10n/vi.json
deleted file mode 100644
index ebe1725a929..00000000000
--- a/apps/user_webdavauth/l10n/vi.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "Xác thực WebDAV",
- "Address:" : "Địa chỉ:",
- "Save" : "Lưu",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ."
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/zh_CN.js b/apps/user_webdavauth/l10n/zh_CN.js
deleted file mode 100644
index 9cca337fd6d..00000000000
--- a/apps/user_webdavauth/l10n/zh_CN.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV 认证",
- "Address:" : "地址:",
- "Save" : "保存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份,其他所有返回值为合法身份。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/zh_CN.json b/apps/user_webdavauth/l10n/zh_CN.json
deleted file mode 100644
index 5bd8489403d..00000000000
--- a/apps/user_webdavauth/l10n/zh_CN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV 认证",
- "Address:" : "地址:",
- "Save" : "保存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份,其他所有返回值为合法身份。"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/zh_HK.js b/apps/user_webdavauth/l10n/zh_HK.js
deleted file mode 100644
index 87e29b7432f..00000000000
--- a/apps/user_webdavauth/l10n/zh_HK.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV 認證",
- "Address:" : "地址:",
- "Save" : "儲存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應,HTTP狀態碼 401與403將會被理解為無效憑證,而所有其他的回應將會被理解為有效憑證。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/zh_HK.json b/apps/user_webdavauth/l10n/zh_HK.json
deleted file mode 100644
index a2108b738be..00000000000
--- a/apps/user_webdavauth/l10n/zh_HK.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV 認證",
- "Address:" : "地址:",
- "Save" : "儲存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應,HTTP狀態碼 401與403將會被理解為無效憑證,而所有其他的回應將會被理解為有效憑證。"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/zh_TW.js b/apps/user_webdavauth/l10n/zh_TW.js
deleted file mode 100644
index a4de3acc406..00000000000
--- a/apps/user_webdavauth/l10n/zh_TW.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
- "user_webdavauth",
- {
- "WebDAV Authentication" : "WebDAV 認證",
- "Save" : "儲存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應,HTTP狀態碼 401與403將會被理解為無效憑證,而所有其他的回應將會被理解為有效憑證。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/zh_TW.json b/apps/user_webdavauth/l10n/zh_TW.json
deleted file mode 100644
index aca5151be08..00000000000
--- a/apps/user_webdavauth/l10n/zh_TW.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
- "WebDAV Authentication" : "WebDAV 認證",
- "Save" : "儲存",
- "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應,HTTP狀態碼 401與403將會被理解為無效憑證,而所有其他的回應將會被理解為有效憑證。"
-},"pluralForm" :"nplurals=1; plural=0;"
-} \ No newline at end of file
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
deleted file mode 100644
index 1a647fafb16..00000000000
--- a/apps/user_webdavauth/settings.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@owncloud.org>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-OC_Util::checkAdminUser();
-
-if($_POST) {
- // CSRF check
- OCP\JSON::callCheck();
-
- if(isset($_POST['webdav_url'])) {
- OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
- }
-}
-
-// fill template
-$tmpl = new OC_Template( 'user_webdavauth', 'settings');
-$tmpl->assign( 'webdav_url', OC_Config::getValue( "user_webdavauth_url" ));
-
-return $tmpl->fetchPage();
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
deleted file mode 100644
index a87c0ad159a..00000000000
--- a/apps/user_webdavauth/templates/settings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<form id="webdavauth" class="section" action="#" method="post">
- <h2><?php p($l->t('WebDAV Authentication'));?></h2>
- <p><label for="webdav_url"><?php p($l->t('Address:').' ');?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
- <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
- <input type="submit" value="<?php p($l->t('Save')); ?>" />
- <br /><?php p($l->t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
-</form>
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
deleted file mode 100644
index acd7ec8507c..00000000000
--- a/apps/user_webdavauth/user_webdavauth.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Felix Moeller <mail@felixmoeller.de>
- * @author Frank Karlitschek <frank@owncloud.org>
- * @author Georg Ehrke <georg@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author opensaucesystems <ashley@opensaucesystems.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-class OC_USER_WEBDAVAUTH extends OC_User_Backend implements \OCP\IUserBackend {
- protected $webdavauth_url;
-
- public function __construct() {
- $this->webdavauth_url = OC_Config::getValue( "user_webdavauth_url" );
- }
-
- public function deleteUser($uid) {
- // Can't delete user
- OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend', 3);
- return false;
- }
-
- public function setPassword ( $uid, $password ) {
- // We can't change user password
- OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend', 3);
- return false;
- }
-
- public function checkPassword( $uid, $password ) {
- $arr = explode('://', $this->webdavauth_url, 2);
- if( ! isset($arr) OR count($arr) !== 2) {
- OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Invalid Url: "'.$this->webdavauth_url.'" ', 3);
- return false;
- }
- list($webdavauth_protocol, $webdavauth_url_path) = $arr;
- $url= $webdavauth_protocol.'://'.urlencode($uid).':'.urlencode($password).'@'.$webdavauth_url_path;
- $headers = get_headers($url);
- if($headers==false) {
- OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$webdavauth_protocol.'://'.$webdavauth_url_path.'" ', 3);
- return false;
-
- }
- $returncode= substr($headers[0], 9, 3);
-
- if(substr($returncode, 0, 1) === '2') {
- return $uid;
- } else {
- return false;
- }
-
- }
-
- /*
- * we don´t know if a user exists without the password. so we have to return true all the time
- */
- public function userExists( $uid ){
- return true;
- }
-
- /**
- * @return bool
- */
- public function hasUserListings() {
- return false;
- }
-
- /*
- * we don´t know the users so all we can do it return an empty array here
- */
- public function getUsers($search = '', $limit = 10, $offset = 0) {
- $returnArray = array();
-
- return $returnArray;
- }
-
- /**
- * Backend name to be shown in user management
- * @return string the name of the backend to be shown
- */
- public function getBackendName(){
- return 'WebDAV';
- }
-}
diff --git a/autotest.sh b/autotest.sh
index b1b27ec8c8d..cd36193cf6c 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -171,7 +171,7 @@ function execute_tests {
else
if [ "MariaDB" != "$(mysql --version | grep -o MariaDB)" ] ; then
echo "Your mysql binary is not provided by MariaDB"
- echo "To use the docker container set the USEDOCKER enviroment variable"
+ echo "To use the docker container set the USEDOCKER environment variable"
exit -1
fi
mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
diff --git a/config/config.sample.php b/config/config.sample.php
index d561ad27e84..8949bd44465 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -452,7 +452,7 @@ $CONFIG = array(
* expire rules. Please refer to Files_versions online documentation
* for more info.
* ``D, auto`` keep versions at least for D days, apply expire rules to all
- * versions that older than D days
+ * versions that are older than D days
* * ``auto, D`` delete all versions that are older than D days automatically,
* delete other versions according to expire rules
* * ``D1, D2`` keep versions for at least D1 days and delete when exceeds D2 days
diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index 696570b7ae6..a8560ce88bb 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -75,14 +75,22 @@ class DecryptAll extends Command {
$this->config = $config;
$this->decryptAll = $decryptAll;
$this->questionHelper = $questionHelper;
+ }
+ /**
+ * Set single user mode and disable the trashbin app
+ */
+ protected function forceSingleUserAndTrashbin() {
$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false);
$this->config->setSystemValue('singleuser', true);
$this->appManager->disableApp('files_trashbin');
}
- public function __destruct() {
+ /**
+ * Reset the single user mode and re-enable the trashbin app
+ */
+ protected function resetSingleUserAndTrashbin() {
$this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled);
if ($this->wasTrashbinEnabled) {
$this->appManager->enableApp('files_trashbin');
@@ -93,7 +101,8 @@ class DecryptAll extends Command {
parent::configure();
$this->setName('encryption:decrypt-all');
- $this->setDescription(
+ $this->setDescription('Disable server-side encryption and decrypt all files');
+ $this->setHelp(
'This will disable server-side encryption and decrypt all files for '
. 'all users if it is supported by your encryption module. '
. 'Please make sure that no user access his files during this process!'
@@ -115,7 +124,6 @@ class DecryptAll extends Command {
} else {
$output->writeln('Server side encryption not enabled. Nothing to do.');
return;
-
}
$output->writeln("\n");
@@ -126,12 +134,14 @@ class DecryptAll extends Command {
$output->writeln('');
$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
if ($this->questionHelper->ask($input, $output, $question)) {
+ $this->forceSingleUserAndTrashbin();
$user = $input->getArgument('user');
$result = $this->decryptAll->decryptAll($input, $output, $user);
if ($result === false) {
- $this->output->writeln(' aborted.');
+ $output->writeln(' aborted.');
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
}
+ $this->resetSingleUserAndTrashbin();
} else {
$output->write('Enable server side encryption... ');
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
@@ -141,8 +151,9 @@ class DecryptAll extends Command {
} catch (\Exception $e) {
// enable server side encryption again if something went wrong
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+ $this->resetSingleUserAndTrashbin();
throw $e;
}
- }
+ }
}
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 950ce5166d8..8294264f212 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -67,13 +67,22 @@ class EncryptAll extends Command {
$this->encryptionManager = $encryptionManager;
$this->config = $config;
$this->questionHelper = $questionHelper;
+ }
+
+ /**
+ * Set single user mode and disable the trashbin app
+ */
+ protected function forceSingleUserAndTrashbin() {
$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false);
$this->config->setSystemValue('singleuser', true);
$this->appManager->disableApp('files_trashbin');
}
- public function __destruct() {
+ /**
+ * Reset the single user mode and re-enable the trashbin app
+ */
+ protected function resetSingleUserAndTrashbin() {
$this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled);
if ($this->wasTrashbinEnabled) {
$this->appManager->enableApp('files_trashbin');
@@ -84,7 +93,8 @@ class EncryptAll extends Command {
parent::configure();
$this->setName('encryption:encrypt-all');
- $this->setDescription(
+ $this->setDescription('Encrypt all files for all users');
+ $this->setHelp(
'This will encrypt all files for all users. '
. 'Please make sure that no user access his files during this process!'
);
@@ -104,8 +114,17 @@ class EncryptAll extends Command {
$output->writeln('');
$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
if ($this->questionHelper->ask($input, $output, $question)) {
- $defaultModule = $this->encryptionManager->getEncryptionModule();
- $defaultModule->encryptAll($input, $output);
+ $this->forceSingleUserAndTrashbin();
+
+ try {
+ $defaultModule = $this->encryptionManager->getEncryptionModule();
+ $defaultModule->encryptAll($input, $output);
+ } catch (\Exception $ex) {
+ $this->resetSingleUserAndTrashbin();
+ throw $ex;
+ }
+
+ $this->resetSingleUserAndTrashbin();
} else {
$output->writeln('aborted');
}
diff --git a/core/css/styles.css b/core/css/styles.css
index 2ec5129a1c5..1a4a4ab4f3d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -178,6 +178,8 @@ input[type="checkbox"] + label:before {
opacity: 0.7;
}
+input[type="checkbox"].u-left +label:before { float: left; }
+
input[type="checkbox"].white + label:before {
background-image: url('../img/actions/checkbox-white.svg');
}
@@ -506,7 +508,7 @@ input[type="submit"].enabled {
#body-login #submit.login {
position: absolute;
right: 0;
- top: 49px;
+ top: 0;
border: none;
background-color: transparent;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
@@ -525,8 +527,8 @@ input[type="submit"].enabled {
#body-login form {
position: relative;
- width: 22em;
- margin: 2em auto 2em;
+ width: 280px;
+ margin: 32px auto;
padding: 0;
}
#body-login form fieldset {
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 52ed34f61ec..719ac8587a4 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -400,6 +400,11 @@ var OCdialogs = {
$replacementDiv.find('.icon').css('background-image','url(' + path + ')');
}
);
+ // connect checkboxes with labels
+ var checkboxId = $conflicts.find('.conflict').length;
+ $originalDiv.find('input:checkbox').attr('id', 'checkbox_original_'+checkboxId);
+ $replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_'+checkboxId);
+
$conflicts.append($conflict);
//set more recent mtime bold
diff --git a/core/js/share.js b/core/js/share.js
index a2e6e6af0fc..1131ae8f112 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -395,7 +395,7 @@ OC.Share = _.extend(OC.Share || {}, {
attributes: {
'data-item-source-name': filename,
'data-item-type': itemType,
- 'data-item-soruce': itemSource
+ 'data-item-source': itemSource
}
});
dialogView.setShowLink(link);
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index d95186a94db..13f133dbaf4 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -145,12 +145,14 @@ OC.L10N.register(
"change" : "endre",
"delete" : "slette",
"access control" : "tilgangskontroll",
+ "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.",
"An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
"Share" : "Del",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
"Share with users or groups …" : "Del med brukere eller grupper ...",
"Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
"Warning" : "Advarsel",
+ "Error while sending notification" : "Feil ved sending av varsling",
"The object type is not specified." : "Objekttypen er ikke spesifisert.",
"Enter new" : "Oppgi ny",
"Delete" : "Slett",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 0bde814c095..beb7a53e57b 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -143,12 +143,14 @@
"change" : "endre",
"delete" : "slette",
"access control" : "tilgangskontroll",
+ "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.",
"An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
"Share" : "Del",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
"Share with users or groups …" : "Del med brukere eller grupper ...",
"Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
"Warning" : "Advarsel",
+ "Error while sending notification" : "Feil ved sending av varsling",
"The object type is not specified." : "Objekttypen er ikke spesifisert.",
"Enter new" : "Oppgi ny",
"Delete" : "Slett",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 2cf6224b9a9..ca6b56ae0a1 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -145,12 +145,14 @@ OC.L10N.register(
"change" : "mudança",
"delete" : "remover",
"access control" : "controle de acesso",
+ "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.",
"An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
"Share" : "Compartilhar",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
"Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
"Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
"Warning" : "Aviso",
+ "Error while sending notification" : "Erro ao enviar notificação",
"The object type is not specified." : "O tipo de objeto não foi especificado.",
"Enter new" : "Entrar uma nova",
"Delete" : "Eliminar",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 5e3b723c3c4..7441ad571eb 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -143,12 +143,14 @@
"change" : "mudança",
"delete" : "remover",
"access control" : "controle de acesso",
+ "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.",
"An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
"Share" : "Compartilhar",
"Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
"Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
"Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
"Warning" : "Aviso",
+ "Error while sending notification" : "Erro ao enviar notificação",
"The object type is not specified." : "O tipo de objeto não foi especificado.",
"Enter new" : "Entrar uma nova",
"Delete" : "Eliminar",
diff --git a/core/templates/login.php b/core/templates/login.php
index 08c7768a432..2057b1034d0 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -55,10 +55,9 @@ script('core', [
autocomplete="on" autocapitalize="off" autocorrect="off" required>
<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
+ <input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
</p>
- <input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
-
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
<a id="lost-password" class="warning" href="">
<?php p($l->t('Wrong password. Reset it?')); ?>
diff --git a/cron.php b/cron.php
index ed2a20a1e1f..e83e37b3471 100644
--- a/cron.php
+++ b/cron.php
@@ -113,7 +113,7 @@ try {
\OCP\BackgroundJob::setExecutionType('cron');
}
- // open the file and try to lock if. If it is not locked, the background
+ // open the file and try to lock it. If it is not locked, the background
// job can be executed, otherwise another instance is already running
$fp = fopen($lockFile, 'w');
$isLocked = flock($fp, LOCK_EX|LOCK_NB, $wouldBlock);
diff --git a/lib/base.php b/lib/base.php
index f5ba05ded74..3624a3fbaf9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -228,7 +228,7 @@ class OC {
public static function checkConfig() {
$l = \OC::$server->getL10N('lib');
- // Create config in case it does not already exists
+ // Create config if it does not already exist
$configFilePath = self::$configDir .'/config.php';
if(!file_exists($configFilePath)) {
@touch($configFilePath);
@@ -314,7 +314,7 @@ class OC {
}
/**
- * check if the instance needs to preform an upgrade
+ * check if the instance needs to perform an upgrade
*
* @return bool
* @deprecated use \OCP\Util::needUpgrade() instead
@@ -567,7 +567,7 @@ class OC {
//try to configure php to enable big file uploads.
//this doesn´t work always depending on the webserver and php configuration.
- //Let´s try to overwrite some defaults anyways
+ //Let´s try to overwrite some defaults anyway
//try to set the maximum execution time to 60min
@set_time_limit(3600);
diff --git a/lib/private/activity/event.php b/lib/private/activity/event.php
index fe6fc485b7b..247113d54a9 100644
--- a/lib/private/activity/event.php
+++ b/lib/private/activity/event.php
@@ -90,7 +90,7 @@ class Event implements IEvent {
}
/**
- * Set the author of the activity
+ * Set the timestamp of the activity
*
* @param int $timestamp
* @return IEvent
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 17659c96b07..f4acc8290bc 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -261,10 +261,13 @@ class File extends Node implements IFile {
* @throws ServiceUnavailable
*/
public function get() {
-
//throw exception if encryption is disabled but files are still encrypted
try {
- return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+ $res = $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+ if ($res === false) {
+ throw new ServiceUnavailable("Could not open file");
+ }
+ return $res;
} catch (GenericEncryptionException $e) {
// returning 503 will allow retry of the operation at a later point in time
throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php
index e59be17886d..1ff9c74ef84 100644
--- a/lib/private/encryption/decryptall.php
+++ b/lib/private/encryption/decryptall.php
@@ -80,6 +80,11 @@ class DecryptAll {
$this->input = $input;
$this->output = $output;
+ if ($user !== '' && $this->userManager->userExists($user) === false) {
+ $this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
+ return false;
+ }
+
$this->output->writeln('prepare encryption modules...');
if ($this->prepareEncryptionModules($user) === false) {
return false;
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index c1cf17abdee..171afd649c6 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -370,6 +370,7 @@ class DAV extends Common {
case 'c':
case 'c+':
//emulate these
+ $tempManager = \OC::$server->getTempManager();
if (strrpos($path, '.') !== false) {
$ext = substr($path, strrpos($path, '.'));
} else {
@@ -379,12 +380,16 @@ class DAV extends Common {
if (!$this->isUpdatable($path)) {
return false;
}
- $tmpFile = $this->getCachedFile($path);
+ if ($mode === 'w' or $mode === 'w+') {
+ $tmpFile = $tempManager->getTemporaryFile($ext);
+ } else {
+ $tmpFile = $this->getCachedFile($path);
+ }
} else {
if (!$this->isCreatable(dirname($path))) {
return false;
}
- $tmpFile = Files::tmpFile($ext);
+ $tmpFile = $tempManager->getTemporaryFile($ext);
}
Close::registerCallback($tmpFile, array($this, 'writeBack'));
self::$tempFiles[$tmpFile] = $path;
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 802b146cfb6..07c7f31a853 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2441,6 +2441,11 @@ class Share extends Constants {
if (isset($row['stime'])) {
$row['stime'] = (int) $row['stime'];
}
+ if (isset($row['expiration']) && $row['share_type'] !== self::SHARE_TYPE_LINK) {
+ // discard expiration date for non-link shares, which might have been
+ // set by ancient bugs
+ $row['expiration'] = null;
+ }
}
/**
diff --git a/lib/private/user.php b/lib/private/user.php
index 92807246144..ee1ff6f3766 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -146,6 +146,10 @@ class OC_User {
self::$_usedBackends[$backend] = new OC_User_Database();
self::getManager()->registerBackend(self::$_usedBackends[$backend]);
break;
+ case 'dummy':
+ self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
+ self::getManager()->registerBackend(self::$_usedBackends[$backend]);
+ break;
default:
\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', \OCP\Util::DEBUG);
$className = 'OC_USER_' . strToUpper($backend);
@@ -277,11 +281,13 @@ class OC_User {
OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid));
if ($uid) {
- self::setUserId($uid);
- self::setDisplayName($uid);
- self::getUserSession()->setLoginName($uid);
+ if (self::getUser() !== $uid) {
+ self::setUserId($uid);
+ self::setDisplayName($uid);
+ self::getUserSession()->setLoginName($uid);
- OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+ OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+ }
return true;
}
return false;
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 4e6fab34c74..4279a8d41ca 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -136,7 +136,7 @@ OC.L10N.register(
"All checks passed." : "Tutti i controlli passati.",
"Open documentation" : "Apri la documentazione",
"Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
- "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
+ "Allow users to share via link" : "Consenti agli utenti di condividere tramite collegamento",
"Enforce password protection" : "Imponi la protezione con password",
"Allow public uploads" : "Consenti caricamenti pubblici",
"Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 9c2d6fd6a91..416d5706280 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -134,7 +134,7 @@
"All checks passed." : "Tutti i controlli passati.",
"Open documentation" : "Apri la documentazione",
"Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
- "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
+ "Allow users to share via link" : "Consenti agli utenti di condividere tramite collegamento",
"Enforce password protection" : "Imponi la protezione con password",
"Allow public uploads" : "Consenti caricamenti pubblici",
"Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
diff --git a/tests/core/command/encryption/decryptalltest.php b/tests/core/command/encryption/decryptalltest.php
index ef36d6d2827..972ea03150c 100644
--- a/tests/core/command/encryption/decryptalltest.php
+++ b/tests/core/command/encryption/decryptalltest.php
@@ -79,7 +79,8 @@ class DecryptAllTest extends TestCase {
}
- public function testConstructDesctruct() {
+ public function testSingleUserAndTrashbin() {
+
// on construct we enable single-user-mode and disable the trash bin
$this->config->expects($this->at(1))
->method('setSystemValue')
@@ -103,6 +104,7 @@ class DecryptAllTest extends TestCase {
$this->decryptAll,
$this->questionHelper
);
+ $this->invokePrivate($instance, 'forceSingleUserAndTrashbin');
$this->assertTrue(
$this->invokePrivate($instance, 'wasTrashbinEnabled')
@@ -111,6 +113,7 @@ class DecryptAllTest extends TestCase {
$this->assertFalse(
$this->invokePrivate($instance, 'wasSingleUserModeEnabled')
);
+ $this->invokePrivate($instance, 'resetSingleUserAndTrashbin');
}
/**
@@ -187,7 +190,7 @@ class DecryptAllTest extends TestCase {
->with('core', 'encryption_enabled', 'no');
// make sure that we enable encryption again after a exception was thrown
- $this->config->expects($this->at(1))
+ $this->config->expects($this->at(3))
->method('setAppValue')
->with('core', 'encryption_enabled', 'yes');
diff --git a/tests/core/command/encryption/encryptalltest.php b/tests/core/command/encryption/encryptalltest.php
index 9f7f7375044..128b4caa148 100644
--- a/tests/core/command/encryption/encryptalltest.php
+++ b/tests/core/command/encryption/encryptalltest.php
@@ -85,7 +85,9 @@ class EncryptAllTest extends TestCase {
$this->config->expects($this->at(1))->method('setSystemValue')->with('singleuser', true);
$this->config->expects($this->at(2))->method('setSystemValue')->with('singleuser', false);
- new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+ $instance = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+ $this->invokePrivate($instance, 'forceSingleUserAndTrashbin');
+ $this->invokePrivate($instance, 'resetSingleUserAndTrashbin');
}
/**
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 94001291d86..b5f186c5416 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -60,7 +60,7 @@ class FileCache extends \Test_Cache {
\OC_Config::setValue('cachedirectory', $datadir);
\OC_User::clearBackends();
- \OC_User::useBackend(new \OC_User_Dummy());
+ \OC_User::useBackend(new \Test\Util\User\Dummy());
//login
\OC_User::createUser('test', 'test');
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index e5605dd7cc5..fe4c5ec7c29 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -809,4 +809,21 @@ class File extends \Test\TestCase {
return $files;
}
+ /**
+ * @expectedException \Sabre\DAV\Exception\ServiceUnavailable
+ */
+ public function testGetFopenFails() {
+ $view = $this->getMock('\OC\Files\View', ['fopen'], array());
+ $view->expects($this->atLeastOnce())
+ ->method('fopen')
+ ->will($this->returnValue(false));
+
+ $info = new \OC\Files\FileInfo('/test.txt', null, null, array(
+ 'permissions' => \OCP\Constants::PERMISSION_ALL
+ ), null);
+
+ $file = new \OC\Connector\Sabre\File($view, $info);
+
+ $file->get();
+ }
}
diff --git a/tests/lib/encryption/decryptalltest.php b/tests/lib/encryption/decryptalltest.php
index eb3bc721f86..c2a0711c0a0 100644
--- a/tests/lib/encryption/decryptalltest.php
+++ b/tests/lib/encryption/decryptalltest.php
@@ -80,11 +80,13 @@ class DecryptAllTest extends TestCase {
/**
* @dataProvider dataTrueFalse
+ * @param bool $prepareResult
*/
public function testDecryptAll($prepareResult) {
$user = 'user1';
+ $this->userManager->expects($this->once())->method('userExists')->willReturn(true);
/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject | $instance */
$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
->setConstructorArgs(
@@ -121,6 +123,19 @@ class DecryptAllTest extends TestCase {
}
/**
+ * test decrypt all call with a user who doesn't exists
+ */
+ public function testDecryptAllWrongUser() {
+ $this->userManager->expects($this->once())->method('userExists')->willReturn(false);
+ $this->outputInterface->expects($this->once())->method('writeln')
+ ->with('User "user1" does not exist. Please check the username and try again');
+
+ $this->assertFalse(
+ $this->instance->decryptAll($this->inputInterface, $this->outputInterface, 'user1')
+ );
+ }
+
+ /**
* @dataProvider dataTrueFalse
*/
public function testPrepareEncryptionModules($success) {
diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php
index c3d364d6800..1a11b29cf00 100644
--- a/tests/lib/files/etagtest.php
+++ b/tests/lib/files/etagtest.php
@@ -17,7 +17,7 @@ class EtagTest extends \Test\TestCase {
private $tmpDir;
/**
- * @var \OC_User_Dummy $userBackend
+ * @var \Test\Util\User\Dummy $userBackend
*/
private $userBackend;
@@ -35,7 +35,7 @@ class EtagTest extends \Test\TestCase {
$this->tmpDir = \OC_Helper::tmpFolder();
\OC_Config::setValue('datadirectory', $this->tmpDir);
- $this->userBackend = new \OC_User_Dummy();
+ $this->userBackend = new \Test\Util\User\Dummy();
\OC_User::useBackend($this->userBackend);
}
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index b7061bd19a0..cc01ed70b5d 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -72,7 +72,7 @@ class Filesystem extends \Test\TestCase {
protected function setUp() {
parent::setUp();
- $userBackend = new \OC_User_Dummy();
+ $userBackend = new \Test\Util\User\Dummy();
$userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1);
$userBackend->createUser(self::TEST_FILESYSTEM_USER2, self::TEST_FILESYSTEM_USER2);
\OC::$server->getUserManager()->registerBackend($userBackend);
@@ -274,7 +274,7 @@ class Filesystem extends \Test\TestCase {
$user = \OC_User::getUser();
} else {
$user = self::TEST_FILESYSTEM_USER1;
- $backend = new \OC_User_Dummy();
+ $backend = new \Test\Util\User\Dummy();
\OC_User::useBackend($backend);
$backend->createUser($user, $user);
$userObj = \OC::$server->getUserManager()->get($user);
diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php
index e3b8019b4ca..c431a2eb366 100644
--- a/tests/lib/files/node/file.php
+++ b/tests/lib/files/node/file.php
@@ -18,7 +18,7 @@ class File extends \Test\TestCase {
protected function setUp() {
parent::setUp();
- $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ $this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index 96795cb02ef..b30f352847d 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -21,7 +21,7 @@ class Folder extends \Test\TestCase {
protected function setUp() {
parent::setUp();
- $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ $this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index 2d5ccd1fb85..5580b40a126 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -36,7 +36,7 @@ class IntegrationTests extends \Test\TestCase {
\OC_Hook::clear('OC_Filesystem');
- $user = new User($this->getUniqueID('user'), new \OC_User_Dummy);
+ $user = new User($this->getUniqueID('user'), new \Test\Util\User\Dummy);
$this->loginAsUser($user->getUID());
$this->view = new View();
diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
index 01ed84c4a06..afcf4cbabaa 100644
--- a/tests/lib/files/node/node.php
+++ b/tests/lib/files/node/node.php
@@ -15,7 +15,7 @@ class Node extends \Test\TestCase {
protected function setUp() {
parent::setUp();
- $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ $this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {
diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php
index a763428209c..4b1aea1da4e 100644
--- a/tests/lib/files/node/root.php
+++ b/tests/lib/files/node/root.php
@@ -17,7 +17,7 @@ class Root extends \Test\TestCase {
protected function setUp() {
parent::setUp();
- $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ $this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
}
protected function getFileInfo($data) {
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 75cd75ee3f5..5492774f42e 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -42,14 +42,14 @@ class TestScanner extends \OC\Files\Utils\Scanner {
class Scanner extends \Test\TestCase {
/**
- * @var \OC_User_Dummy
+ * @var \Test\Util\User\Dummy
*/
private $userBackend;
protected function setUp() {
parent::setUp();
- $this->userBackend = new \OC_User_Dummy();
+ $this->userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($this->userBackend);
$this->loginAsUser();
}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index bb42f385fc5..abb1696ae70 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -68,7 +68,7 @@ class View extends \Test\TestCase {
\OC_Hook::clear();
\OC_User::clearBackends();
- \OC_User::useBackend(new \OC_User_Dummy());
+ \OC_User::useBackend(new \Test\Util\User\Dummy());
//login
$userManager = \OC::$server->getUserManager();
diff --git a/tests/lib/group.php b/tests/lib/group.php
index 795de695513..066dddc738e 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -30,7 +30,7 @@ class Test_Group extends \Test\TestCase {
}
public function testSingleBackend() {
- $userBackend = new \OC_User_Dummy();
+ $userBackend = new \Test\Util\User\Dummy();
\OC_User::getManager()->registerBackend($userBackend);
OC_Group::useBackend(new OC_Group_Dummy());
@@ -112,7 +112,7 @@ class Test_Group extends \Test\TestCase {
public function testUsersInGroup() {
OC_Group::useBackend(new OC_Group_Dummy());
- $userBackend = new \OC_User_Dummy();
+ $userBackend = new \Test\Util\User\Dummy();
\OC_User::getManager()->registerBackend($userBackend);
$group1 = $this->getUniqueID();
@@ -141,7 +141,7 @@ class Test_Group extends \Test\TestCase {
}
public function testMultiBackend() {
- $userBackend = new \OC_User_Dummy();
+ $userBackend = new \Test\Util\User\Dummy();
\OC_User::getManager()->registerBackend($userBackend);
$backend1 = new OC_Group_Dummy();
$backend2 = new OC_Group_Dummy();
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 82ee8e2eca2..9e118014bac 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -61,7 +61,7 @@ class Preview extends TestCase {
$userManager = \OC::$server->getUserManager();
$userManager->clearBackends();
- $backend = new \OC_User_Dummy();
+ $backend = new \Test\Util\User\Dummy();
$userManager->registerBackend($backend);
$backend->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
$this->loginAsUser(self::TEST_PREVIEW_USER1);
diff --git a/tests/lib/preview/provider.php b/tests/lib/preview/provider.php
index 02459b83bb3..5377f30df82 100644
--- a/tests/lib/preview/provider.php
+++ b/tests/lib/preview/provider.php
@@ -49,7 +49,7 @@ abstract class Provider extends \Test\TestCase {
$userManager = \OC::$server->getUserManager();
$userManager->clearBackends();
- $backend = new \OC_User_Dummy();
+ $backend = new \Test\Util\User\Dummy();
$userManager->registerBackend($backend);
$userId = $this->getUniqueID();
diff --git a/tests/lib/traits/usertrait.php b/tests/lib/traits/usertrait.php
index 401d8b8a832..229087a5200 100644
--- a/tests/lib/traits/usertrait.php
+++ b/tests/lib/traits/usertrait.php
@@ -13,7 +13,7 @@ namespace Test\Traits;
*/
trait UserTrait {
/**
- * @var \OC_User_Dummy|\OCP\UserInterface
+ * @var \Test\Util\User\Dummy|\OCP\UserInterface
*/
protected $userBackend;
@@ -22,7 +22,7 @@ trait UserTrait {
}
protected function setUpUserTrait() {
- $this->userBackend = new \OC_User_Dummy();
+ $this->userBackend = new \Test\Util\User\Dummy();
\OC::$server->getUserManager()->registerBackend($this->userBackend);
}
diff --git a/tests/lib/user.php b/tests/lib/user.php
index cb0c661b2a4..3c068be2826 100644
--- a/tests/lib/user.php
+++ b/tests/lib/user.php
@@ -18,7 +18,7 @@ class User extends TestCase {
protected function setUp(){
parent::setUp();
- $this->backend = $this->getMock('\OC_User_Dummy');
+ $this->backend = $this->getMock('\Test\Util\User\Dummy');
$manager = \OC_User::getManager();
$manager->registerBackend($this->backend);
}
diff --git a/tests/lib/user/avataruserdummy.php b/tests/lib/user/avataruserdummy.php
index 738b10492ea..086adb6043f 100644
--- a/tests/lib/user/avataruserdummy.php
+++ b/tests/lib/user/avataruserdummy.php
@@ -20,7 +20,7 @@
*
*/
-class Avatar_User_Dummy extends \OC_User_Dummy {
+class Avatar_User_Dummy extends \Test\Util\User\Dummy {
public function canChangeAvatar($uid) {
return true;
}
diff --git a/tests/lib/user/dummy.php b/tests/lib/user/dummy.php
index fcc921de4b1..c6c79d7a860 100644
--- a/tests/lib/user/dummy.php
+++ b/tests/lib/user/dummy.php
@@ -23,6 +23,6 @@
class Test_User_Dummy extends Test_User_Backend {
protected function setUp() {
parent::setUp();
- $this->backend=new OC_User_Dummy();
+ $this->backend=new \Test\Util\User\Dummy();
}
}
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index cc8bcd65896..df673f581c4 100644
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -11,7 +11,7 @@ namespace Test\User;
class Manager extends \Test\TestCase {
public function testGetBackends() {
- $userDummyBackend = $this->getMock('\OC_User_Dummy');
+ $userDummyBackend = $this->getMock('\Test\Util\User\Dummy');
$manager = new \OC\User\Manager();
$manager->registerBackend($userDummyBackend);
$this->assertEquals([$userDummyBackend], $manager->getBackends());
@@ -23,9 +23,9 @@ class Manager extends \Test\TestCase {
public function testUserExistsSingleBackendExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@@ -39,9 +39,9 @@ class Manager extends \Test\TestCase {
public function testUserExistsSingleBackendNotExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@@ -61,18 +61,18 @@ class Manager extends \Test\TestCase {
public function testUserExistsTwoBackendsSecondExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
- $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
->will($this->returnValue(false));
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
- $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@@ -87,18 +87,18 @@ class Manager extends \Test\TestCase {
public function testUserExistsTwoBackendsFirstExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
- $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
->will($this->returnValue(true));
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
- $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->never())
->method('userExists');
@@ -113,7 +113,7 @@ class Manager extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('checkPassword')
->with($this->equalTo('foo'), $this->equalTo('bar'))
@@ -140,7 +140,7 @@ class Manager extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('checkPassword');
@@ -156,9 +156,9 @@ class Manager extends \Test\TestCase {
public function testGetOneBackendExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@@ -172,9 +172,9 @@ class Manager extends \Test\TestCase {
public function testGetOneBackendNotExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with($this->equalTo('foo'))
@@ -188,9 +188,9 @@ class Manager extends \Test\TestCase {
public function testSearchOneBackend() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('getUsers')
->with($this->equalTo('fo'))
@@ -207,18 +207,18 @@ class Manager extends \Test\TestCase {
public function testSearchTwoBackendLimitOffset() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
- $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('getUsers')
->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
->will($this->returnValue(array('foo1', 'foo2')));
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
- $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->once())
->method('getUsers')
->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
@@ -237,9 +237,9 @@ class Manager extends \Test\TestCase {
public function testCreateUserSingleBackendNotExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@@ -265,9 +265,9 @@ class Manager extends \Test\TestCase {
*/
public function testCreateUserSingleBackendExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@@ -288,9 +288,9 @@ class Manager extends \Test\TestCase {
public function testCreateUserSingleBackendNotSupported() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
->will($this->returnValue(false));
@@ -320,9 +320,9 @@ class Manager extends \Test\TestCase {
*/
public function testCreateUserTwoBackendExists() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
*/
- $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@@ -336,9 +336,9 @@ class Manager extends \Test\TestCase {
->will($this->returnValue(false));
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
*/
- $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->any())
->method('implementsActions')
->will($this->returnValue(true));
@@ -368,9 +368,9 @@ class Manager extends \Test\TestCase {
public function testCountUsersOneBackend() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('countUsers')
->will($this->returnValue(7));
@@ -382,14 +382,14 @@ class Manager extends \Test\TestCase {
$backend->expects($this->once())
->method('getBackendName')
- ->will($this->returnValue('Mock_OC_User_Dummy'));
+ ->will($this->returnValue('Mock_Test_Util_User_Dummy'));
$manager = new \OC\User\Manager();
$manager->registerBackend($backend);
$result = $manager->countUsers();
$keys = array_keys($result);
- $this->assertTrue(strpos($keys[0], 'Mock_OC_User_Dummy') !== false);
+ $this->assertTrue(strpos($keys[0], 'Mock_Test_Util_User_Dummy') !== false);
$users = array_shift($result);
$this->assertEquals(7, $users);
@@ -397,9 +397,9 @@ class Manager extends \Test\TestCase {
public function testCountUsersTwoBackends() {
/**
- * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+ * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend1 = $this->getMock('\OC_User_Dummy');
+ $backend1 = $this->getMock('\Test\Util\User\Dummy');
$backend1->expects($this->once())
->method('countUsers')
->will($this->returnValue(7));
@@ -410,9 +410,9 @@ class Manager extends \Test\TestCase {
->will($this->returnValue(true));
$backend1->expects($this->once())
->method('getBackendName')
- ->will($this->returnValue('Mock_OC_User_Dummy'));
+ ->will($this->returnValue('Mock_Test_Util_User_Dummy'));
- $backend2 = $this->getMock('\OC_User_Dummy');
+ $backend2 = $this->getMock('\Test\Util\User\Dummy');
$backend2->expects($this->once())
->method('countUsers')
->will($this->returnValue(16));
@@ -423,7 +423,7 @@ class Manager extends \Test\TestCase {
->will($this->returnValue(true));
$backend2->expects($this->once())
->method('getBackendName')
- ->will($this->returnValue('Mock_OC_User_Dummy'));
+ ->will($this->returnValue('Mock_Test_Util_User_Dummy'));
$manager = new \OC\User\Manager();
$manager->registerBackend($backend1);
@@ -433,7 +433,7 @@ class Manager extends \Test\TestCase {
//because the backends have the same class name, only one value expected
$this->assertEquals(1, count($result));
$keys = array_keys($result);
- $this->assertTrue(strpos($keys[0], 'Mock_OC_User_Dummy') !== false);
+ $this->assertTrue(strpos($keys[0], 'Mock_Test_Util_User_Dummy') !== false);
$users = array_shift($result);
//users from backends shall be summed up
@@ -442,7 +442,7 @@ class Manager extends \Test\TestCase {
public function testDeleteUser() {
$manager = new \OC\User\Manager();
- $backend = new \OC_User_Dummy();
+ $backend = new \Test\Util\User\Dummy();
$backend->createUser('foo', 'bar');
$manager->registerBackend($backend);
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
index 4dc7f29c5b8..d9dace2ef05 100644
--- a/tests/lib/user/session.php
+++ b/tests/lib/user/session.php
@@ -20,7 +20,7 @@ class Session extends \Test\TestCase {
->with('user_id')
->will($this->returnValue('foo'));
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with('foo')
@@ -41,7 +41,7 @@ class Session extends \Test\TestCase {
->with('user_id')
->will($this->returnValue('foo'));
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('userExists')
->with('foo')
@@ -62,7 +62,7 @@ class Session extends \Test\TestCase {
->with('user_id')
->will($this->returnValue(null));
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('userExists');
@@ -82,7 +82,7 @@ class Session extends \Test\TestCase {
$manager = $this->getMock('\OC\User\Manager');
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->once())
@@ -122,7 +122,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->once())
@@ -161,7 +161,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->once())
@@ -196,7 +196,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
$user->expects($this->never())
@@ -220,7 +220,7 @@ class Session extends \Test\TestCase {
$manager = $this->getMock('\OC\User\Manager');
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$manager->expects($this->once())
->method('checkPassword')
@@ -257,7 +257,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
@@ -305,7 +305,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
@@ -347,7 +347,7 @@ class Session extends \Test\TestCase {
}
$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
- $backend = $this->getMock('OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index b1df975b60f..bc1365d35bf 100644
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -74,7 +74,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('setPassword')
->with($this->equalTo('foo'), $this->equalTo('bar'));
@@ -97,7 +97,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('setPassword');
@@ -182,7 +182,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('deleteUser')
->with($this->equalTo('foo'));
@@ -195,7 +195,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('getHome')
->with($this->equalTo('foo'))
@@ -216,7 +216,7 @@ class User extends \Test\TestCase {
}
public function testGetBackendClassName() {
- $user = new \OC\User\User('foo', new \OC_User_Dummy());
+ $user = new \OC\User\User('foo', new \Test\Util\User\Dummy());
$this->assertEquals('Dummy', $user->getBackendClassName());
$user = new \OC\User\User('foo', new \OC_User_Database());
$this->assertEquals('Database', $user->getBackendClassName());
@@ -226,7 +226,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->never())
->method('getHome');
@@ -253,7 +253,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@@ -273,7 +273,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@@ -287,7 +287,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@@ -307,7 +307,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->any())
->method('implementsActions')
@@ -393,7 +393,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('setPassword');
@@ -434,7 +434,7 @@ class User extends \Test\TestCase {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
*/
- $backend = $this->getMock('\OC_User_Dummy');
+ $backend = $this->getMock('\Test\Util\User\Dummy');
$backend->expects($this->once())
->method('deleteUser');
diff --git a/lib/private/user/dummy.php b/tests/lib/util/user/dummy.php
index 3779f7b5ddf..6e23e22ab67 100644
--- a/lib/private/user/dummy.php
+++ b/tests/lib/util/user/dummy.php
@@ -25,10 +25,14 @@
*
*/
+namespace Test\Util\User;
+
+use OC_User_Backend;
+
/**
* dummy user backend, does not keep state, only for testing use
*/
-class OC_User_Dummy extends OC_User_Backend implements \OCP\IUserBackend {
+class Dummy extends OC_User_Backend implements \OCP\IUserBackend {
private $users = array();
private $displayNames = array();
diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php
index 06065a8454e..6fab43d6a16 100644
--- a/tests/settings/controller/userscontrollertest.php
+++ b/tests/settings/controller/userscontrollertest.php
@@ -100,7 +100,7 @@ class UsersControllerTest extends \Test\TestCase {
$admin
->expects($this->once())
->method('getBackendClassName')
- ->will($this->returnValue('OC_User_Dummy'));
+ ->will($this->returnValue('\Test\Util\User\Dummy'));
$bar = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$bar
@@ -120,7 +120,7 @@ class UsersControllerTest extends \Test\TestCase {
$bar
->expects($this->once())
->method('getBackendClassName')
- ->will($this->returnValue('OC_User_Dummy'));
+ ->will($this->returnValue('\Test\Util\User\Dummy'));
$this->container['GroupManager']
->expects($this->once())
@@ -175,7 +175,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 404,
'storageLocation' => '/home/admin',
'lastLogin' => 12000,
- 'backend' => 'OC_User_Dummy',
+ 'backend' => '\Test\Util\User\Dummy',
'email' => 'admin@bar.com',
'isRestoreDisabled' => false,
),
@@ -187,7 +187,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 2323,
'storageLocation' => '/home/bar',
'lastLogin' => 3999000,
- 'backend' => 'OC_User_Dummy',
+ 'backend' => '\Test\Util\User\Dummy',
'email' => 'bar@dummy.com',
'isRestoreDisabled' => false,
),
@@ -257,7 +257,7 @@ class UsersControllerTest extends \Test\TestCase {
$admin
->expects($this->once())
->method('getBackendClassName')
- ->will($this->returnValue('OC_User_Dummy'));
+ ->will($this->returnValue('\Test\Util\User\Dummy'));
$bar = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$bar
@@ -277,7 +277,7 @@ class UsersControllerTest extends \Test\TestCase {
$bar
->expects($this->once())
->method('getBackendClassName')
- ->will($this->returnValue('OC_User_Dummy'));
+ ->will($this->returnValue('\Test\Util\User\Dummy'));
$this->container['GroupManager']
->expects($this->at(0))
@@ -343,7 +343,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 404,
'storageLocation' => '/home/admin',
'lastLogin' => 12000,
- 'backend' => 'OC_User_Dummy',
+ 'backend' => '\Test\Util\User\Dummy',
'email' => 'admin@bar.com',
'isRestoreDisabled' => false,
],
@@ -355,7 +355,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 2323,
'storageLocation' => '/home/bar',
'lastLogin' => 3999000,
- 'backend' => 'OC_User_Dummy',
+ 'backend' => '\Test\Util\User\Dummy',
'email' => 'bar@dummy.com',
'isRestoreDisabled' => false,
],
@@ -414,7 +414,7 @@ class UsersControllerTest extends \Test\TestCase {
$admin
->expects($this->once())
->method('getBackendClassName')
- ->will($this->returnValue('OC_User_Dummy'));
+ ->will($this->returnValue('\Test\Util\User\Dummy'));
$bar = $this->getMockBuilder('\OC\User\User')
->disableOriginalConstructor()->getMock();
$bar
@@ -434,7 +434,7 @@ class UsersControllerTest extends \Test\TestCase {
$bar
->expects($this->once())
->method('getBackendClassName')
- ->will($this->returnValue('OC_User_Dummy'));
+ ->will($this->returnValue('\Test\Util\User\Dummy'));
$this->container['UserManager']
->expects($this->once())
@@ -474,7 +474,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 404,
'storageLocation' => '/home/admin',
'lastLogin' => 12000,
- 'backend' => 'OC_User_Dummy',
+ 'backend' => '\Test\Util\User\Dummy',
'email' => 'admin@bar.com',
'isRestoreDisabled' => false,
),
@@ -486,7 +486,7 @@ class UsersControllerTest extends \Test\TestCase {
'quota' => 2323,
'storageLocation' => '/home/bar',
'lastLogin' => 3999000,
- 'backend' => 'OC_User_Dummy',
+ 'backend' => '\Test\Util\User\Dummy',
'email' => 'bar@dummy.com',
'isRestoreDisabled' => false,
),
@@ -522,16 +522,12 @@ class UsersControllerTest extends \Test\TestCase {
$this->container['UserManager']
->expects($this->once())
->method('getBackends')
- ->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
+ ->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()]));
$this->container['UserManager']
->expects($this->once())
->method('clearBackends');
$this->container['UserManager']
->expects($this->once())
- ->method('registerBackend')
- ->with(new \OC_User_Dummy());
- $this->container['UserManager']
- ->expects($this->once())
->method('search')
->with('')
->will($this->returnValue([$user]));
@@ -552,7 +548,7 @@ class UsersControllerTest extends \Test\TestCase {
)
)
);
- $response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
+ $response = $this->container['UsersController']->index(0, 10, '','', '\Test\Util\User\Dummy');
$this->assertEquals($expectedResponse, $response);
}
@@ -562,7 +558,7 @@ class UsersControllerTest extends \Test\TestCase {
$this->container['UserManager']
->expects($this->once())
->method('getBackends')
- ->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
+ ->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()]));
$this->container['UserManager']
->expects($this->once())
->method('search')
@@ -570,7 +566,7 @@ class UsersControllerTest extends \Test\TestCase {
->will($this->returnValue([]));
$expectedResponse = new DataResponse([]);
- $response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
+ $response = $this->container['UsersController']->index(0, 10, '','', '\Test\Util\User\Dummy');
$this->assertEquals($expectedResponse, $response);
}
diff --git a/version.php b/version.php
index 0f7fef95be4..711d82f1ca1 100644
--- a/version.php
+++ b/version.php
@@ -23,10 +23,10 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version = array(8, 2, 0, 5);
+$OC_Version = array(8, 2, 0, 6);
// The human readable string
-$OC_VersionString = '8.2 pre alpha';
+$OC_VersionString = '8.2 beta1';
$OC_VersionCanBeUpgradedFrom = array(8, 1);