Merge branch 'master' of https://github.com/owncloud/core into downstream-160614

apps/comments/l10n/ca.js

@@ -1,8 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Type in a new comment..." : "Escriu en un nou comentari...",
+    "Delete comment" : "Esborrar comentari",
+    "Post" : "Publica",
     "Cancel" : "Cancel·la",
+    "Edit comment" : "Editar comentari",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "No hi han altres comentaris disponibles",
+    "More comments..." : "Més comentaris",
     "Save" : "Desa",
-    "Comment" : "Comentari"
+    "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
+    "{count} unread comments" : "{count} comentaris no llegits",
+    "Comment" : "Comentari",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
+    "You commented" : "Has comentat",
+    "%1$s commented" : "%1$s comentat",
+    "You commented on %2$s" : "Has comentat a %2$s",
+    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/ca.json

@@ -1,6 +1,21 @@
 { "translations": {
+    "Type in a new comment..." : "Escriu en un nou comentari...",
+    "Delete comment" : "Esborrar comentari",
+    "Post" : "Publica",
     "Cancel" : "Cancel·la",
+    "Edit comment" : "Editar comentari",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "No hi han altres comentaris disponibles",
+    "More comments..." : "Més comentaris",
     "Save" : "Desa",
-    "Comment" : "Comentari"
+    "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
+    "{count} unread comments" : "{count} comentaris no llegits",
+    "Comment" : "Comentari",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
+    "You commented" : "Has comentat",
+    "%1$s commented" : "%1$s comentat",
+    "You commented on %2$s" : "Has comentat a %2$s",
+    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/oc.js

@@ -1,8 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Type in a new comment..." : "Escriure un comentari novèl...",
+    "Delete comment" : "Suprimir lo comentari",
+    "Post" : "Mandar",
     "Cancel" : "Anullar",
+    "Edit comment" : "Modificar lo comentari",
+    "[Deleted user]" : "[Utilizaire suprimit]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "Pas cap d'autre comentari",
+    "More comments..." : "Mai de comentaris...",
     "Save" : "Enregistrar",
-    "Comment" : "Comentar"
+    "Allowed characters {count} of {max}" : "{count} sus {max} caractèrs autorizats",
+    "{count} unread comments" : "{count} comentaris pas legits",
+    "Comment" : "Comentar",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> pels fichièrs <em>(totjorn listats dins lo flux)</em>",
+    "You commented" : "Avètz comentat",
+    "%1$s commented" : "%1$s a comentat",
+    "You commented on %2$s" : "Avètz comentat %2$s",
+    "%1$s commented on %2$s" : "%1$s a comentat %2$s"
 },
 "nplurals=2; plural=(n > 1);");

apps/comments/l10n/oc.json

@@ -1,6 +1,21 @@
 { "translations": {
+    "Type in a new comment..." : "Escriure un comentari novèl...",
+    "Delete comment" : "Suprimir lo comentari",
+    "Post" : "Mandar",
     "Cancel" : "Anullar",
+    "Edit comment" : "Modificar lo comentari",
+    "[Deleted user]" : "[Utilizaire suprimit]",
+    "Comments" : "Comentaris",
+    "No other comments available" : "Pas cap d'autre comentari",
+    "More comments..." : "Mai de comentaris...",
     "Save" : "Enregistrar",
-    "Comment" : "Comentar"
+    "Allowed characters {count} of {max}" : "{count} sus {max} caractèrs autorizats",
+    "{count} unread comments" : "{count} comentaris pas legits",
+    "Comment" : "Comentar",
+    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> pels fichièrs <em>(totjorn listats dins lo flux)</em>",
+    "You commented" : "Avètz comentat",
+    "%1$s commented" : "%1$s a comentat",
+    "You commented on %2$s" : "Avètz comentat %2$s",
+    "%1$s commented on %2$s" : "%1$s a comentat %2$s"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/federatedfilesharing/l10n/ar.js

@@ -1,6 +1,7 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
+    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح",
+    "Accept" : "قبول"
 },
 "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;");

apps/federatedfilesharing/l10n/ar.json

@@ -1,4 +1,5 @@
 { "translations": {
-    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
+    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح",
+    "Accept" : "قبول"
 },"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;"
 }

apps/federatedfilesharing/l10n/oc.js

@@ -1,8 +1,10 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
+    "Federated sharing" : "Federated sharing",
     "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
     "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "File is already shared with %s" : "Lo fichièr es ja partejat amb %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
     "Accept" : "Acceptar",
     "Decline" : "Refusar",
@@ -17,6 +19,6 @@ OC.L10N.register(
     "Share it:" : "Partejar :",
     "Add to your website" : "Apondre a vòstre site web",
     "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
-    "HTML Code:" : "Còde HTML :"
+    "HTML Code:" : "Còdi HTML :"
 },
 "nplurals=2; plural=(n > 1);");

apps/federatedfilesharing/l10n/oc.json

@@ -1,6 +1,8 @@
 { "translations": {
+    "Federated sharing" : "Federated sharing",
     "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
     "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "File is already shared with %s" : "Lo fichièr es ja partejat amb %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
     "Accept" : "Acceptar",
     "Decline" : "Refusar",
@@ -15,6 +17,6 @@
     "Share it:" : "Partejar :",
     "Add to your website" : "Apondre a vòstre site web",
     "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
-    "HTML Code:" : "Còde HTML :"
+    "HTML Code:" : "Còdi HTML :"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/federation/l10n/ar.js

@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "federation",
+    {
+    "Server added to the list of trusted ownClouds" : "تمت إضافة الخادم إلى قائمة مضيفات ownCloud الموثوق بها",
+    "Server is already in the list of trusted servers." : "الخادم موجود بالفعل في قائمة مضيفات ownCloud الموثوق بها",
+    "No ownCloud server found" : "لم يتم العثور على خادم ownCloud",
+    "Could not add server" : "تعذَّرت إضافة خادم",
+    "Federation" : "الاتحاد",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "يتيح لك اتحاد مضيفات ownCloud الاتصال بخادمات ownCloud الأخرى الموثوق بها لتبادل دليل المستخدمين.  على سبيل المثال ، يتيح الاتحاد خدمة الإكمال التلقائي للمستخدمين الخارجيين لتمكين المشاركة في الاتحاد.",
+    "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد",
+    "Trusted ownCloud Servers" : "خادمات ownCloud الموثوق بها",
+    "+ Add ownCloud server" : "+ أضف خادم ownCloud",
+    "ownCloud Server" : "خادم ownCloud"
+},
+"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;");

apps/federation/l10n/ar.json

@@ -0,0 +1,13 @@
+{ "translations": {
+    "Server added to the list of trusted ownClouds" : "تمت إضافة الخادم إلى قائمة مضيفات ownCloud الموثوق بها",
+    "Server is already in the list of trusted servers." : "الخادم موجود بالفعل في قائمة مضيفات ownCloud الموثوق بها",
+    "No ownCloud server found" : "لم يتم العثور على خادم ownCloud",
+    "Could not add server" : "تعذَّرت إضافة خادم",
+    "Federation" : "الاتحاد",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "يتيح لك اتحاد مضيفات ownCloud الاتصال بخادمات ownCloud الأخرى الموثوق بها لتبادل دليل المستخدمين.  على سبيل المثال ، يتيح الاتحاد خدمة الإكمال التلقائي للمستخدمين الخارجيين لتمكين المشاركة في الاتحاد.",
+    "Add server automatically once a federated share was created successfully" : "أضف الخادم تلقائياً حال نجاح إنشاء حصة في الاتحاد",
+    "Trusted ownCloud Servers" : "خادمات ownCloud الموثوق بها",
+    "+ Add ownCloud server" : "+ أضف خادم ownCloud",
+    "ownCloud Server" : "خادم ownCloud"
+},"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;"
+}

apps/files/l10n/ar.js

@@ -30,6 +30,7 @@ OC.L10N.register(
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "Uploading..." : "ترفيع...",
+    "..." : "...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",

apps/files/l10n/ar.json

@@ -28,6 +28,7 @@
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "Uploading..." : "ترفيع...",
+    "..." : "...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",

apps/files/l10n/cs_CZ.js

@@ -21,6 +21,7 @@ OC.L10N.register(
     "Invalid directory." : "Neplatný adresář",
     "Files" : "Soubory",
     "All files" : "Všechny soubory",
+    "File could not be found" : "Soubor nelze nalézt",
     "Home" : "Domů",
     "Close" : "Zavřít",
     "Favorites" : "Oblíbené",

apps/files/l10n/cs_CZ.json

@@ -19,6 +19,7 @@
     "Invalid directory." : "Neplatný adresář",
     "Files" : "Soubory",
     "All files" : "Všechny soubory",
+    "File could not be found" : "Soubor nelze nalézt",
     "Home" : "Domů",
     "Close" : "Zavřít",
     "Favorites" : "Oblíbené",

apps/files/l10n/es.js

@@ -21,6 +21,7 @@ OC.L10N.register(
     "Invalid directory." : "Directorio inválido.",
     "Files" : "Archivos",
     "All files" : "Todos los archivos",
+    "File could not be found" : "El archivo no se ha encontrado",
     "Home" : "Particular",
     "Close" : "Cerrar",
     "Favorites" : "Favoritos",

apps/files/l10n/es.json

@@ -19,6 +19,7 @@
     "Invalid directory." : "Directorio inválido.",
     "Files" : "Archivos",
     "All files" : "Todos los archivos",
+    "File could not be found" : "El archivo no se ha encontrado",
     "Home" : "Particular",
     "Close" : "Cerrar",
     "Favorites" : "Favoritos",

apps/files/l10n/ru.js

@@ -21,6 +21,7 @@ OC.L10N.register(
     "Invalid directory." : "Неверный каталог.",
     "Files" : "Файлы",
     "All files" : "Все файлы",
+    "File could not be found" : "Файл не может быть найден",
     "Home" : "Главная",
     "Close" : "Закрыть",
     "Favorites" : "Избранное",

apps/files/l10n/ru.json

@@ -19,6 +19,7 @@
     "Invalid directory." : "Неверный каталог.",
     "Files" : "Файлы",
     "All files" : "Все файлы",
+    "File could not be found" : "Файл не может быть найден",
     "Home" : "Главная",
     "Close" : "Закрыть",
     "Favorites" : "Избранное",

apps/updatenotification/l10n/ar.js

@@ -1,6 +1,16 @@
 OC.L10N.register(
     "updatenotification",
     {
-    "Updater" : "برنامج التحديث"
+    "Update notifications" : "إشعارات التحديث",
+    "{version} is available. Get more information on how to update." : "{version} متوفر.  أحصل على معلومات كيفية التحديث.",
+    "Updated channel" : "قناة محدَّثة.",
+    "ownCloud core" : "نواة ownCloud",
+    "Update for %1$s to version %2$s is available." : "التحديث من النسخة %1$s إلى %2$s متوفر.",
+    "Updater" : "برنامج التحديث",
+    "A new version is available: %s" : "توجد نسخة جديدة: %s",
+    "Open updater" : "فتح المحدِّث",
+    "Your version is up to date." : "النسخة لديك هي الأحدث.",
+    "Update channel:" : "قناة التحديث:",
+    "Notify members of the following groups about available updates:" : "إشعار أعضاء المجموعات التالية بتوفر التحديثات:"
 },
 "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;");

apps/updatenotification/l10n/ar.json

@@ -1,4 +1,14 @@
 { "translations": {
-    "Updater" : "برنامج التحديث"
+    "Update notifications" : "إشعارات التحديث",
+    "{version} is available. Get more information on how to update." : "{version} متوفر.  أحصل على معلومات كيفية التحديث.",
+    "Updated channel" : "قناة محدَّثة.",
+    "ownCloud core" : "نواة ownCloud",
+    "Update for %1$s to version %2$s is available." : "التحديث من النسخة %1$s إلى %2$s متوفر.",
+    "Updater" : "برنامج التحديث",
+    "A new version is available: %s" : "توجد نسخة جديدة: %s",
+    "Open updater" : "فتح المحدِّث",
+    "Your version is up to date." : "النسخة لديك هي الأحدث.",
+    "Update channel:" : "قناة التحديث:",
+    "Notify members of the following groups about available updates:" : "إشعار أعضاء المجموعات التالية بتوفر التحديثات:"
 },"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;"
 }

apps/updatenotification/l10n/sl.js

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "updatenotification",
     {
-    "Update notifications" : "Posodobite obvestila",
+    "Update notifications" : "Posodobi obvestila",
     "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.",
     "Updated channel" : "Posodobljen kanal",
     "Update for %1$s to version %2$s is available." : "Posodobitev %1$s na različico %2$s je na voljo.",

apps/updatenotification/l10n/sl.json

@@ -1,5 +1,5 @@
 { "translations": {
-    "Update notifications" : "Posodobite obvestila",
+    "Update notifications" : "Posodobi obvestila",
     "{version} is available. Get more information on how to update." : "Na voljo je nova različica {version}. Na voljo je več podrobnosti o nadgradnji.",
     "Updated channel" : "Posodobljen kanal",
     "Update for %1$s to version %2$s is available." : "Posodobitev %1$s na različico %2$s je na voljo.",

apps/user_ldap/lib/Proxy.php

@@ -30,6 +30,7 @@ namespace OCA\User_LDAP;
 
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\Mapping\GroupMapping;
+use OCA\User_LDAP\User\Manager;
 
 abstract class Proxy {
 	static private $accesses = array();
@@ -72,7 +73,7 @@ abstract class Proxy {
 			$coreUserManager = \OC::$server->getUserManager();
 		}
 		$userManager =
-			new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
+			new Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
 		$connector = new Connection($this->ldap, $configPrefix);
 		$access = new Access($connector, $this->ldap, $userManager);
 		$access->setUserMapper($userMap);

build/integration/features/sharing-v1.feature

@@ -685,7 +685,7 @@ Feature: sharing
       |{http://open-collaboration-services.org/ns}share-permissions |
     Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "15"
 
-  Scenario: unique target names for incomming shares
+  Scenario: unique target names for incoming shares
     Given user "user0" exists
     And user "user1" exists
     And user "user2" exists

core/l10n/cs_CZ.js

@@ -298,6 +298,7 @@ OC.L10N.register(
     "Thank you for your patience." : "Děkujeme za vaši trpělivost.",
     "Two-step verification" : "Dvoufázové ověření",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Bylo zapnuto vylepšené zabezpečení pro tento účet. Přihlašte se za použití druhého faktoru.",
+    "Cancel login" : "Zrušit přihlášení",
     "Please authenticate using the selected factor." : "Přihlašte se za použití vybraného faktoru.",
     "An error occured while verifying the token" : "Chyba při ověřování tokenu",
     "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",

core/l10n/cs_CZ.json

@@ -296,6 +296,7 @@
     "Thank you for your patience." : "Děkujeme za vaši trpělivost.",
     "Two-step verification" : "Dvoufázové ověření",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Bylo zapnuto vylepšené zabezpečení pro tento účet. Přihlašte se za použití druhého faktoru.",
+    "Cancel login" : "Zrušit přihlášení",
     "Please authenticate using the selected factor." : "Přihlašte se za použití vybraného faktoru.",
     "An error occured while verifying the token" : "Chyba při ověřování tokenu",
     "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",

core/l10n/es.js

@@ -298,6 +298,7 @@ OC.L10N.register(
     "Thank you for your patience." : "Gracias por su paciencia.",
     "Two-step verification" : "Verificación en dos pasos",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La seguridad mejorada se ha habilitado para tu cuenta. Por favor, autenticar utilizando un segundo factor.",
+    "Cancel login" : "Cancelar inicio de sesión",
     "Please authenticate using the selected factor." : "Por favor, autenticar utilizando el factor seleccionado.",
     "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\".",
     "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.",

core/l10n/es.json

@@ -296,6 +296,7 @@
     "Thank you for your patience." : "Gracias por su paciencia.",
     "Two-step verification" : "Verificación en dos pasos",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La seguridad mejorada se ha habilitado para tu cuenta. Por favor, autenticar utilizando un segundo factor.",
+    "Cancel login" : "Cancelar inicio de sesión",
     "Please authenticate using the selected factor." : "Por favor, autenticar utilizando el factor seleccionado.",
     "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\".",
     "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.",

lib/l10n/sl.js

@@ -102,7 +102,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Nastavljanje souporabe %s je spodletelo, ker ozadnji program %s ne upravlja z viri.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Nastavljanje souporabe %s je spodletelo, ker v predpomnilniku zahtevana datoteka ne obstaja.",
     "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s",
-    "Files can't be shared with delete permissions" : "Datoteke, ki imajo nastavljene pravice za izbris, ni mogoče dati v souporabo",
+    "Files can't be shared with delete permissions" : "Souporaba datotek z nastavljenim dovoljenjem za brisanje, ni mogoča",
     "Files can't be shared with create permissions" : "Datoteke, ki imajo nastavljene pravice za ustvarjanje, ni mogoče dati v souporabo.",
     "Expiration date is in the past" : "Datum preteka je že mimo!",
     "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.",
@@ -143,7 +143,7 @@ OC.L10N.register(
     "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
     "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
     "PHP setting \"%s\" is not set to \"%s\"." : "Nastavitev PHP \"%s\" ni nastavljena na \"%s\".",
-    "To fix this issue update your libxml2 version and restart your web server." : "Za rešitev težave posodobite libxml2 in ponovno zaženite spletni strežnik.",
+    "To fix this issue update your libxml2 version and restart your web server." : "Za rešitev te težave je treba posodobiti knjižnico libxml2 in nato ponovno zagnati spletni strežnik.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Napako je najverjetneje povzročil predpomnilnik ali pospeševalnik, kot sta Zend OPcache ali eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
     "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
@@ -156,9 +156,9 @@ OC.L10N.register(
     "Data directory (%s) is invalid" : "Podatkovna mapa (%s) ni veljavna.",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Preverite, ali je v korenu podatkovne mape datoteka \".ocdata\".",
     "Could not obtain lock type %d on \"%s\"." : "Ni mogoče pridobiti zaklepa %d na \"%s\".",
-    "Storage unauthorized. %s" : "Shramba ni avtorizirana. %s",
+    "Storage unauthorized. %s" : "Dostop do shrambe ni overjen. %s",
     "Storage incomplete configuration. %s" : "Nepopolna konfiguracija shrambe. %s",
-    "Storage connection error. %s" : "Napaka pri povezavi do shrambe. %s",
+    "Storage connection error. %s" : "Napaka povezave do shrambe. %s",
     "Storage not available" : "Shramba ni na voljo",
     "Storage connection timeout. %s" : "Povezava do shrambe je časovno potekla. %s"
 },

lib/l10n/sl.json

@@ -100,7 +100,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Nastavljanje souporabe %s je spodletelo, ker ozadnji program %s ne upravlja z viri.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Nastavljanje souporabe %s je spodletelo, ker v predpomnilniku zahtevana datoteka ne obstaja.",
     "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s",
-    "Files can't be shared with delete permissions" : "Datoteke, ki imajo nastavljene pravice za izbris, ni mogoče dati v souporabo",
+    "Files can't be shared with delete permissions" : "Souporaba datotek z nastavljenim dovoljenjem za brisanje, ni mogoča",
     "Files can't be shared with create permissions" : "Datoteke, ki imajo nastavljene pravice za ustvarjanje, ni mogoče dati v souporabo.",
     "Expiration date is in the past" : "Datum preteka je že mimo!",
     "Cannot set expiration date more than %s days in the future" : "Datuma pretaka ni mogoče nastaviti za več kot %s dni v prihodnosti.",
@@ -141,7 +141,7 @@
     "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
     "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
     "PHP setting \"%s\" is not set to \"%s\"." : "Nastavitev PHP \"%s\" ni nastavljena na \"%s\".",
-    "To fix this issue update your libxml2 version and restart your web server." : "Za rešitev težave posodobite libxml2 in ponovno zaženite spletni strežnik.",
+    "To fix this issue update your libxml2 version and restart your web server." : "Za rešitev te težave je treba posodobiti knjižnico libxml2 in nato ponovno zagnati spletni strežnik.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Napako je najverjetneje povzročil predpomnilnik ali pospeševalnik, kot sta Zend OPcache ali eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
     "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
@@ -154,9 +154,9 @@
     "Data directory (%s) is invalid" : "Podatkovna mapa (%s) ni veljavna.",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Preverite, ali je v korenu podatkovne mape datoteka \".ocdata\".",
     "Could not obtain lock type %d on \"%s\"." : "Ni mogoče pridobiti zaklepa %d na \"%s\".",
-    "Storage unauthorized. %s" : "Shramba ni avtorizirana. %s",
+    "Storage unauthorized. %s" : "Dostop do shrambe ni overjen. %s",
     "Storage incomplete configuration. %s" : "Nepopolna konfiguracija shrambe. %s",
-    "Storage connection error. %s" : "Napaka pri povezavi do shrambe. %s",
+    "Storage connection error. %s" : "Napaka povezave do shrambe. %s",
     "Storage not available" : "Shramba ni na voljo",
     "Storage connection timeout. %s" : "Povezava do shrambe je časovno potekla. %s"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"

lib/private/Authentication/TwoFactorAuth/Manager.php

@@ -21,6 +21,7 @@
 
 namespace OC\Authentication\TwoFactorAuth;
 
+use Exception;
 use OC;
 use OC\App\AppManager;
 use OCP\AppFramework\QueryException;
@@ -112,7 +113,8 @@ class Manager {
 					$provider = OC::$server->query($class);
 					$providers[$provider->getId()] = $provider;
 				} catch (QueryException $exc) {
-					// Provider class can not be resolved, ignore it
+					// Provider class can not be resolved
+					throw new Exception("Could not load two-factor auth provider $class");
 				}
 			}
 		}

settings/l10n/cs_CZ.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Dokumentace:",
     "User documentation" : "Dokumentace uživatele",
     "Admin documentation" : "Dokumentace pro administrátory",
+    "Report a bug" : "Nahlásit chybu",
     "Show description …" : "Zobrazit popis ...",
     "Hide description …" : "Skrýt popis ...",
     "This app has an update available." : "Pro tuto aplikaci je dostupná aktualizace.",

settings/l10n/cs_CZ.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Dokumentace:",
     "User documentation" : "Dokumentace uživatele",
     "Admin documentation" : "Dokumentace pro administrátory",
+    "Report a bug" : "Nahlásit chybu",
     "Show description …" : "Zobrazit popis ...",
     "Hide description …" : "Skrýt popis ...",
     "This app has an update available." : "Pro tuto aplikaci je dostupná aktualizace.",

settings/l10n/de.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Dokumentation:",
     "User documentation" : "Dokumentation für Benutzer",
     "Admin documentation" : "Dokumentation für Administratoren",
+    "Report a bug" : "Melde einen technischen Fehler",
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung verfügbar.",

settings/l10n/de.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Dokumentation:",
     "User documentation" : "Dokumentation für Benutzer",
     "Admin documentation" : "Dokumentation für Administratoren",
+    "Report a bug" : "Melde einen technischen Fehler",
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung verfügbar.",

settings/l10n/de_DE.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Dokumentation:",
     "User documentation" : "Dokumentation für Benutzer",
     "Admin documentation" : "Dokumentation für Administratoren",
+    "Report a bug" : "Melden Sie einen technischen Fehler",
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.",

settings/l10n/de_DE.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Dokumentation:",
     "User documentation" : "Dokumentation für Benutzer",
     "Admin documentation" : "Dokumentation für Administratoren",
+    "Report a bug" : "Melden Sie einen technischen Fehler",
     "Show description …" : "Beschreibung anzeigen…",
     "Hide description …" : "Beschreibung ausblenden…",
     "This app has an update available." : "Es ist eine Aktualisierung für diese Anwendung verfügbar.",

settings/l10n/en_GB.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Documentation:",
     "User documentation" : "User documentation",
     "Admin documentation" : "Admin documentation",
+    "Report a bug" : "Report a bug",
     "Show description …" : "Show description …",
     "Hide description …" : "Hide description …",
     "This app has an update available." : "This app has an update available.",

settings/l10n/en_GB.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Documentation:",
     "User documentation" : "User documentation",
     "Admin documentation" : "Admin documentation",
+    "Report a bug" : "Report a bug",
     "Show description …" : "Show description …",
     "Hide description …" : "Hide description …",
     "This app has an update available." : "This app has an update available.",

settings/l10n/es.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Documentación:",
     "User documentation" : "Documentación de usuario",
     "Admin documentation" : "Documentación de administrador",
+    "Report a bug" : "Notificar un error",
     "Show description …" : "Mostrar descripción…",
     "Hide description …" : "Ocultar descripción…",
     "This app has an update available." : "Está app tiene una actualización pendiente.",

settings/l10n/es.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Documentación:",
     "User documentation" : "Documentación de usuario",
     "Admin documentation" : "Documentación de administrador",
+    "Report a bug" : "Notificar un error",
     "Show description …" : "Mostrar descripción…",
     "Hide description …" : "Ocultar descripción…",
     "This app has an update available." : "Está app tiene una actualización pendiente.",

settings/l10n/fi_FI.js

@@ -208,6 +208,8 @@ OC.L10N.register(
     "Documentation:" : "Ohjeistus:",
     "User documentation" : "Käyttäjädokumentaatio",
     "Admin documentation" : "Ylläpitäjän ohjeistus",
+    "Visit website" : "Käy verkkosivustolla",
+    "Report a bug" : "Ilmoita viasta",
     "Show description …" : "Näytä kuvaus…",
     "Hide description …" : "Piilota kuvaus…",
     "This app has an update available." : "Tähän sovellukseen on päivitys saatavilla.",

settings/l10n/fi_FI.json

@@ -206,6 +206,8 @@
     "Documentation:" : "Ohjeistus:",
     "User documentation" : "Käyttäjädokumentaatio",
     "Admin documentation" : "Ylläpitäjän ohjeistus",
+    "Visit website" : "Käy verkkosivustolla",
+    "Report a bug" : "Ilmoita viasta",
     "Show description …" : "Näytä kuvaus…",
     "Hide description …" : "Piilota kuvaus…",
     "This app has an update available." : "Tähän sovellukseen on päivitys saatavilla.",

settings/l10n/fr.js

@@ -218,6 +218,7 @@ OC.L10N.register(
     "Documentation:" : "Documentation :",
     "User documentation" : "Documentation utilisateur",
     "Admin documentation" : "Documentation administrateur",
+    "Report a bug" : "Signaler un bogue",
     "Show description …" : "Afficher la description...",
     "Hide description …" : "Masquer la description",
     "This app has an update available." : "Cette application a une mise à jour disponible.",

settings/l10n/fr.json

@@ -216,6 +216,7 @@
     "Documentation:" : "Documentation :",
     "User documentation" : "Documentation utilisateur",
     "Admin documentation" : "Documentation administrateur",
+    "Report a bug" : "Signaler un bogue",
     "Show description …" : "Afficher la description...",
     "Hide description …" : "Masquer la description",
     "This app has an update available." : "Cette application a une mise à jour disponible.",

settings/l10n/it.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Documentazione:",
     "User documentation" : "Documentazione utente",
     "Admin documentation" : "Documentazione di amministrazione",
+    "Report a bug" : "Segnala un bug",
     "Show description …" : "Mostra descrizione...",
     "Hide description …" : "Nascondi descrizione...",
     "This app has an update available." : "Un aggiornamento di questa applicazione è disponibile.",

settings/l10n/it.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Documentazione:",
     "User documentation" : "Documentazione utente",
     "Admin documentation" : "Documentazione di amministrazione",
+    "Report a bug" : "Segnala un bug",
     "Show description …" : "Mostra descrizione...",
     "Hide description …" : "Nascondi descrizione...",
     "This app has an update available." : "Un aggiornamento di questa applicazione è disponibile.",

settings/l10n/ja.js

@@ -222,6 +222,7 @@ OC.L10N.register(
     "Documentation:" : "ドキュメント:",
     "User documentation" : "ユーザードキュメント",
     "Admin documentation" : "管理者ドキュメント",
+    "Report a bug" : "バグを報告",
     "Show description …" : "説明を表示 ...",
     "Hide description …" : "説明を隠す ...",
     "This app has an update available." : "このアプリでアップデートが利用できます.",

settings/l10n/ja.json

@@ -220,6 +220,7 @@
     "Documentation:" : "ドキュメント:",
     "User documentation" : "ユーザードキュメント",
     "Admin documentation" : "管理者ドキュメント",
+    "Report a bug" : "バグを報告",
     "Show description …" : "説明を表示 ...",
     "Hide description …" : "説明を隠す ...",
     "This app has an update available." : "このアプリでアップデートが利用できます.",

settings/l10n/nl.js

@@ -216,6 +216,7 @@ OC.L10N.register(
     "Documentation:" : "Documentatie:",
     "User documentation" : "Gebruikersdocumentatie",
     "Admin documentation" : "Beheerdocumentatie",
+    "Report a bug" : "Rapporteer een fout",
     "Show description …" : "Toon beschrijving ...",
     "Hide description …" : "Verberg beschrijving ...",
     "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.",

settings/l10n/nl.json

@@ -214,6 +214,7 @@
     "Documentation:" : "Documentatie:",
     "User documentation" : "Gebruikersdocumentatie",
     "Admin documentation" : "Beheerdocumentatie",
+    "Report a bug" : "Rapporteer een fout",
     "Show description …" : "Toon beschrijving ...",
     "Hide description …" : "Verberg beschrijving ...",
     "This app has an update available." : "Er is een update beschikbaar voor deze applicatie.",

settings/l10n/oc.js

@@ -199,6 +199,7 @@ OC.L10N.register(
     "Documentation:" : "Documentacion :",
     "User documentation" : "Documentacion utilizaire",
     "Admin documentation" : "Documentacion administrator",
+    "Report a bug" : "Raportar un bug",
     "Show description …" : "Afichar la descripcion...",
     "Hide description …" : "Amagar la descripcion...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Aquesta aplicacion pòt pas èsser installada a causa d'aquelas dependéncias pas satisfachas :",

settings/l10n/oc.json

@@ -197,6 +197,7 @@
     "Documentation:" : "Documentacion :",
     "User documentation" : "Documentacion utilizaire",
     "Admin documentation" : "Documentacion administrator",
+    "Report a bug" : "Raportar un bug",
     "Show description …" : "Afichar la descripcion...",
     "Hide description …" : "Amagar la descripcion...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Aquesta aplicacion pòt pas èsser installada a causa d'aquelas dependéncias pas satisfachas :",

settings/l10n/pl.js

@@ -141,6 +141,7 @@ OC.L10N.register(
     "Developer documentation" : "Dokumentacja dewelopera",
     "Documentation:" : "Dokumentacja:",
     "User documentation" : "Dokumentacja użytkownika",
+    "Report a bug" : "Zgłoś błąd",
     "Show description …" : "Pokaż opis ...",
     "Hide description …" : "Ukryj opis ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ta aplikacja nie może być zainstalowana, ponieważ nie są spełnione następujące zależności:",

settings/l10n/pl.json

@@ -139,6 +139,7 @@
     "Developer documentation" : "Dokumentacja dewelopera",
     "Documentation:" : "Dokumentacja:",
     "User documentation" : "Dokumentacja użytkownika",
+    "Report a bug" : "Zgłoś błąd",
     "Show description …" : "Pokaż opis ...",
     "Hide description …" : "Ukryj opis ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ta aplikacja nie może być zainstalowana, ponieważ nie są spełnione następujące zależności:",

settings/l10n/pt_BR.js

@@ -223,6 +223,8 @@ OC.L10N.register(
     "Documentation:" : "Documentação:",
     "User documentation" : "Documentação do usuário",
     "Admin documentation" : "Documentação para Administração",
+    "Visit website" : "Visitar website",
+    "Report a bug" : "Registrar um bug",
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Este aplicativo tem uma atualização disponível.",

settings/l10n/pt_BR.json

@@ -221,6 +221,8 @@
     "Documentation:" : "Documentação:",
     "User documentation" : "Documentação do usuário",
     "Admin documentation" : "Documentação para Administração",
+    "Visit website" : "Visitar website",
+    "Report a bug" : "Registrar um bug",
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Este aplicativo tem uma atualização disponível.",

settings/l10n/pt_PT.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Documentação:",
     "User documentation" : "Documentação de Utilizador",
     "Admin documentation" : "Documentação do Administrador",
+    "Report a bug" : "Reportar um erro",
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Esta aplicação tem uma atualização disponível.",

settings/l10n/pt_PT.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Documentação:",
     "User documentation" : "Documentação de Utilizador",
     "Admin documentation" : "Documentação do Administrador",
+    "Report a bug" : "Reportar um erro",
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app has an update available." : "Esta aplicação tem uma atualização disponível.",

settings/l10n/ro.js

@@ -147,6 +147,7 @@ OC.L10N.register(
     "Documentation:" : "Documentație:",
     "User documentation" : "Documentație utilizator",
     "Admin documentation" : "Documentație pentru administrare",
+    "Report a bug" : "Raportează un defect",
     "Show description …" : "Arată descriere ...",
     "Hide description …" : "Ascunde descriere ...",
     "This app has an update available." : "Este disponibilă o actualizare pentru această aplicație.",

settings/l10n/ro.json

@@ -145,6 +145,7 @@
     "Documentation:" : "Documentație:",
     "User documentation" : "Documentație utilizator",
     "Admin documentation" : "Documentație pentru administrare",
+    "Report a bug" : "Raportează un defect",
     "Show description …" : "Arată descriere ...",
     "Hide description …" : "Ascunde descriere ...",
     "This app has an update available." : "Este disponibilă o actualizare pentru această aplicație.",

settings/l10n/ru.js

@@ -223,6 +223,8 @@ OC.L10N.register(
     "Documentation:" : "Документация:",
     "User documentation" : "Пользовательская документация",
     "Admin documentation" : "Документация для администратора",
+    "Visit website" : "Посетите веб-сайт",
+    "Report a bug" : "Сообщить об ошибке",
     "Show description …" : "Показать описание ...",
     "Hide description …" : "Скрыть описание ...",
     "This app has an update available." : "Для этого приложения доступно обновление.",

settings/l10n/ru.json

@@ -221,6 +221,8 @@
     "Documentation:" : "Документация:",
     "User documentation" : "Пользовательская документация",
     "Admin documentation" : "Документация для администратора",
+    "Visit website" : "Посетите веб-сайт",
+    "Report a bug" : "Сообщить об ошибке",
     "Show description …" : "Показать описание ...",
     "Hide description …" : "Скрыть описание ...",
     "This app has an update available." : "Для этого приложения доступно обновление.",

settings/l10n/sl.js

@@ -190,6 +190,7 @@ OC.L10N.register(
     "Documentation:" : "Dokumentacija:",
     "User documentation" : "Uporabniška dokumentacija",
     "Admin documentation" : "Skrbniška dokumentacija",
+    "Report a bug" : "Pošlji poročilo o hrošču",
     "Show description …" : "Pokaži opis ...",
     "Hide description …" : "Skrij opis ...",
     "This app has an update available." : "Za program so na voljo posodobitve.",

settings/l10n/sl.json

@@ -188,6 +188,7 @@
     "Documentation:" : "Dokumentacija:",
     "User documentation" : "Uporabniška dokumentacija",
     "Admin documentation" : "Skrbniška dokumentacija",
+    "Report a bug" : "Pošlji poročilo o hrošču",
     "Show description …" : "Pokaži opis ...",
     "Hide description …" : "Skrij opis ...",
     "This app has an update available." : "Za program so na voljo posodobitve.",

settings/l10n/sq.js

@@ -223,6 +223,7 @@ OC.L10N.register(
     "Documentation:" : "Dokumentim:",
     "User documentation" : "Dokumentim për përdoruesit",
     "Admin documentation" : "Dokumentim për përgjegjësit",
+    "Report a bug" : "Njoftoni një të metë",
     "Show description …" : "Shfaq përshkrim …",
     "Hide description …" : "Fshihe përshkrimin …",
     "This app has an update available." : "Ka gati një përditësim për këtë aplikacion.",

settings/l10n/sq.json

@@ -221,6 +221,7 @@
     "Documentation:" : "Dokumentim:",
     "User documentation" : "Dokumentim për përdoruesit",
     "Admin documentation" : "Dokumentim për përgjegjësit",
+    "Report a bug" : "Njoftoni një të metë",
     "Show description …" : "Shfaq përshkrim …",
     "Hide description …" : "Fshihe përshkrimin …",
     "This app has an update available." : "Ka gati një përditësim për këtë aplikacion.",

tests/lib/Authentication/TwoFactorAuth/ManagerTest.php

@@ -85,11 +85,32 @@ class ManagerTest extends TestCase {
 		]));
 	}
 
+	/**
+	 * @expectedException \Exception
+	 * @expectedExceptionMessage Could not load two-factor auth provider \OCA\MyFaulty2faApp\DoesNotExist
+	 */
+	public function testFailHardIfProviderCanNotBeLoaded() {
+		$this->appManager->expects($this->once())
+			->method('getEnabledAppsForUser')
+			->with($this->user)
+			->will($this->returnValue(['faulty2faapp']));
+
+		$this->appManager->expects($this->once())
+			->method('getAppInfo')
+			->with('faulty2faapp')
+			->will($this->returnValue([
+					'two-factor-providers' => [
+						'\OCA\MyFaulty2faApp\DoesNotExist',
+					],
+		]));
+
+		$this->manager->getProviders($this->user);
+	}
+
 	public function testIsTwoFactorAuthenticated() {
 		$this->prepareProviders();
 
-		$user = $this->getMock('\OCP\IUser');
+		$this->user->expects($this->once())
-		$user->expects($this->once())
 			->method('getUID')
 			->will($this->returnValue('user123'));
 		$this->config->expects($this->once())
@@ -97,7 +118,7 @@ class ManagerTest extends TestCase {
 			->with('user123', 'core', 'two_factor_auth_disabled', 0)
 			->will($this->returnValue(0));
 
-		$this->assertTrue($this->manager->isTwoFactorAuthenticated($user));
+		$this->assertTrue($this->manager->isTwoFactorAuthenticated($this->user));
 	}
 
 	public function testGetProvider() {