8 files changed, 15 insertions, 12 deletions
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index 37d0607cd3f..544a97e80be 100644
--- a/apps/files_sharing/ajax/external.php
+++ b/apps/files_sharing/ajax/external.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
 
-$l = OC_L10N::get('files_sharing');
+$l = \OC::$server->getL10N('files_sharing');
 
 // check if server admin allows to mount public links from other servers
 if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index b22c553ec93..543cae7b0c1 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
-$l = OC_L10N::get('files_sharing');
+$l = \OC::$server->getL10N('files_sharing');
 
 OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
 OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php
index 879f231bf92..2a5004811b8 100644
--- a/apps/files_sharing/l10n/ast.php
+++ b/apps/files_sharing/l10n/ast.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Server to server sharing is not enabled on this server" => "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor",
+"Invalid or untrusted SSL certificate" => "Certificáu SSL inválidu o ensín validar",
 "Couldn't add remote share" => "Nun pudo amestase una compartición remota",
 "Shared with you" => "Compartíos contigo",
 "Shared with others" => "Compartíos con otros",
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index 2545c4760ec..50cc21e43dd 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,8 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"Cancel" => "বাতির",
+"Cancel" => "বাতিল",
+"Shared by" => "যাদের মাঝে ভাগাভাগি করা হয়েছে",
 "Password" => "কূটশব্দ",
-"Name" => "রাম",
+"Name" => "নাম",
 "Download" => "ডাউনলোড"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index b4f52dbef7e..45019e34708 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -8,13 +8,13 @@ $TRANSLATIONS = array(
 "Shared by link" => "Sdíleno pomocí odkazu",
 "No files have been shared with you yet." => "Zatím s vámi nikdo žádné soubory nesdílel.",
 "You haven't shared any files yet." => "Zatím jste nesdíleli žádné soubory.",
-"You haven't shared any files by link yet." => "Zatím jste nesdíleli pomocí odkazu žádný soubor.",
+"You haven't shared any files by link yet." => "Zatím jste nesdíleli pomocí odkazu žádné soubory.",
 "Do you want to add the remote share {name} from {owner}@{remote}?" => "Chcete přidat vzdálené úložiště {name} uživatele {owner}@{remote}?",
 "Remote share" => "Vzdálené úložiště",
 "Remote share password" => "Heslo ke vzdálenému úložišti",
 "Cancel" => "Zrušit",
 "Add remote share" => "Přidat vzdálené úložiště",
-"No ownCloud installation found at {remote}" => "Nebyla nalezen žádný funkční ownCloud na {remote}",
+"No ownCloud installation found at {remote}" => "Nebyla nalezena instalace ownCloud na {remote}",
 "Invalid ownCloud url" => "Neplatná ownCloud url",
 "Shared by" => "Sdílí",
 "This share is password-protected" => "Toto sdílení je chráněno heslem",
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 71df34108ba..d0fb98e4ee2 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Server to server sharing is not enabled on this server" => "Serverist serverisse jagamine pole antud serveris lubatud",
+"Invalid or untrusted SSL certificate" => "Vigane või tundmatu SSL sertifikaat",
 "Couldn't add remote share" => "Ei suutnud lisada kaugjagamist",
 "Shared with you" => "Sinuga jagatud",
 "Shared with others" => "Teistega jagatud",
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index f444404c2b1..e7ca4fcccd4 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -106,7 +106,7 @@ class Helper {
 					return false;
 				} else {
 					// Save item id in session for future requests
-					\OC::$session->set('public_link_authenticated', $linkItem['id']);
+					\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']);
 				}
 			} else {
 				\OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
@@ -117,8 +117,8 @@ class Helper {
 		}
 		else {
 			// not authenticated ?
-			if ( ! \OC::$session->exists('public_link_authenticated')
-				|| \OC::$session->get('public_link_authenticated') !== $linkItem['id']) {
+			if ( ! \OC::$server->getSession()->exists('public_link_authenticated')
+				|| \OC::$server->getSession()->get('public_link_authenticated') !== $linkItem['id']) {
 				return false;
 			}
 		}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 746bdf87c17..bcf99d01edb 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -63,7 +63,7 @@ if (isset($path)) {
 					exit();
 				} else {
 					// Save item id in session for future requests
-					\OC::$session->set('public_link_authenticated', $linkItem['id']);
+					\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']);
 				}
 			} else {
 				OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
@@ -76,8 +76,8 @@ if (isset($path)) {
 
 		} else {
 			// Check if item id is set in session
-			if ( ! \OC::$session->exists('public_link_authenticated')
-				|| \OC::$session->get('public_link_authenticated') !== $linkItem['id']
+			if ( ! \OC::$server->getSession()->exists('public_link_authenticated')
+				|| \OC::$server->getSession()->get('public_link_authenticated') !== $linkItem['id']
 			) {
 				// Prompt for password
 				OCP\Util::addStyle('files_sharing', 'authenticate');