Merge branch 'master' into more-themable-strings

Conflicts:
	lib/template.php

39 files changed, 153 insertions, 78 deletions

diff --git a/settings/admin.php b/settings/admin.php
index db041ef889c..10e239204f2 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -32,15 +32,16 @@ $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundj
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 
 // Check if connected using HTTPS
-if (OC_Request::serverProtocol() == 'https') {
+if (OC_Request::serverProtocol() === 'https') {
 	$connectedHTTPS = true; 
 } else {
 	$connectedHTTPS = false;
 } 
 $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
-$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); 
+$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
 
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $tmpl->assign('forms', array());
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 9c5adfcfef9..b68083fca6b 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -33,18 +33,18 @@ if(is_array($categoryNames)) {
 		// show only external apps that aren't enabled yet
 		$local=false;
 		foreach($enabledApps as $a) {
-			if($a == $app['name']) {
+			if($a === $app['name']) {
 				$local=true;
 			}
 		}
 
 		if(!$local) {
-			if($app['preview']=='') {
+			if($app['preview'] === '') {
 				$pre=OC_Helper::imagePath('settings', 'trans.png');
 			} else {
 				$pre=$app['preview'];
 			}
-			if($app['label']=='recommended') {
+			if($app['label'] === 'recommended') {
 				$label='3rd Party';
 			} else {
 				$label='Recommended';
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
index faf962fbdd7..4bb41fa3d3b 100644
--- a/settings/ajax/changedisplayname.php
+++ b/settings/ajax/changedisplayname.php
@@ -17,7 +17,7 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
 
-if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
+if ($username === OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
 	$userstatus = 'changeOwnDisplayName';
 }
 
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 56653bed6bd..205958f88d3 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -16,7 +16,7 @@ if(OC_User::isAdminUser(OC_User::getUser())) {
 				$groups[] = $group;
 			}
 		}
-		if(count($groups) == 0) {
+		if(count($groups) === 0) {
 			$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
 		}
 	}else{
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index da69a2863b7..e7151419286 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -16,6 +16,6 @@ $data = array();
 OC_JSON::success(
 	array(
 		"data" => $entries,
-		"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) != 0) ? true : false
+		"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0) ? true : false
 	)
 );
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index aebb1b31b6f..94773f3dc70 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 if( isset( $_POST['lang'] ) ) {
 	$languageCodes=OC_L10N::findAvailableLanguages();
 	$lang=$_POST['lang'];
-	if(array_search($lang, $languageCodes) or $lang=='en') {
+	if(array_search($lang, $languageCodes) or $lang === 'en') {
 		OC_Preferences::setValue( OC_User::getUser(), 'core', 'lang', $lang );
 		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
 	}else{
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 8dcb7ddd424..2e6de2b759c 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
+if(($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
 	|| (!OC_User::isAdminUser(OC_User::getUser())
 		&& !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
 	$l = OC_L10N::get('core');
@@ -20,7 +20,7 @@ if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
 
 //make sure the quota is in the expected format
 $quota=$_POST["quota"];
-if($quota!='none' and $quota!='default') {
+if($quota !== 'none' and $quota !== 'default') {
 	$quota= OC_Helper::computerFileSize($quota);
 	$quota=OC_Helper::humanFileSize($quota);
 }
@@ -29,7 +29,7 @@ if($quota!='none' and $quota!='default') {
 if($username) {
 	OC_Preferences::setValue($username, 'files', 'quota', $quota);
 }else{//set the default quota when no username is specified
-	if($quota=='default') {//'default' as default quota makes no sense
+	if($quota === 'default') {//'default' as default quota makes no sense
 		$quota='none';
 	}
 	OC_Appconfig::setValue('files', 'default_quota', $quota);
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f6fd9aba6d9..6963f9eb43c 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,7 +7,7 @@ $success = true;
 $username = $_POST["username"];
 $group = $_POST["group"];
 
-if($username == OC_User::getUser() && $group == "admin" &&  OC_User::isAdminUser($username)) {
+if($username === OC_User::getUser() && $group === "admin" &&  OC_User::isAdminUser($username)) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
 	exit();
@@ -36,7 +36,7 @@ if( OC_Group::inGroup( $username, $group )) {
 	$error = $l->t("Unable to remove user from group %s", $group);
 	$success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
-	if(count($usersInGroup)==0) {
+	if(count($usersInGroup) === 0) {
 		OC_Group::deleteGroup($group);
 	}
 }
diff --git a/settings/apps.php b/settings/apps.php
index 44cfff7e3f1..20b12887554 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -30,13 +30,13 @@ OC_App::setActiveNavigationEntry( "core_apps" );
 
 function app_sort( $a, $b ) {
 
-	if ($a['active'] != $b['active']) {
+	if ($a['active'] !== $b['active']) {
 
 		return $b['active'] - $a['active'];
 
 	}
 
-	if ($a['internal'] != $b['internal']) {
+	if ($a['internal'] !== $b['internal']) {
 		return $b['internal'] - $a['internal'];
 	}
 
diff --git a/settings/help.php b/settings/help.php
index a5ac11ec9a3..713b23f7857 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -13,7 +13,7 @@ OC_Util::addStyle( "settings", "settings" );
 OC_App::setActiveNavigationEntry( "help" );
 
 
-if(isset($_GET['mode']) and $_GET['mode']=='admin') {
+if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
 	$url=OC_Helper::linkToAbsolute( 'core', 'doc/admin' );
 	$style1='';
 	$style2=' pressed';
diff --git a/settings/js/admin.js b/settings/js/admin.js
index ab218377fb3..f2d6f37a51a 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -8,7 +8,7 @@ $(document).ready(function(){
 	$('#backgroundjobs input').change(function(){
 		if($(this).attr('checked')){
 			var mode = $(this).val();
-			if (mode == 'ajax' || mode == 'webcron' || mode == 'cron') {
+			if (mode === 'ajax' || mode === 'webcron' || mode === 'cron') {
 				OC.AppConfig.setValue('core', 'backgroundjobs_mode', mode);
 			}
 		}
@@ -19,7 +19,7 @@ $(document).ready(function(){
 	});
 
 	$('#shareAPI input').change(function() {
-		if ($(this).attr('type') == 'checkbox') {
+		if ($(this).attr('type') === 'checkbox') {
 			if (this.checked) {
 				var value = 'yes';
 			} else {
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 1ee3372f893..0540d9b1c58 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -29,7 +29,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('span.author').text(app.author);
 		page.find('span.licence').text(app.licence);
 
-		if (app.update != false) {
+		if (app.update !== false) {
 			page.find('input.update').show();
 			page.find('input.update').data('appid', app.id);
 			page.find('input.update').attr('value',t('settings', 'Update to {appversion}', {appversion:app.update}));
@@ -41,7 +41,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('input.enable').val((app.active) ? t('settings', 'Disable') : t('settings', 'Enable'));
 		page.find('input.enable').data('appid', app.id);
 		page.find('input.enable').data('active', app.active);
-		if (app.internal == false) {
+		if (app.internal === false) {
 			page.find('span.score').show();
 			page.find('p.appslink').show();
 			page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
@@ -60,7 +60,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		element.val(t('settings','Please wait....'));
 		if(active) {
 			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
-				if(!result || result.status!='success') {
+				if(!result || result.status !== 'success') {
 					OC.dialogs.alert('Error while disabling app', t('core', 'Error'));
 				}
 				else {
@@ -72,7 +72,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			$('#leftcontent li[data-id="'+appid+'"]').removeClass('active');
 		} else {
 			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
-				if(!result || result.status!='success') {
+				if(!result || result.status !== 'success') {
 					OC.dialogs.alert('Error while enabling app', t('core', 'Error'));
 				}
 				else {
@@ -94,7 +94,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		console.log('updateApp:', appid, element);
 		element.val(t('settings','Updating....'));
 		$.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appid},function(result) {
-			if(!result || result.status!='success') {
+			if(!result || result.status !== 'success') {
 				OC.dialogs.alert(t('settings','Error while updating app'),t('settings','Error'));
 			}
 			else {
@@ -171,7 +171,7 @@ $(document).ready(function(){
 		$(this).find('span.hidden').remove();
 	});
 	$('#leftcontent li').keydown(function(event) {
-		if (event.which == 13 || event.which == 32) {
+		if (event.which === 13 || event.which === 32) {
 			$(event.target).click();
 		}
 		return false;
diff --git a/settings/js/log.js b/settings/js/log.js
index 84f6d1aa5f3..1ef9b419cdb 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -19,7 +19,7 @@ OC.Log={
 	getMore:function(count){
 		count = count || 10;
 		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
-			if(result.status=='success'){
+			if(result.status === 'success'){
 				OC.Log.addEntries(result.data);
 				if(!result.remain){
 					$('#moreLog').hide();
diff --git a/settings/js/users.js b/settings/js/users.js
index 5d890db65b8..6a8afc4ca36 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -67,7 +67,7 @@ var UserList = {
 				async: false,
 				data: { username: UserList.deleteUid },
 				success: function (result) {
-					if (result.status == 'success') {
+					if (result.status === 'success') {
 						// Remove undo option, & remove user from table
 						OC.Notification.hide();
 						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
@@ -97,7 +97,7 @@ var UserList = {
 		}
 		$.each(this.availableGroups, function (i, group) {
 			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+			if (typeof subadminSelect !== 'undefined' && group !== 'admin') {
 				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
 			}
 		});
@@ -107,7 +107,7 @@ var UserList = {
 			tr.find('td.subadmins').append(subadminSelect);
 			UserList.applyMultiplySelect(subadminSelect);
 		}
-		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+		if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
 			var rm_img = $('<img class="svg action">').attr({
 				src: OC.imagePath('core', 'actions/delete')
 			});
@@ -115,11 +115,11 @@ var UserList = {
 				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
 				.append(rm_img);
 			tr.find('td.remove').append(rm_link);
-		} else if (OC.currentUser == username) {
+		} else if (OC.currentUser === username) {
 			tr.find('td.remove a').remove();
 		}
 		var quotaSelect = tr.find('select.quota-user');
-		if (quota == 'default') {
+		if (quota === 'default') {
 			quotaSelect.find('option').attr('selected', null);
 			quotaSelect.find('option').first().attr('selected', 'selected');
 			quotaSelect.data('previous', 'default');
@@ -148,7 +148,7 @@ var UserList = {
 			var tz = [], x = 0, y = -1, n = 0, i, j;
 
 			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
-			var m = (i == 46 || (i >=48 && i <= 57));
+			var m = (i === 46 || (i >=48 && i <= 57));
 			if (m !== n) {
 				tz[++y] = "";
 				n = m;
@@ -164,7 +164,7 @@ var UserList = {
 		for (x = 0; aa[x] && bb[x]; x++) {
 			if (aa[x] !== bb[x]) {
 			var c = Number(aa[x]), d = Number(bb[x]);
-			if (c == aa[x] && d == bb[x]) {
+			if (c === aa[x] && d === bb[x]) {
 				return c - d;
 			} else return (aa[x] > bb[x]) ? 1 : -1;
 			}
@@ -207,7 +207,7 @@ var UserList = {
 						return true;
 					}
 					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
-					if (index == 9) {
+					if (index === 9) {
 						$(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 							$(this).unbind(event);
 							UserList.update();
@@ -225,16 +225,16 @@ var UserList = {
 	applyMultiplySelect: function (element) {
 		var checked = [];
 		var user = element.attr('data-username');
-		if ($(element).attr('class') == 'groupsselect') {
+		if ($(element).attr('class') === 'groupsselect') {
 			if (element.data('userGroups')) {
 				checked = String(element.data('userGroups')).split(', ');
 			}
 			if (user) {
 				var checkHandeler = function (group) {
-					if (user == OC.currentUser && group == 'admin') {
+					if (user === OC.currentUser && group === 'admin') {
 						return false;
 					}
-					if (!isadmin && checked.length == 1 && checked[0] == group) {
+					if (!isadmin && checked.length === 1 && checked[0] === group) {
 						return false;
 					}
 					$.post(
@@ -280,12 +280,12 @@ var UserList = {
 				minWidth: 100
 			});
 		}
-		if ($(element).attr('class') == 'subadminsselect') {
+		if ($(element).attr('class') === 'subadminsselect') {
 			if (element.data('subadmin')) {
 				checked = String(element.data('subadmin')).split(', ');
 			}
 			var checkHandeler = function (group) {
-				if (group == 'admin') {
+				if (group === 'admin') {
 					return false;
 				}
 				$.post(
@@ -301,7 +301,7 @@ var UserList = {
 
 			var addSubAdmin = function (group) {
 				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length == 0) {
+					if ($(element).find('option[value="' + group + '"]').length === 0) {
 						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
 				})
@@ -349,7 +349,7 @@ $(document).ready(function () {
 		img.parent().children('span').replaceWith(input);
 		input.focus();
 		input.keypress(function (event) {
-			if (event.keyCode == 13) {
+			if (event.keyCode === 13) {
 				if ($(this).val().length > 0) {
 					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
 					$.post(
@@ -390,7 +390,7 @@ $(document).ready(function () {
 		img.parent().children('span').replaceWith(input);
 		input.focus();
 		input.keypress(function (event) {
-			if (event.keyCode == 13) {
+			if (event.keyCode === 13) {
 				if ($(this).val().length > 0) {
 					$.post(
 						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
@@ -423,13 +423,13 @@ $(document).ready(function () {
 		event.preventDefault();
 		var username = $('#newusername').val();
 		var password = $('#newuserpassword').val();
-		if ($.trim(username) == '') {
+		if ($.trim(username) === '') {
 			OC.dialogs.alert(
 				t('settings', 'A valid username must be provided'),
 				t('settings', 'Error creating user'));
 			return false;
 		}
-		if ($.trim(password) == '') {
+		if ($.trim(password) === '') {
 			OC.dialogs.alert(
 				t('settings', 'A valid password must be provided'),
 				t('settings', 'Error creating user'));
@@ -445,7 +445,7 @@ $(document).ready(function () {
 				groups: groups
 			},
 			function (result) {
-				if (result.status != 'success') {
+				if (result.status !== 'success') {
 					OC.dialogs.alert(result.data.message,
 						t('settings', 'Error creating user'));
 				} else {
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 55b48a4d606..ca75653bf85 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -98,6 +98,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducció",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
 "Login Name" => "Nom d'accés",
 "Create" => "Crea",
 "Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 433eb83462f..2c4cd545233 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -98,6 +98,7 @@
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s překladem",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index b48ffb10303..b32790f26e0 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -56,6 +56,8 @@
 "Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
 "Allow links" => "Erlaubt Links",
 "Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
+"Allow public uploads" => "Öffentliches Hochladen erlauben",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
 "Allow resharing" => "Erlaubt erneutes Teilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -98,6 +100,7 @@
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
 "Login Name" => "Loginname",
 "Create" => "Anlegen",
 "Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 5dea8e534e4..07003169c3f 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -56,6 +56,8 @@
 "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
+"Allow public uploads" => "Erlaube öffentliches hochladen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
 "Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -98,9 +100,10 @@
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
-"Admin Recovery Password" => "Admin-Paswort-Wiederherstellung",
+"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
 "Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 7ef677bc746..a9f7f1fd18b 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -98,6 +98,7 @@
 "Language" => "Γλώσσα",
 "Help translate" => "Βοηθήστε στη μετάφραση",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>",
 "Login Name" => "Όνομα Σύνδεσης",
 "Create" => "Δημιουργία",
 "Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 496ee1f5816..78c0c9ecbed 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -98,6 +98,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>",
 "Login Name" => "Nombre de Usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 30d0956a7e9..1e5b35989b5 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -56,6 +56,8 @@
 "Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
 "Allow links" => "Luba lingid",
 "Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
+"Allow public uploads" => "Luba avalikud üleslaadimised",
+"Allow users to enable others to upload into their publicly shared folders" => "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse ",
 "Allow resharing" => "Luba edasijagamine",
 "Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
 "Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4cf22c06a98..94751d916b1 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -98,6 +98,7 @@
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
 "Login Name" => "Sarrera Izena",
 "Create" => "Sortu",
 "Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index f81f7863704..282e619009a 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -72,6 +72,7 @@
 "Forum" => "Keskustelupalsta",
 "Bugtracker" => "Ohjelmistovirheiden jäljitys",
 "Commercial Support" => "Kaupallinen tuki",
+"Get the apps to sync your files" => "Aseta sovellukset synkronoimaan tiedostosi",
 "Show First Run Wizard again" => "Näytä ensimmäisen käyttökerran avustaja uudelleen",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
 "Password" => "Salasana",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 16b10158c8c..e871ad2a099 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -56,6 +56,8 @@
 "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
 "Allow links" => "Permitir ligazóns",
 "Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
+"Allow public uploads" => "Permitir os envíos públicos",
+"Allow users to enable others to upload into their publicly shared folders" => "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente",
 "Allow resharing" => "Permitir compartir",
 "Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles",
 "Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index fc7bd901420..995be0e9980 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -56,6 +56,8 @@
 "Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
 "Allow links" => "Consenti collegamenti",
 "Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
+"Allow public uploads" => "Consenti caricamenti pubblici",
+"Allow users to enable others to upload into their publicly shared folders" => "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise",
 "Allow resharing" => "Consenti la ri-condivisione",
 "Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri",
 "Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
@@ -98,7 +100,7 @@
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi File via WebDAV</a>",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>",
 "Login Name" => "Nome utente",
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index eb628a530eb..1e54dcb6926 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,32 +1,57 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
 "Authentication error" => "Autentikacijos klaida",
+"Group already exists" => "Grupė jau egzistuoja",
+"Unable to add group" => "Nepavyko pridėti grupės",
 "Could not enable app. " => "Nepavyksta įjungti aplikacijos.",
 "Email saved" => "El. paštas išsaugotas",
 "Invalid email" => "Netinkamas el. paštas",
+"Unable to delete group" => "Nepavyko ištrinti grupės",
+"Unable to delete user" => "Nepavyko ištrinti vartotojo",
 "Language changed" => "Kalba pakeista",
 "Invalid request" => "Klaidinga užklausa",
+"Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s",
+"Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s",
+"Couldn't update app." => "Nepavyko atnaujinti programos.",
+"Update to {appversion}" => "Atnaujinti iki {appversion}",
 "Disable" => "Išjungti",
 "Enable" => "Įjungti",
+"Please wait...." => "Prašome palaukti...",
 "Error" => "Klaida",
+"Updating...." => "Atnaujinama...",
+"Error while updating app" => "Įvyko klaida atnaujinant programą",
+"Updated" => "Atnaujinta",
 "Saving..." => "Saugoma...",
+"deleted" => "ištrinta",
 "undo" => "anuliuoti",
+"Unable to remove user" => "Nepavyko ištrinti vartotojo",
 "Groups" => "Grupės",
 "Delete" => "Ištrinti",
+"add group" => "pridėti grupę",
+"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
+"Error creating user" => "Klaida kuriant vartotoją",
+"A valid password must be provided" => "Slaptažodis turi būti tinkamas",
 "__language_name__" => "Kalba",
 "Security Warning" => "Saugumo pranešimas",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur.",
+"Module 'fileinfo' missing" => "Trūksta 'fileinfo' modulio",
 "Cron" => "Cron",
 "Sharing" => "Dalijimasis",
+"Allow links" => "Lesti nuorodas",
+"Allow resharing" => "Leisti dalintis",
+"Security" => "Saugumas",
 "Log" => "Žurnalas",
 "Log level" => "Žurnalo išsamumas",
 "More" => "Daugiau",
 "Less" => "Mažiau",
+"Version" => "Versija",
 "Add your App" => "Pridėti programėlę",
 "More Apps" => "Daugiau aplikacijų",
 "Select an App" => "Pasirinkite programą",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
 "Update" => "Atnaujinti",
+"Forum" => "Forumas",
+"Bugtracker" => "Klaidų sekimas",
 "Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
 "Password" => "Slaptažodis",
 "Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
@@ -39,7 +64,12 @@
 "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
+"WebDAV" => "WebDAV",
+"Login Name" => "Vartotojo vardas",
 "Create" => "Sukurti",
+"Unlimited" => "Neribota",
 "Other" => "Kita",
-"Username" => "Prisijungimo vardas"
+"Username" => "Prisijungimo vardas",
+"set new password" => "nustatyti naują slaptažodį",
+"Default" => "Numatytasis"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index f24aa50dbf3..408b8570fd2 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -98,6 +98,7 @@
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
 "Login Name" => "Logginn navn",
 "Create" => "Opprett",
 "Default Storage" => "Standard lager",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d51d1d3af5c..910e321b5f5 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -98,6 +98,7 @@
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>",
 "Login Name" => "Inlognaam",
 "Create" => "Creëer",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index b33aa5ba50c..a728c26689a 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -56,6 +56,8 @@
 "Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
 "Allow links" => "Permitir links",
 "Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
+"Allow public uploads" => "Permitir envio público",
+"Allow users to enable others to upload into their publicly shared folders" => "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente",
 "Allow resharing" => "Permitir recompartilhamento",
 "Allow users to share items shared with them again" => "Permitir que usuários compartilhem novamente itens compartilhados com eles",
 "Allow users to share with anyone" => "Permitir que usuários compartilhem com qualquer um",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 1390cd16be5..259b3032744 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -98,6 +98,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 567c2199901..7a9f341e4dd 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -98,6 +98,7 @@
 "Language" => "Språk",
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>",
 "Login Name" => "Inloggningsnamn",
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin återställningslösenord",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 30b637ab94d..0f33eb036cf 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -98,9 +98,11 @@
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Dosyalarınıza WebDAV üzerinen erişme </a> için  bu adresi kullanın",
 "Login Name" => "Giriş Adı",
 "Create" => "Oluştur",
 "Admin Recovery Password" => "Yönetici kurtarma parolası",
+"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için bir kurtarma paroalsı girin",
 "Default Storage" => "Varsayılan Depolama",
 "Unlimited" => "Limitsiz",
 "Other" => "Diğer",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 65a6938c8b6..789c93de23b 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -46,6 +46,7 @@
 "Locale not working" => "区域设置未运作",
 "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud 服务器不能把系统区域设置到 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的包来支持“%s”。",
 "Internet connection not working" => "互联网连接未运作",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "服务器没有可用的Internet连接。这意味着像挂载外部储存、更新提示和安装第三方插件等功能会失效。远程访问文件和发送邮件提醒也可能会失效。建议开启服务器的英特网网络。",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "在每个页面载入时执行一项任务",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php 已作为 webcron 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 cron.php。",
@@ -62,7 +63,9 @@
 "Security" => "安全",
 "Enforce HTTPS" => "强制HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "强制客户端通过加密连接与ownCloud连接",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "请先使用HTTPS访问本站以设置强制SSL的开关。",
 "Log" => "日志",
+"Log level" => "日志等级",
 "More" => "更多",
 "Less" => "更少",
 "Version" => "版本",
@@ -95,8 +98,11 @@
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>",
 "Login Name" => "登录名",
 "Create" => "新建",
+"Admin Recovery Password" => "管理员恢复密码",
+"Enter the recovery password in order to recover the users files during password change" => "在恢复密码的过程中请输入恢复密钥来恢复用户数据",
 "Default Storage" => "默认容量",
 "Unlimited" => "无限制",
 "Other" => "其他",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 8bdfc37b2ba..937347d5a14 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -13,8 +13,8 @@
 "Language changed" => "語言已變更",
 "Invalid request" => "無效請求",
 "Admins can't remove themself from the admin group" => "管理者帳號無法從管理者群組中移除",
-"Unable to add user to group %s" => "使用者加入群組%s錯誤",
-"Unable to remove user from group %s" => "使用者移出群組%s錯誤",
+"Unable to add user to group %s" => "使用者加入群組 %s 錯誤",
+"Unable to remove user from group %s" => "使用者移出群組 %s 錯誤",
 "Couldn't update app." => "無法更新應用程式",
 "Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "停用",
@@ -29,13 +29,13 @@
 "undo" => "復原",
 "Unable to remove user" => "無法刪除用戶",
 "Groups" => "群組",
-"Group Admin" => "群組 管理員",
+"Group Admin" => "群組管理員",
 "Delete" => "刪除",
 "add group" => "新增群組",
-"A valid username must be provided" => "一定要提供一個有效的用戶名",
-"Error creating user" => "創建用戶時出現錯誤",
+"A valid username must be provided" => "必須提供一個有效的用戶名",
+"Error creating user" => "建立用戶時出現錯誤",
 "A valid password must be provided" => "一定要提供一個有效的密碼",
-"__language_name__" => "__語言_名稱__",
+"__language_name__" => "__language_name__",
 "Security Warning" => "安全性警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
 "Setup Warning" => "設定警告",
@@ -45,9 +45,9 @@
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模組以取得最好的 mime-type 支援。",
 "Locale not working" => "語系無法運作",
 "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud 伺服器無法將系統語系設為 %s ，可能有一些檔名中的字元有問題，建議您安裝所有所需的套件以支援 %s 。",
-"Internet connection not working" => "去連線",
+"Internet connection not working" => "無網際網路存取",
 "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
-"Cron" => "定期執行",
+"Cron" => "Cron",
 "Execute one task with each page loaded" => "當頁面載入時，執行",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php 已經在 webcron 服務當中註冊，請每分鐘透過 HTTP 呼叫 ownCloud 根目錄當中的 cron.php 一次。",
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系統的 cron 服務，每分鐘執行一次 owncloud 資料夾中的 cron.php 。",
@@ -55,21 +55,21 @@
 "Enable Share API" => "啟用分享 API",
 "Allow apps to use the Share API" => "允許 apps 使用分享 API",
 "Allow links" => "允許連結",
-"Allow users to share items to the public with links" => "允許使用者透過公開的連結分享檔案",
+"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
 "Allow resharing" => "允許轉貼分享",
 "Allow users to share items shared with them again" => "允許使用者分享其他使用者分享給他的檔案",
 "Allow users to share with anyone" => "允許使用者與任何人分享檔案",
 "Allow users to only share with users in their groups" => "僅允許使用者在群組內分享",
 "Security" => "安全性",
 "Enforce HTTPS" => "強制啟用 HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "強制指定用戶端使用加密的連線連接到 ownCloud",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "強制用戶端使用加密的連線連接到 ownCloud",
 "Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "請使用 HTTPS 連線到 ownCloud，或是關閉強制使用 SSL 的選項。",
 "Log" => "紀錄",
 "Log level" => "紀錄層級",
 "More" => "更多",
-"Less" => "少",
+"Less" => "更少",
 "Version" => "版本",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社區</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">源代碼</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>許可證下發布。",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 許可證下發布。",
 "Add your App" => "添加你的 App",
 "More Apps" => "更多Apps",
 "Select an App" => "選擇一個應用程式",
@@ -98,9 +98,11 @@
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
 "Login Name" => "登入名稱",
 "Create" => "建立",
 "Admin Recovery Password" => "管理者復原密碼",
+"Enter the recovery password in order to recover the users files during password change" => "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
 "Default Storage" => "預設儲存區",
 "Unlimited" => "無限制",
 "Other" => "其他",
diff --git a/settings/personal.php b/settings/personal.php
index 2c0b4b9e33f..1e2e1cf6723 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -34,7 +34,7 @@ $languages=array();
 $commonlanguages = array();
 foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
-	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
+	if(substr($l->t('__language_name__'), 0, 1) !== '_') {//first check if the language name is in the translation file
 		$ln=array('code'=>$lang, 'name'=> (string)$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
 		$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4aad9b507e7..52127f6710d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -96,7 +96,7 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="ajax"
-					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
+					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_ajax">AJAX</label><br/>
@@ -106,7 +106,7 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="webcron"
-					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
+					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_webcron">Webcron</label><br/>
@@ -116,7 +116,7 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="cron"
-					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_cron">Cron</label><br/>
@@ -132,34 +132,44 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="shareAPIEnabled"><?php p($l->t('Enable Share API'));?></label><br/>
 				<em><?php p($l->t('Allow apps to use the Share API')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
-					   value="1" <?php if ($_['allowLinks'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
 				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
 			</td>
 		</tr>
+		<?php if (!\OCP\App::isEnabled('files_encryption')) { ?>
 		<tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+				<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
+				       value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
+				<em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em>
+			</td>
+		</tr>
+		<?php } ?>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-					   value="1" <?php if ($_['allowResharing'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
 				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-					   value="global" <?php if ($_['sharePolicy'] == 'global') print_unescaped('checked="checked"'); ?> />
+					   value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
 				<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
-					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') print_unescaped('checked="checked"'); ?> />
+					   value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> />
 				<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
 			</td>
 		</tr>
@@ -204,7 +214,7 @@ if (!$_['internetconnectionworking']) {
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 	<option value='<?php p($_['loglevel'])?>'><?php p($levels[$_['loglevel']])?></option>
 	<?php for ($i = 0; $i < 5; $i++):
-	if ($i != $_['loglevel']):?>
+	if ($i !== $_['loglevel']):?>
 		<option value='<?php p($i)?>'><?php p($levels[$i])?></option>
 		<?php endif;
 endfor;?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 147ad834a9c..ee5ebae708f 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -96,7 +96,7 @@ if($_['passwordChangeSupported']) {
 		<?php endforeach;?>
 		</select>
 		<?php if (OC_Util::getEditionString() === ''): ?>
-		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
+		<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
 			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
 		<?php endif; ?>
 	</fieldset>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 9fcc11ab89a..4ddef3ff1b5 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -43,12 +43,12 @@ $_['subadmingroups'] = array_flip($items);
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<option
-					<?php if($_['default_quota']=='none') print_unescaped('selected="selected"');?>
+					<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
 						value='none'>
 					<?php p($l->t('Unlimited'));?>
 				</option>
 				<?php foreach($_['quota_preset'] as $preset):?>
-				<?php if($preset!='default'):?>
+				<?php if($preset !== 'default'):?>
 				<option
 				<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
 					value='<?php p($preset);?>'>
@@ -132,12 +132,12 @@ $_['subadmingroups'] = array_flip($items);
 			<td class="quota">
 				<select class='quota-user'>
 					<option
-						<?php if($user['quota']=='default') print_unescaped('selected="selected"');?>
+						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
 							value='default'>
 						<?php p($l->t('Default'));?>
 					</option>
 					<option
-					<?php if($user['quota']=='none') print_unescaped('selected="selected"');?>
+					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
 							value='none'>
 						<?php p($l->t('Unlimited'));?>
 					</option>
diff --git a/settings/users.php b/settings/users.php
index e5c8a7aaa8d..ba79ae93b28 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -52,7 +52,7 @@ foreach($accessibleusers as $uid => $displayName) {
 		&& array_search($quota, array('none', 'default'))===false;
 
 	$name = $displayName;
-	if ( $displayName != $uid ) {
+	if ( $displayName !== $uid ) {
 		$name = $name . ' ('.$uid.')';
 	}