summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-06-14 01:06:25 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-06-14 01:06:25 +0200
commitae02685e6f31d9922dbfeb758f41556369e55864 (patch)
treecb14b4fe9374bf7d7448f4326758a7a428b6e335 /lib
parentd0e4727ecdc317e65be5705cbbbeb61793aa9a03 (diff)
parent990ac34aaa707652614820848e6b740763936831 (diff)
downloadnextcloud-server-ae02685e6f31d9922dbfeb758f41556369e55864.tar.gz
nextcloud-server-ae02685e6f31d9922dbfeb758f41556369e55864.zip
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/sl.js8
-rw-r--r--lib/l10n/sl.json8
-rw-r--r--lib/private/Authentication/TwoFactorAuth/Manager.php4
3 files changed, 11 insertions, 9 deletions
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 5c6ba6afa25..e8e861af3c4 100644
--- a/lib/l10n/sl.js
+++ b/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"
},
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index 6877048f079..a05d62b1c39 100644
--- a/lib/l10n/sl.json
+++ b/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);"
diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php
index 2b2924e7f14..805735bd1b8 100644
--- a/lib/private/Authentication/TwoFactorAuth/Manager.php
+++ b/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");
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-01 18:52:16 +0000