Merge branch 'master' of github.com:owncloud/core into vcategories_db

Fix conflicts: core/ajax/vcategories/add.php core/ajax/vcategories/delete.php
author: Thomas Tanghus <thomas@tanghus.net> 2012-10-30 06:53:49 +0100
committer: Thomas Tanghus <thomas@tanghus.net> 2012-10-30 06:53:49 +0100
commit: 5550cde03b34e86671652258e7f3bbc2a92b6111 (patch)
tree: ec6dd9ac1465a3ae4b9e4bbffdc1c87b78621b4b /core
parent: d9d8da0a5cee5fac1e5f24a321dd612f312af508 (diff)
parent: 3fdf239b478273155a68ec4ede8d4e4dd54b504d (diff)
download: nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.tar.gz
nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.zip
77 files changed, 438 insertions, 424 deletions
diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 1b43afa74fb..4f26dedc797 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -5,7 +5,6 @@
  * See the COPYING-README file.
  */
 
-require_once "../../lib/base.php";
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php
index 705330b2c3e..9d43a722852 100644
--- a/core/ajax/requesttoken.php
+++ b/core/ajax/requesttoken.php
@@ -26,7 +26,6 @@
  * @return json: success/error state indicator including a fresh request token
  * @author Christian Reiner
  */
-require_once '../../lib/base.php';
 
 // don't load apps or filesystem for this task
 $RUNTIME_NOAPPS    = true;
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 84e84be5acb..efe01dff886 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -18,10 +18,10 @@
 * You should have received a copy of the GNU Affero General Public
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
-require_once '../../lib/base.php';
 
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+OC_App::loadApps();
 
 if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSource'])) {
 	switch ($_POST['action']) {
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index 75679da2c04..e22cbad4708 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -21,9 +21,6 @@
 *
 */
 
-// Init owncloud
-require_once '../../lib/base.php';
-
 $app = $_POST["app"];
 
 $l = OC_L10N::get( $app );
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index e97612c28f2..23d00af70ab 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -14,8 +14,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index fd7b71be5d3..057c9bb0e94 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -15,8 +15,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index e7f2ff8ce5f..0387b17576c 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -15,7 +15,6 @@ function debug($msg) {
 	OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 
 $l = OC_L10N::get('core');
diff --git a/core/css/styles.css b/core/css/styles.css
index a6c10504070..95dceb50dec 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -112,10 +112,11 @@ label.infield { cursor: text !important; }
 #notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 #notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
 
-.action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
-.action { width: 16px; height: 16px; }
+tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
+tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
+tr .action { width: 16px; height: 16px; }
 .header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-.action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 
 table:not(.nostyle) tr { -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js
deleted file mode 100644
index f6a67b66ce1..00000000000
--- a/core/js/jquery.infieldlabel.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * In-Field Label jQuery Plugin
- * http://fuelyourcoding.com/scripts/infield.html
- *
- * Copyright (c) 2009 Doug Neiner
- * Dual licensed under the MIT and GPL licenses.
- * Uses the same license as jQuery, see:
- * http://docs.jquery.com/License
- *
- * @version 0.1
- */
-(function($){
-	
-    $.InFieldLabels = function(label,field, options){
-        // To avoid scope issues, use 'base' instead of 'this'
-        // to reference this class from internal events and functions.
-        var base = this;
-        
-        // Access to jQuery and DOM versions of each element
-        base.$label = $(label);
-        base.label = label;
-
- 		base.$field = $(field);
-		base.field = field;
-        
-		base.$label.data("InFieldLabels", base);
-		base.showing = true;
-        
-        base.init = function(){
-			// Merge supplied options with default options
-            base.options = $.extend({},$.InFieldLabels.defaultOptions, options);
-
-			// Check if the field is already filled in
-			if(base.$field.val() != ""){
-				base.$label.hide();
-				base.showing = false;
-			};
-			
-			base.$field.focus(function(){
-				base.fadeOnFocus();
-			}).blur(function(){
-				base.checkForEmpty(true);
-			}).bind('keydown.infieldlabel',function(e){
-				// Use of a namespace (.infieldlabel) allows us to
-				// unbind just this method later
-				base.hideOnChange(e);
-			}).change(function(e){
-				base.checkForEmpty();
-			}).bind('onPropertyChange', function(){
-				base.checkForEmpty();
-			});
-        };
-
-		// If the label is currently showing
-		// then fade it down to the amount
-		// specified in the settings
-		base.fadeOnFocus = function(){
-			if(base.showing){
-				base.setOpacity(base.options.fadeOpacity);
-			};
-		};
-		
-		base.setOpacity = function(opacity){
-			base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration);
-			base.showing = (opacity > 0.0);
-		};
-		
-		// Checks for empty as a fail safe
-		// set blur to true when passing from
-		// the blur event
-		base.checkForEmpty = function(blur){
-			if(base.$field.val() == ""){
-				base.prepForShow();
-				base.setOpacity( blur ? 1.0 : base.options.fadeOpacity );
-			} else {
-				base.setOpacity(0.0);
-			};
-		};
-		
-		base.prepForShow = function(e){
-			if(!base.showing) {
-				// Prepare for a animate in...
-				base.$label.css({opacity: 0.0}).show();
-				
-				// Reattach the keydown event
-				base.$field.bind('keydown.infieldlabel',function(e){
-					base.hideOnChange(e);
-				});
-			};
-		};
-
-		base.hideOnChange = function(e){
-			if(
-				(e.keyCode == 16) || // Skip Shift
-				(e.keyCode == 9) // Skip Tab
-			  ) return; 
-			
-			if(base.showing){
-				base.$label.hide();
-				base.showing = false;
-			};
-			
-			// Remove keydown event to save on CPU processing
-			base.$field.unbind('keydown.infieldlabel');
-		};
-      
-		// Run the initialization method
-        base.init();
-    };
-	
-    $.InFieldLabels.defaultOptions = {
-        fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be
-		fadeDuration: 300 // How long should it take to animate from 1.0 opacity to the fadeOpacity
-    };
-	
-
-    $.fn.inFieldLabels = function(options){
-        return this.each(function(){
-			// Find input or textarea based on for= attribute
-			// The for attribute on the label must contain the ID
-			// of the input or textarea element
-			var for_attr = $(this).attr('for');
-			if( !for_attr ) return; // Nothing to attach, since the for field wasn't used
-			
-			
-			// Find the referenced input or textarea element
-			var $field = $(
-				"input#" + for_attr + "[type='text']," + 
-				"input#" + for_attr + "[type='password']," + 
-				"textarea#" + for_attr
-				);
-				
-			if( $field.length == 0) return; // Again, nothing to attach
-			
-			// Only create object for input[text], input[password], or textarea
-            (new $.InFieldLabels(this, $field[0], options));
-        });
-    };
-	
-})(jQuery);
-\ No newline at end of file
diff --git a/core/js/jquery.infieldlabel.min.js b/core/js/jquery.infieldlabel.min.js
index 8f0ab9f7c5e..36f6b8f1271 100644
--- a/core/js/jquery.infieldlabel.min.js
+++ b/core/js/jquery.infieldlabel.min.js
@@ -1,12 +1,12 @@
 /*
- * In-Field Label jQuery Plugin
- * http://fuelyourcoding.com/scripts/infield.html
- *
- * Copyright (c) 2009 Doug Neiner
- * Dual licensed under the MIT and GPL licenses.
- * Uses the same license as jQuery, see:
- * http://docs.jquery.com/License
- *
- * @version 0.1
- */
-(function($){$.InFieldLabels=function(b,c,d){var f=this;f.$label=$(b);f.label=b;f.$field=$(c);f.field=c;f.$label.data("InFieldLabels",f);f.showing=true;f.init=function(){f.options=$.extend({},$.InFieldLabels.defaultOptions,d);if(f.$field.val()!=""){f.$label.hide();f.showing=false};f.$field.focus(function(){f.fadeOnFocus()}).blur(function(){f.checkForEmpty(true)}).bind('keydown.infieldlabel',function(e){f.hideOnChange(e)}).change(function(e){f.checkForEmpty()}).bind('onPropertyChange',function(){f.checkForEmpty()})};f.fadeOnFocus=function(){if(f.showing){f.setOpacity(f.options.fadeOpacity)}};f.setOpacity=function(a){f.$label.stop().animate({opacity:a},f.options.fadeDuration);f.showing=(a>0.0)};f.checkForEmpty=function(a){if(f.$field.val()==""){f.prepForShow();f.setOpacity(a?1.0:f.options.fadeOpacity)}else{f.setOpacity(0.0)}};f.prepForShow=function(e){if(!f.showing){f.$label.css({opacity:0.0}).show();f.$field.bind('keydown.infieldlabel',function(e){f.hideOnChange(e)})}};f.hideOnChange=function(e){if((e.keyCode==16)||(e.keyCode==9))return;if(f.showing){f.$label.hide();f.showing=false};f.$field.unbind('keydown.infieldlabel')};f.init()};$.InFieldLabels.defaultOptions={fadeOpacity:0.5,fadeDuration:300};$.fn.inFieldLabels=function(c){return this.each(function(){var a=$(this).attr('for');if(!a)return;var b=$("input#"+a+"[type='text'],"+"input#"+a+"[type='password'],"+"textarea#"+a);if(b.length==0)return;(new $.InFieldLabels(this,b[0],c))})}})(jQuery);
-\ No newline at end of file
+ In-Field Label jQuery Plugin
+ http://fuelyourcoding.com/scripts/infield.html
+
+ Copyright (c) 2009-2010 Doug Neiner
+ Dual licensed under the MIT and GPL licenses.
+ Uses the same license as jQuery, see:
+ http://docs.jquery.com/License
+
+ @version 0.1.5
+*/
+(function($){$.InFieldLabels=function(label,field,options){var base=this;base.$label=$(label);base.label=label;base.$field=$(field);base.field=field;base.$label.data("InFieldLabels",base);base.showing=true;base.init=function(){base.options=$.extend({},$.InFieldLabels.defaultOptions,options);setTimeout(function(){if(base.$field.val()!==""){base.$label.hide();base.showing=false}},200);base.$field.focus(function(){base.fadeOnFocus()}).blur(function(){base.checkForEmpty(true)}).bind('keydown.infieldlabel',function(e){base.hideOnChange(e)}).bind('paste',function(e){base.setOpacity(0.0)}).change(function(e){base.checkForEmpty()}).bind('onPropertyChange',function(){base.checkForEmpty()}).bind('keyup.infieldlabel',function(){base.checkForEmpty()})};base.fadeOnFocus=function(){if(base.showing){base.setOpacity(base.options.fadeOpacity)}};base.setOpacity=function(opacity){base.$label.stop().animate({opacity:opacity},base.options.fadeDuration);base.showing=(opacity>0.0)};base.checkForEmpty=function(blur){if(base.$field.val()===""){base.prepForShow();base.setOpacity(blur?1.0:base.options.fadeOpacity)}else{base.setOpacity(0.0)}};base.prepForShow=function(e){if(!base.showing){base.$label.css({opacity:0.0}).show();base.$field.bind('keydown.infieldlabel',function(e){base.hideOnChange(e)})}};base.hideOnChange=function(e){if((e.keyCode===16)||(e.keyCode===9)){return}if(base.showing){base.$label.hide();base.showing=false}base.$field.unbind('keydown.infieldlabel')};base.init()};$.InFieldLabels.defaultOptions={fadeOpacity:0.5,fadeDuration:300};$.fn.inFieldLabels=function(options){return this.each(function(){var for_attr=$(this).attr('for'),$field;if(!for_attr){return}$field=$("input#"+for_attr+"[type='text'],"+"input#"+for_attr+"[type='search'],"+"input#"+for_attr+"[type='tel'],"+"input#"+for_attr+"[type='url'],"+"input#"+for_attr+"[type='email'],"+"input#"+for_attr+"[type='password'],"+"textarea#"+for_attr);if($field.length===0){return}(new $.InFieldLabels(this,$field[0],options))})}}(jQuery));
diff --git a/core/js/js.js b/core/js/js.js
index c5e32f3c278..2073fc4d4b7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -62,7 +62,7 @@ function escapeHTML(s) {
 * @return string
 */
 function fileDownloadPath(dir, file) {
-	return OC.filePath('files', 'ajax', 'download.php')+'&files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
+	return OC.filePath('files', 'ajax', 'download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 }
 
 var OC={
@@ -95,9 +95,9 @@ var OC={
 		var isCore=OC.coreApps.indexOf(app)!==-1,
 			link=OC.webroot;
 		if((file.substring(file.length-3) === 'php' || file.substring(file.length-3) === 'css') && !isCore){
-			link+='/?app=' + app;
+			link+='/index.php/apps/' + app;
 			if (file != 'index.php') {
-				link+='&getfile=';
+				link+='/';
 				if(type){
 					link+=encodeURI(type + '/');
 				}
@@ -113,7 +113,12 @@ var OC={
 			}
 			link+=file;
 		}else{
-			link+='/';
+			if ((app == 'settings' || app == 'core' || app == 'search') && type == 'ajax') {
+				link+='/index.php/';
+			}
+			else {
+				link+='/';
+			}
 			if(!isCore){
 				link+='apps/';
 			}
diff --git a/core/js/router.js b/core/js/router.js
new file mode 100644
index 00000000000..8b66f5a05c5
--- /dev/null
+++ b/core/js/router.js
@@ -0,0 +1,73 @@
+OC.router_base_url = OC.webroot + '/index.php/',
+OC.Router = {
+	routes_request: $.ajax(OC.router_base_url + 'core/routes.json', {
+		dataType: 'json',
+		success: function(jsondata) {
+			if (jsondata.status == 'success') {
+				OC.Router.routes = jsondata.data;
+			}
+		}
+	}),
+	generate:function(name, opt_params) {
+		if (!('routes' in this)) {
+			if(this.routes_request.state() != 'resolved') {
+				alert('wait');// wait
+			}
+		}
+		if (!(name in this.routes)) {
+			throw new Error('The route "' + name + '" does not exist.');
+		}
+		var route = this.routes[name];
+		var params = opt_params || {};
+		var unusedParams = $.extend(true, {}, params);
+		var url = '';
+		var optional = true;
+		$(route.tokens).each(function(i, token) {
+			if ('text' === token[0]) {
+			    url = token[1] + url;
+			    optional = false;
+
+			    return;
+			}
+
+			if ('variable' === token[0]) {
+			    if (false === optional || !(token[3] in route.defaults)
+				    || ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) {
+				var value;
+				if (token[3] in params) {
+				    value = params[token[3]];
+				    delete unusedParams[token[3]];
+				} else if (token[3] in route.defaults) {
+				    value = route.defaults[token[3]];
+				} else if (optional) {
+				    return;
+				} else {
+				    throw new Error('The route "' + name + '" requires the parameter "' + token[3] + '".');
+				}
+
+				var empty = true === value || false === value || '' === value;
+
+				if (!empty || !optional) {
+				    url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url;
+				}
+
+				optional = false;
+			    }
+
+			    return;
+			}
+
+			throw new Error('The token type "' + token[0] + '" is not supported.');
+		});
+		if (url === '') {
+			url = '/';
+		}
+
+		unusedParams = $.param(unusedParams);
+		if (unusedParams.length > 0) {
+			url += '?'+unusedParams;
+		}
+
+		return OC.router_base_url + url;
+	}
+};
diff --git a/core/js/share.js b/core/js/share.js
index 7d8799edf51..73c74a7cb6d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -10,17 +10,38 @@ OC.Share={
 		// Load all share icons
 		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
 			if (result && result.status === 'success') {
-				$.each(result.data, function(item, hasPrivateLink) {
-					// Private links override shared in terms of icon display
+				$.each(result.data, function(item, hasLink) {
+					OC.Share.statuses[item] = hasLink;
+					// Links override shared in terms of icon display
+					if (hasLink) {
+						var image = OC.imagePath('core', 'actions/public');
+					} else {
+						var image = OC.imagePath('core', 'actions/shared');
+					}
 					if (itemType != 'file' && itemType != 'folder') {
-						if (hasPrivateLink) {
-							var image = OC.imagePath('core', 'actions/public');
-						} else {
-							var image = OC.imagePath('core', 'actions/shared');
-						}
 						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
+					} else {
+						var file = $('tr').filterAttr('data-file', OC.basename(item));
+						if (file.length > 0) {
+							$(file).find('.fileactions .action').filterAttr('data-action', 'Share').find('img').attr('src', image);
+						}
+						var dir = $('#dir').val();
+						if (dir.length > 1) {
+							var last = '';
+							var path = dir;
+							// Search for possible parent folders that are shared
+							while (path != last) {
+								if (path == item) {
+									var img = $('.fileactions .action').filterAttr('data-action', 'Share').find('img');
+									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+										img.attr('src', image);
+									}
+								}
+								last = path;
+								path = OC.Share.dirname(path);
+							}
+						}
 					}
-					OC.Share.statuses[item] = hasPrivateLink;
 				});
 			}
 		});
@@ -483,15 +504,14 @@ $(document).ready(function() {
 		$('#linkPass').toggle('blind');
 	});
 
-	$('#linkPassText').live('keyup', function(event) {
-		if (event.keyCode == 13) {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
-				$('#linkPassText').val('');
-				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
-			});
-		}
+	$('#linkPassText').live('focusout', function(event) {
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+			$('#linkPassText').val('');
+			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+		});
+		$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 	});
 
 	$('#expirationCheckbox').live('click', function() {
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index b9240664098..c7cbacbf644 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -4,8 +4,6 @@
 "Password" => "كلمة السر",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-"Requested" => "تم طلب",
-"Login failed!" => "محاولة دخول فاشلة!",
 "Username" => "إسم المستخدم",
 "Request reset" => "طلب تعديل",
 "Your password was reset" => "لقد تم تعديل كلمة السر",
@@ -30,7 +28,6 @@
 "Database name" => "إسم قاعدة البيانات",
 "Database host" => "خادم قاعدة البيانات",
 "Finish setup" => "انهاء التعديلات",
-"web services under your control" => "خدمات الوب تحت تصرفك",
 "Sunday" => "الاحد",
 "Monday" => "الأثنين",
 "Tuesday" => "الثلاثاء",
@@ -50,6 +47,7 @@
 "October" => "تشرين الاول",
 "November" => "تشرين الثاني",
 "December" => "كانون الاول",
+"web services under your control" => "خدمات الوب تحت تصرفك",
 "Log out" => "الخروج",
 "Lost your password?" => "هل نسيت كلمة السر؟",
 "remember" => "تذكر",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 5d8ed05181b..b63062e8d31 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -9,8 +9,6 @@
 "Error" => "Грешка",
 "Password" => "Парола",
 "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
-"Requested" => "Заявено",
-"Login failed!" => "Входа пропадна!",
 "Username" => "Потребител",
 "Request reset" => "Нулиране на заявка",
 "Your password was reset" => "Вашата парола е нулирана",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 2445e378ab2..5c7552a4e87 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
 "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
-"Requested" => "Sol·licitat",
-"Login failed!" => "No s'ha pogut iniciar la sessió",
+"Reset email send." => "S'ha enviat el correu reinicialització",
+"Request failed!" => "El requeriment ha fallat!",
 "Username" => "Nom d'usuari",
 "Request reset" => "Sol·licita reinicialització",
 "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
@@ -70,7 +70,6 @@
 "Database tablespace" => "Espai de taula de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuració",
-"web services under your control" => "controleu els vostres serveis web",
 "Sunday" => "Diumenge",
 "Monday" => "Dilluns",
 "Tuesday" => "Dimarts",
@@ -90,6 +89,7 @@
 "October" => "Octubre",
 "November" => "Novembre",
 "December" => "Desembre",
+"web services under your control" => "controleu els vostres serveis web",
 "Log out" => "Surt",
 "Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
 "If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 4f882b30a2e..f6d2b3977b1 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "Obnovení hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
 "You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
-"Requested" => "Požadováno",
-"Login failed!" => "Přihlášení selhalo.",
+"Reset email send." => "Obnovovací e-mail odeslán.",
+"Request failed!" => "Požadavek selhal.",
 "Username" => "Uživatelské jméno",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",
@@ -70,7 +70,6 @@
 "Database tablespace" => "Tabulkový prostor databáze",
 "Database host" => "Hostitel databáze",
 "Finish setup" => "Dokončit nastavení",
-"web services under your control" => "webové služby pod Vaší kontrolou",
 "Sunday" => "Neděle",
 "Monday" => "Pondělí",
 "Tuesday" => "Úterý",
@@ -90,6 +89,7 @@
 "October" => "Říjen",
 "November" => "Listopad",
 "December" => "Prosinec",
+"web services under your control" => "webové služby pod Vaší kontrolou",
 "Log out" => "Odhlásit se",
 "Automatic logon rejected!" => "Automatické přihlášení odmítnuto.",
 "If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index cb2bc9df063..2614d376894 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
-"Requested" => "Forespugt",
-"Login failed!" => "Login fejlede!",
 "Username" => "Brugernavn",
 "Request reset" => "Anmod om nulstilling",
 "Your password was reset" => "Dit kodeord blev nulstillet",
@@ -70,7 +68,6 @@
 "Database tablespace" => "Database tabelplads",
 "Database host" => "Databasehost",
 "Finish setup" => "Afslut opsætning",
-"web services under your control" => "Webtjenester under din kontrol",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
 "Tuesday" => "Tirsdag",
@@ -90,6 +87,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "December",
+"web services under your control" => "Webtjenester under din kontrol",
 "Log out" => "Log ud",
 "Automatic logon rejected!" => "Automatisk login afvist!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 251cc4baf0a..3c92f028581 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
-"Requested" => "Angefragt",
-"Login failed!" => "Login fehlgeschlagen!",
 "Username" => "Benutzername",
 "Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
@@ -70,7 +68,6 @@
 "Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Sunday" => "Sonntag",
 "Monday" => "Montag",
 "Tuesday" => "Dienstag",
@@ -90,6 +87,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Dezember",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Log out" => "Abmelden",
 "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn du Dein Passwort nicht änderst, könnte dein Account kompromitiert werden!",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 78f8269e812..32ce4f0396e 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -8,7 +8,7 @@
 "No" => "Nein",
 "Yes" => "Ja",
 "Ok" => "OK",
-"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
+"No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.",
 "Error" => "Fehler",
 "Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-"Requested" => "Angefragt",
-"Login failed!" => "Login fehlgeschlagen!",
+"Reset email send." => "E-Mail zum Zurücksetzen des Passwort gesendet.",
+"Request failed!" => "Die Anforderung schlug fehl!",
 "Username" => "Benutzername",
 "Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
@@ -70,7 +70,6 @@
 "Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Sunday" => "Sonntag",
 "Monday" => "Montag",
 "Tuesday" => "Dienstag",
@@ -90,6 +89,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Dezember",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Log out" => "Abmelden",
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert.",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht kürzlich geändert haben könnte Ihr Konto gefährdet sein.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 67f4c4ba88c..e387d19bef1 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "Επαναφορά κωδικού ownCloud",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-"Requested" => "Ζητήθησαν",
-"Login failed!" => "Η σύνδεση απέτυχε!",
+"Reset email send." => "Η επαναφορά του email στάλθηκε.",
+"Request failed!" => "Η αίτηση απέτυχε!",
 "Username" => "Όνομα Χρήστη",
 "Request reset" => "Επαναφορά αίτησης",
 "Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε",
@@ -68,7 +68,6 @@
 "Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
-"web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
 "Sunday" => "Κυριακή",
 "Monday" => "Δευτέρα",
 "Tuesday" => "Τρίτη",
@@ -88,6 +87,7 @@
 "October" => "Οκτώβριος",
 "November" => "Νοέμβριος",
 "December" => "Δεκέμβριος",
+"web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
 "Log out" => "Αποσύνδεση",
 "Automatic logon rejected!" => "Απορρίφθηκε η αυτόματη σύνδεση!",
 "Please change your password to secure your account again." => "Παρακαλώ αλλάξτε τον κωδικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας.",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index e01f46cec62..e98f6c1616f 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-"Requested" => "Petita",
-"Login failed!" => "Ensaluto malsukcesis!",
 "Username" => "Uzantonomo",
 "Request reset" => "Peti rekomencigon",
 "Your password was reset" => "Via pasvorto rekomencis",
@@ -64,7 +62,6 @@
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
-"web services under your control" => "TTT-servoj sub via kontrolo",
 "Sunday" => "dimanĉo",
 "Monday" => "lundo",
 "Tuesday" => "mardo",
@@ -84,6 +81,7 @@
 "October" => "Oktobro",
 "November" => "Novembro",
 "December" => "Decembro",
+"web services under your control" => "TTT-servoj sub via kontrolo",
 "Log out" => "Elsaluti",
 "Lost your password?" => "Ĉu vi perdis vian pasvorton?",
 "remember" => "memori",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 173ad5de879..c9b58ef7cd1 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "Reiniciar contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
-"Requested" => "Pedido",
-"Login failed!" => "¡Fallo al iniciar sesión!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña se ha restablecido",
@@ -70,7 +68,6 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
-"web services under your control" => "servicios web bajo tu control",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
@@ -90,6 +87,7 @@
 "October" => "Octubre",
 "November" => "Noviembre",
 "December" => "Diciembre",
+"web services under your control" => "servicios web bajo tu control",
 "Log out" => "Salir",
 "Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 7f6d99ed35c..622fc65a770 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -13,6 +13,8 @@
 "Error while sharing" => "Error al compartir",
 "Error while unsharing" => "Error en el procedimiento de ",
 "Error while changing permissions" => "Error al cambiar permisos",
+"Shared with you and the group {group} by {owner}" => "Compartido con vos y el grupo {group} por {owner}",
+"Shared with you by {owner}" => "Compartido con vos por {owner}",
 "Share with" => "Compartir con",
 "Share with link" => "Compartir con link",
 "Password protect" => "Proteger con contraseña ",
@@ -22,6 +24,7 @@
 "Share via email:" => "compartido a través de e-mail:",
 "No people found" => "No se encontraron usuarios",
 "Resharing is not allowed" => "No se permite volver a compartir",
+"Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Remover compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
@@ -35,8 +38,6 @@
 "ownCloud password reset" => "Restablecer contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
-"Requested" => "Pedido",
-"Login failed!" => "¡Error al iniciar sesión!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña fue restablecida",
@@ -67,7 +68,6 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
-"web services under your control" => "servicios web sobre los que tenés control",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
@@ -87,6 +87,7 @@
 "October" => "Octubre",
 "November" => "Noviembre",
 "December" => "Diciembre",
+"web services under your control" => "servicios web sobre los que tenés control",
 "Log out" => "Cerrar la sesión",
 "Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 14c5c66bea3..7554de8b6f2 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -13,6 +13,7 @@
 "Error while sharing" => "Viga jagamisel",
 "Error while unsharing" => "Viga jagamise lõpetamisel",
 "Error while changing permissions" => "Viga õiguste muutmisel",
+"Shared with you by {owner}" => "Sinuga jagas {owner}",
 "Share with" => "Jaga",
 "Share with link" => "Jaga lingiga",
 "Password protect" => "Parooliga kaitstud",
@@ -21,6 +22,7 @@
 "Expiration date" => "Aegumise kuupäev",
 "Share via email:" => "Jaga e-postiga:",
 "No people found" => "Ühtegi inimest ei leitud",
+"Resharing is not allowed" => "Edasijagamine pole lubatud",
 "Unshare" => "Lõpeta jagamine",
 "can edit" => "saab muuta",
 "access control" => "ligipääsukontroll",
@@ -29,11 +31,13 @@
 "delete" => "kustuta",
 "share" => "jaga",
 "Password protected" => "Parooliga kaitstud",
+"Error unsetting expiration date" => "Viga aegumise kuupäeva eemaldamisel",
+"Error setting expiration date" => "Viga aegumise kuupäeva määramisel",
 "ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
-"Requested" => "Kohustuslik",
-"Login failed!" => "Sisselogimine ebaõnnestus!",
+"Reset email send." => "Taastamise e-kiri on saadetud.",
+"Request failed!" => "Päring ebaõnnestus!",
 "Username" => "Kasutajanimi",
 "Request reset" => "Päringu taastamine",
 "Your password was reset" => "Sinu parool on taastatud",
@@ -61,7 +65,6 @@
 "Database tablespace" => "Andmebaasi tabeliruum",
 "Database host" => "Andmebaasi host",
 "Finish setup" => "Lõpeta seadistamine",
-"web services under your control" => "veebiteenused sinu kontrolli all",
 "Sunday" => "Pühapäev",
 "Monday" => "Esmaspäev",
 "Tuesday" => "Teisipäev",
@@ -81,7 +84,11 @@
 "October" => "Oktoober",
 "November" => "November",
 "December" => "Detsember",
+"web services under your control" => "veebiteenused sinu kontrolli all",
 "Log out" => "Logi välja",
+"Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
+"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!",
+"Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 6afe5b4febd..f370ee315d8 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-"Requested" => "Eskatuta",
-"Login failed!" => "Saio hasierak huts egin du!",
 "Username" => "Erabiltzaile izena",
 "Request reset" => "Eskaera berrezarri da",
 "Your password was reset" => "Zure pasahitza berrezarri da",
@@ -65,7 +63,6 @@
 "Database tablespace" => "Datu basearen taula-lekua",
 "Database host" => "Datubasearen hostalaria",
 "Finish setup" => "Bukatu konfigurazioa",
-"web services under your control" => "web zerbitzuak zure kontrolpean",
 "Sunday" => "Igandea",
 "Monday" => "Astelehena",
 "Tuesday" => "Asteartea",
@@ -85,6 +82,7 @@
 "October" => "Urria",
 "November" => "Azaroa",
 "December" => "Abendua",
+"web services under your control" => "web zerbitzuak zure kontrolpean",
 "Log out" => "Saioa bukatu",
 "Lost your password?" => "Galdu duzu pasahitza?",
 "remember" => "gogoratu",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 23e58d2efb0..bf548d2d780 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -14,8 +14,6 @@
 "ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
 "You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-"Requested" => "درخواست",
-"Login failed!" => "ورود ناموفق بود",
 "Username" => "شناسه",
 "Request reset" => "درخواست دوباره سازی",
 "Your password was reset" => "گذرواژه شما تغییرکرد",
@@ -42,7 +40,6 @@
 "Database name" => "نام پایگاه داده",
 "Database host" => "هاست پایگاه داده",
 "Finish setup" => "اتمام نصب",
-"web services under your control" => "سرویس وب تحت کنترل شما",
 "Sunday" => "یکشنبه",
 "Monday" => "دوشنبه",
 "Tuesday" => "سه شنبه",
@@ -62,6 +59,7 @@
 "October" => "اکتبر",
 "November" => "نوامبر",
 "December" => "دسامبر",
+"web services under your control" => "سرویس وب تحت کنترل شما",
 "Log out" => "خروج",
 "Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟",
 "remember" => "بیاد آوری",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 0c8e7896db7..caee9dd53d9 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -34,8 +34,7 @@
 "ownCloud password reset" => "ownCloud-salasanan nollaus",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
 "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
-"Requested" => "Tilattu",
-"Login failed!" => "Kirjautuminen epäonnistui!",
+"Request failed!" => "Pyyntö epäonnistui!",
 "Username" => "Käyttäjätunnus",
 "Request reset" => "Tilaus lähetetty",
 "Your password was reset" => "Salasanasi nollattiin",
@@ -64,7 +63,6 @@
 "Database tablespace" => "Tietokannan taulukkotila",
 "Database host" => "Tietokantapalvelin",
 "Finish setup" => "Viimeistele asennus",
-"web services under your control" => "verkkopalvelut hallinnassasi",
 "Sunday" => "Sunnuntai",
 "Monday" => "Maanantai",
 "Tuesday" => "Tiistai",
@@ -84,12 +82,18 @@
 "October" => "Lokakuu",
 "November" => "Marraskuu",
 "December" => "Joulukuu",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "Log out" => "Kirjaudu ulos",
+"Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
+"If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
+"Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.",
 "Lost your password?" => "Unohditko salasanasi?",
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
 "You are logged out." => "Olet kirjautunut ulos.",
 "prev" => "edellinen",
 "next" => "seuraava",
-"Security Warning!" => "Turvallisuusvaroitus!"
+"Security Warning!" => "Turvallisuusvaroitus!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vahvista salasanasi. <br/>Turvallisuussyistä sinulta saatetaan ajoittain kysyä salasanasi uudelleen.",
+"Verify" => "Vahvista"
 );
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index c9f2f57852e..597f58172d9 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
-"Requested" => "Demande envoyée",
-"Login failed!" => "Nom d'utilisateur ou e-mail invalide",
 "Username" => "Nom d'utilisateur",
 "Request reset" => "Demander la réinitialisation",
 "Your password was reset" => "Votre mot de passe a été réinitialisé",
@@ -67,7 +65,6 @@
 "Database tablespace" => "Tablespaces de la base de données",
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
-"web services under your control" => "services web sous votre contrôle",
 "Sunday" => "Dimanche",
 "Monday" => "Lundi",
 "Tuesday" => "Mardi",
@@ -87,6 +84,7 @@
 "October" => "octobre",
 "November" => "novembre",
 "December" => "décembre",
+"web services under your control" => "services web sous votre contrôle",
 "Log out" => "Se déconnecter",
 "Automatic logon rejected!" => "Connexion automatique rejetée !",
 "If you did not change your password recently, your account may be compromised!" => "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 1b35cd2fd8d..97f0ec9862c 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -14,8 +14,6 @@
 "ownCloud password reset" => "Restablecer contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal",
-"Requested" => "Solicitado",
-"Login failed!" => "Fallou a conexión.",
 "Username" => "Nome de usuario",
 "Request reset" => "Petición de restablecemento",
 "Your password was reset" => "O contrasinal foi restablecido",
@@ -42,7 +40,6 @@
 "Database name" => "Nome da base de datos",
 "Database host" => "Servidor da base de datos",
 "Finish setup" => "Rematar configuración",
-"web services under your control" => "servizos web baixo o seu control",
 "Sunday" => "Domingo",
 "Monday" => "Luns",
 "Tuesday" => "Martes",
@@ -62,6 +59,7 @@
 "October" => "Outubro",
 "November" => "Novembro",
 "December" => "Nadal",
+"web services under your control" => "servizos web baixo o seu control",
 "Log out" => "Desconectar",
 "Lost your password?" => "Perdeu o contrasinal?",
 "remember" => "lembrar",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 2038191142e..f0ba4198d6b 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -14,8 +14,6 @@
 "ownCloud password reset" => "איפוס הססמה של ownCloud",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-"Requested" => "נדרש",
-"Login failed!" => "הכניסה נכשלה!",
 "Username" => "שם משתמש",
 "Request reset" => "בקשת איפוס",
 "Your password was reset" => "הססמה שלך אופסה",
@@ -42,7 +40,6 @@
 "Database tablespace" => "מרחב הכתובות של מסד הנתונים",
 "Database host" => "שרת בסיס נתונים",
 "Finish setup" => "סיום התקנה",
-"web services under your control" => "שירותי רשת בשליטתך",
 "Sunday" => "יום ראשון",
 "Monday" => "יום שני",
 "Tuesday" => "יום שלישי",
@@ -62,6 +59,7 @@
 "October" => "אוקטובר",
 "November" => "נובמבר",
 "December" => "דצמבר",
+"web services under your control" => "שירותי רשת בשליטתך",
 "Log out" => "התנתקות",
 "Lost your password?" => "שכחת את ססמתך?",
 "remember" => "שמירת הססמה",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index f9a4268dde9..d1d6e9cfc65 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "ownCloud resetiranje lozinke",
 "Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
-"Requested" => "Zahtijevano",
-"Login failed!" => "Prijava nije uspjela!",
 "Username" => "Korisničko ime",
 "Request reset" => "Zahtjev za resetiranjem",
 "Your password was reset" => "Vaša lozinka je resetirana",
@@ -63,7 +61,6 @@
 "Database tablespace" => "Database tablespace",
 "Database host" => "Poslužitelj baze podataka",
 "Finish setup" => "Završi postavljanje",
-"web services under your control" => "web usluge pod vašom kontrolom",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljak",
 "Tuesday" => "utorak",
@@ -83,6 +80,7 @@
 "October" => "Listopad",
 "November" => "Studeni",
 "December" => "Prosinac",
+"web services under your control" => "web usluge pod vašom kontrolom",
 "Log out" => "Odjava",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "zapamtiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 377f57bc321..7c3ce250cf1 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -15,8 +15,6 @@
 "ownCloud password reset" => "ownCloud jelszó-visszaállítás",
 "Use the following link to reset your password: {link}" => "Használja az alábbi linket a jelszó-visszaállításhoz: {link}",
 "You will receive a link to reset your password via Email." => "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról.",
-"Requested" => "Kérés elküldve",
-"Login failed!" => "Belépés sikertelen!",
 "Username" => "Felhasználónév",
 "Request reset" => "Visszaállítás igénylése",
 "Your password was reset" => "Jelszó megváltoztatva",
@@ -43,7 +41,6 @@
 "Database name" => "Adatbázis név",
 "Database host" => "Adatbázis szerver",
 "Finish setup" => "Beállítás befejezése",
-"web services under your control" => "webszolgáltatások az irányításod alatt",
 "Sunday" => "Vasárnap",
 "Monday" => "Hétfő",
 "Tuesday" => "Kedd",
@@ -63,6 +60,7 @@
 "October" => "Október",
 "November" => "November",
 "December" => "December",
+"web services under your control" => "webszolgáltatások az irányításod alatt",
 "Log out" => "Kilépés",
 "Lost your password?" => "Elfelejtett jelszó?",
 "remember" => "emlékezzen",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 479b1a424c2..07cc118f0e6 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -4,8 +4,6 @@
 "Cancel" => "Cancellar",
 "Password" => "Contrasigno",
 "ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
-"Requested" => "Requestate",
-"Login failed!" => "Initio de session fallite!",
 "Username" => "Nomine de usator",
 "Request reset" => "Requestar reinitialisation",
 "Your password was reset" => "Tu contrasigno esseva reinitialisate",
@@ -30,7 +28,6 @@
 "Database password" => "Contrasigno de base de datos",
 "Database name" => "Nomine de base de datos",
 "Database host" => "Hospite de base de datos",
-"web services under your control" => "servicios web sub tu controlo",
 "Sunday" => "Dominica",
 "Monday" => "Lunedi",
 "Tuesday" => "Martedi",
@@ -50,6 +47,7 @@
 "October" => "Octobre",
 "November" => "Novembre",
 "December" => "Decembre",
+"web services under your control" => "servicios web sub tu controlo",
 "Log out" => "Clauder le session",
 "Lost your password?" => "Tu perdeva le contrasigno?",
 "remember" => "memora",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index f7331656736..2b7072fd7c5 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
-"Requested" => "Telah diminta",
-"Login failed!" => "Login gagal!",
 "Username" => "Username",
 "Request reset" => "Meminta reset",
 "Your password was reset" => "Password anda telah direset",
@@ -68,7 +66,6 @@
 "Database tablespace" => "tablespace basis data",
 "Database host" => "Host database",
 "Finish setup" => "Selesaikan instalasi",
-"web services under your control" => "web service dibawah kontrol anda",
 "Sunday" => "minggu",
 "Monday" => "senin",
 "Tuesday" => "selasa",
@@ -88,6 +85,7 @@
 "October" => "Oktober",
 "November" => "Nopember",
 "December" => "Desember",
+"web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
 "Automatic logon rejected!" => "login otomatis ditolak!",
 "If you did not change your password recently, your account may be compromised!" => "apabila anda tidak merubah kata kunci belakangan ini, akun anda dapat di gunakan orang lain!",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index f85e7f89c42..e772d7c5105 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
-"Requested" => "Richiesto",
-"Login failed!" => "Accesso non riuscito!",
+"Reset email send." => "Email di ripristino inviata.",
+"Request failed!" => "Richiesta non riuscita!",
 "Username" => "Nome utente",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata ripristinata",
@@ -70,7 +70,6 @@
 "Database tablespace" => "Spazio delle tabelle del database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina la configurazione",
-"web services under your control" => "servizi web nelle tue mani",
 "Sunday" => "Domenica",
 "Monday" => "Lunedì",
 "Tuesday" => "Martedì",
@@ -90,6 +89,7 @@
 "October" => "Ottobre",
 "November" => "Novembre",
 "December" => "Dicembre",
+"web services under your control" => "servizi web nelle tue mani",
 "Log out" => "Esci",
 "Automatic logon rejected!" => "Accesso automatico rifiutato.",
 "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere stato compromesso.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index a6b533a65d3..28d2a3041f3 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
-"Requested" => "送信されました",
-"Login failed!" => "ログインに失敗しました！",
+"Reset email send." => "リセットメールを送信します。",
+"Request failed!" => "リクエスト失敗！",
 "Username" => "ユーザ名",
 "Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
@@ -70,7 +70,6 @@
 "Database tablespace" => "データベースの表領域",
 "Database host" => "データベースのホスト名",
 "Finish setup" => "セットアップを完了します",
-"web services under your control" => "管理下にあるウェブサービス",
 "Sunday" => "日",
 "Monday" => "月",
 "Tuesday" => "火",
@@ -90,6 +89,7 @@
 "October" => "10月",
 "November" => "11月",
 "December" => "12月",
+"web services under your control" => "管理下にあるウェブサービス",
 "Log out" => "ログアウト",
 "Automatic logon rejected!" => "自動ログインは拒否されました！",
 "If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 7e43fa322d7..ac98e1f9d1f 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "ownCloud პაროლის შეცვლა",
 "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
 "You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-"Requested" => "მოთხოვნილი",
-"Login failed!" => "შესვლა ვერ მოხერხდა!",
 "Username" => "მომხმარებელი",
 "Request reset" => "რესეტის მოთხოვნა",
 "Your password was reset" => "თქვენი პაროლი შეცვლილია",
@@ -66,7 +64,6 @@
 "Database tablespace" => "ბაზის ცხრილის ზომა",
 "Database host" => "ბაზის ჰოსტი",
 "Finish setup" => "კონფიგურაციის დასრულება",
-"web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
 "Sunday" => "კვირა",
 "Monday" => "ორშაბათი",
 "Tuesday" => "სამშაბათი",
@@ -86,6 +83,7 @@
 "October" => "ოქტომბერი",
 "November" => "ნოემბერი",
 "December" => "დეკემბერი",
+"web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
 "Log out" => "გამოსვლა",
 "Automatic logon rejected!" => "ავტომატური შესვლა უარყოფილია!",
 "Lost your password?" => "დაგავიწყდათ პაროლი?",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index fd3fd68f3bb..a8fdab7c6ec 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -14,8 +14,6 @@
 "ownCloud password reset" => "ownCloud 비밀번호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 초기화할 수 있습니다: {link}",
 "You will receive a link to reset your password via Email." => "전자 우편으로 암호 재설정 링크를 보냈습니다.",
-"Requested" => "요청함",
-"Login failed!" => "로그인 실패!",
 "Username" => "사용자 이름",
 "Request reset" => "요청 초기화",
 "Your password was reset" => "암호가 재설정되었습니다",
@@ -42,7 +40,6 @@
 "Database name" => "데이터베이스 이름",
 "Database host" => "데이터베이스 호스트",
 "Finish setup" => "설치 완료",
-"web services under your control" => "내가 관리하는 웹 서비스",
 "Sunday" => "일요일",
 "Monday" => "월요일",
 "Tuesday" => "화요일",
@@ -62,6 +59,7 @@
 "October" => "10월",
 "November" => "11월",
 "December" => "12월",
+"web services under your control" => "내가 관리하는 웹 서비스",
 "Log out" => "로그아웃",
 "Lost your password?" => "암호를 잊으셨습니까?",
 "remember" => "기억하기",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index e09ab577932..507efd7a4bb 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -14,8 +14,6 @@
 "ownCloud password reset" => "ownCloud Passwuert reset",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
 "You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
-"Requested" => "Gefrot",
-"Login failed!" => "Falschen Login!",
 "Username" => "Benotzernumm",
 "Request reset" => "Reset ufroen",
 "Your password was reset" => "Dän Passwuert ass zeréck gesat gin",
@@ -43,7 +41,6 @@
 "Database tablespace" => "Datebank Tabelle-Gréisst",
 "Database host" => "Datebank Server",
 "Finish setup" => "Installatioun ofschléissen",
-"web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Sunday" => "Sonndes",
 "Monday" => "Méindes",
 "Tuesday" => "Dënschdes",
@@ -63,6 +60,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Dezember",
+"web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Log out" => "Ausloggen",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 5a5a22afe23..11ee84b5dae 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
-"Requested" => "Užklausta",
-"Login failed!" => "Prisijungti nepavyko!",
 "Username" => "Prisijungimo vardas",
 "Request reset" => "Prašyti nustatymo iš najo",
 "Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo",
@@ -70,7 +68,6 @@
 "Database tablespace" => "Duomenų bazės loginis saugojimas",
 "Database host" => "Duomenų bazės serveris",
 "Finish setup" => "Baigti diegimą",
-"web services under your control" => "jūsų valdomos web paslaugos",
 "Sunday" => "Sekmadienis",
 "Monday" => "Pirmadienis",
 "Tuesday" => "Antradienis",
@@ -90,6 +87,7 @@
 "October" => "Spalis",
 "November" => "Lapkritis",
 "December" => "Gruodis",
+"web services under your control" => "jūsų valdomos web paslaugos",
 "Log out" => "Atsijungti",
 "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
 "If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 6a813037ad4..5543c7a56d6 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -5,8 +5,6 @@
 "Unshare" => "Pārtraukt līdzdalīšanu",
 "Use the following link to reset your password: {link}" => "Izmantojiet šo linku lai mainītu paroli",
 "You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-"Requested" => "Obligāts",
-"Login failed!" => "Neizdevās ielogoties.",
 "Username" => "Lietotājvārds",
 "Request reset" => "Pieprasīt paroles maiņu",
 "Your password was reset" => "Jūsu parole tika nomainīta",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 3612a735c68..9e3c94750cb 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -14,8 +14,6 @@
 "ownCloud password reset" => "ресетирање на лозинка за ownCloud",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-"Requested" => "Побарано",
-"Login failed!" => "Најавата не успеа!",
 "Username" => "Корисничко име",
 "Request reset" => "Побарајте ресетирање",
 "Your password was reset" => "Вашата лозинка беше ресетирана",
@@ -41,7 +39,6 @@
 "Database name" => "Име на база",
 "Database host" => "Сервер со база",
 "Finish setup" => "Заврши го подесувањето",
-"web services under your control" => "веб сервиси под Ваша контрола",
 "Sunday" => "Недела",
 "Monday" => "Понеделник",
 "Tuesday" => "Вторник",
@@ -61,6 +58,7 @@
 "October" => "Октомври",
 "November" => "Ноември",
 "December" => "Декември",
+"web services under your control" => "веб сервиси под Ваша контрола",
 "Log out" => "Одјава",
 "Lost your password?" => "Ја заборавивте лозинката?",
 "remember" => "запамти",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 624248a7dbc..7cb0dbb10b3 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -13,8 +13,6 @@
 "ownCloud password reset" => "Set semula kata lalaun ownCloud",
 "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
-"Requested" => "Meminta",
-"Login failed!" => "Log masuk gagal!",
 "Username" => "Nama pengguna",
 "Request reset" => "Permintaan set semula",
 "Your password was reset" => "Kata laluan anda telah diset semula",
@@ -41,7 +39,6 @@
 "Database name" => "Nama pangkalan data",
 "Database host" => "Hos pangkalan data",
 "Finish setup" => "Setup selesai",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Sunday" => "Ahad",
 "Monday" => "Isnin",
 "Tuesday" => "Selasa",
@@ -61,6 +58,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Disember",
+"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Log out" => "Log keluar",
 "Lost your password?" => "Hilang kata laluan?",
 "remember" => "ingat",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 17e1fd03d9f..1242109e35e 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -15,8 +15,6 @@
 "ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
-"Requested" => "Anmodning",
-"Login failed!" => "Innloggingen var ikke vellykket.",
 "Username" => "Brukernavn",
 "Request reset" => "Anmod tilbakestilling",
 "Your password was reset" => "Passordet ditt ble tilbakestilt",
@@ -44,7 +42,6 @@
 "Database tablespace" => "Database tabellområde",
 "Database host" => "Databasevert",
 "Finish setup" => "Fullfør oppsetting",
-"web services under your control" => "nettjenester under din kontroll",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
 "Tuesday" => "Tirsdag",
@@ -64,6 +61,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Desember",
+"web services under your control" => "nettjenester under din kontroll",
 "Log out" => "Logg ut",
 "Lost your password?" => "Mistet passordet ditt?",
 "remember" => "husk",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 8f452cc15a9..e3016ee444c 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "ownCloud wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-"Requested" => "Gevraagd",
-"Login failed!" => "Login mislukt!",
 "Username" => "Gebruikersnaam",
 "Request reset" => "Resetaanvraag",
 "Your password was reset" => "Je wachtwoord is gewijzigd",
@@ -70,7 +68,6 @@
 "Database tablespace" => "Database tablespace",
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
-"web services under your control" => "Webdiensten in eigen beheer",
 "Sunday" => "Zondag",
 "Monday" => "Maandag",
 "Tuesday" => "Dinsdag",
@@ -90,6 +87,7 @@
 "October" => "oktober",
 "November" => "november",
 "December" => "december",
+"web services under your control" => "Webdiensten in eigen beheer",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
 "If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 7714f99e8a2..e62e0dea730 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -5,8 +5,6 @@
 "Password" => "Passord",
 "Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
-"Requested" => "Førespurt",
-"Login failed!" => "Feil ved innlogging!",
 "Username" => "Brukarnamn",
 "Request reset" => "Be om nullstilling",
 "Your password was reset" => "Passordet ditt er nullstilt",
@@ -30,7 +28,6 @@
 "Database name" => "Databasenamn",
 "Database host" => "Databasetenar",
 "Finish setup" => "Fullfør oppsettet",
-"web services under your control" => "Vev tjenester under din kontroll",
 "Sunday" => "Søndag",
 "Monday" => "Måndag",
 "Tuesday" => "Tysdag",
@@ -50,6 +47,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "Desember",
+"web services under your control" => "Vev tjenester under din kontroll",
 "Log out" => "Logg ut",
 "Lost your password?" => "Gløymt passordet?",
 "remember" => "hugs",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 28d5c25ac4d..c37e84530d2 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "senhal d'ownCloud tornat botar",
 "Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
 "You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-"Requested" => "Requesit",
-"Login failed!" => "Fracàs de login",
 "Username" => "Nom d'usancièr",
 "Request reset" => "Tornar botar requesit",
 "Your password was reset" => "Ton senhal es estat tornat botar",
@@ -64,7 +62,6 @@
 "Database tablespace" => "Espandi de taula de basa de donadas",
 "Database host" => "Òste de basa de donadas",
 "Finish setup" => "Configuracion acabada",
-"web services under your control" => "Services web jos ton contraròtle",
 "Sunday" => "Dimenge",
 "Monday" => "Diluns",
 "Tuesday" => "Dimarç",
@@ -84,6 +81,7 @@
 "October" => "Octobre",
 "November" => "Novembre",
 "December" => "Decembre",
+"web services under your control" => "Services web jos ton contraròtle",
 "Log out" => "Sortida",
 "Lost your password?" => "L'as perdut lo senhal ?",
 "remember" => "bremba-te",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index ed6978a2dc8..377aa1d478d 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -38,8 +38,7 @@
 "ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-"Requested" => "Żądane",
-"Login failed!" => "Nie udało się zalogować!",
+"Request failed!" => "Próba nieudana!",
 "Username" => "Nazwa użytkownika",
 "Request reset" => "Żądanie resetowania",
 "Your password was reset" => "Zresetowano hasło",
@@ -70,7 +69,6 @@
 "Database tablespace" => "Obszar tabel bazy danych",
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
-"web services under your control" => "usługi internetowe pod kontrolą",
 "Sunday" => "Niedziela",
 "Monday" => "Poniedziałek",
 "Tuesday" => "Wtorek",
@@ -90,6 +88,7 @@
 "October" => "Październik",
 "November" => "Listopad",
 "December" => "Grudzień",
+"web services under your control" => "usługi internetowe pod kontrolą",
 "Log out" => "Wylogowuje użytkownika",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
 "If you did not change your password recently, your account may be compromised!" => "Jeśli nie było zmianie niedawno hasło, Twoje konto może być zagrożone!",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index bbe016e228e..f40328407f9 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
-"Requested" => "Solicitado",
-"Login failed!" => "Falha ao fazer o login!",
 "Username" => "Nome de Usuário",
 "Request reset" => "Pedido de reposição",
 "Your password was reset" => "Sua senha foi mudada",
@@ -67,7 +65,6 @@
 "Database tablespace" => "Espaço de tabela do banco de dados",
 "Database host" => "Banco de dados do host",
 "Finish setup" => "Concluir configuração",
-"web services under your control" => "web services sob seu controle",
 "Sunday" => "Domingo",
 "Monday" => "Segunda-feira",
 "Tuesday" => "Terça-feira",
@@ -87,6 +84,7 @@
 "October" => "Outubro",
 "November" => "Novembro",
 "December" => "Dezembro",
+"web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
 "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
 "Lost your password?" => "Esqueçeu sua senha?",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index a2212ccfc63..c9daa645c47 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -13,6 +13,8 @@
 "Error while sharing" => "Erro ao partilhar",
 "Error while unsharing" => "Erro ao deixar de partilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
+"Shared with you and the group {group} by {owner}" => "Partilhado consigo e com o grupo {group} por {owner}",
+"Shared with you by {owner}" => "Partilhado consigo por {owner}",
 "Share with" => "Partilhar com",
 "Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
@@ -22,6 +24,7 @@
 "Share via email:" => "Partilhar via email:",
 "No people found" => "Não foi encontrado ninguém",
 "Resharing is not allowed" => "Não é permitido partilhar de novo",
+"Shared in {item} with {user}" => "Partilhado em {item} com {user}",
 "Unshare" => "Deixar de partilhar",
 "can edit" => "pode editar",
 "access control" => "Controlo de acesso",
@@ -35,8 +38,6 @@
 "ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
-"Requested" => "Pedido",
-"Login failed!" => "Conexão falhado!",
 "Username" => "Utilizador",
 "Request reset" => "Pedir reposição",
 "Your password was reset" => "A sua password foi reposta",
@@ -65,7 +66,6 @@
 "Database tablespace" => "Tablespace da base de dados",
 "Database host" => "Host da base de dados",
 "Finish setup" => "Acabar instalação",
-"web services under your control" => "serviços web sob o seu controlo",
 "Sunday" => "Domingo",
 "Monday" => "Segunda",
 "Tuesday" => "Terça",
@@ -85,7 +85,9 @@
 "October" => "Outubro",
 "November" => "Novembro",
 "December" => "Dezembro",
+"web services under your control" => "serviços web sob o seu controlo",
 "Log out" => "Sair",
+"Please change your password to secure your account again." => "Por favor mude a sua palavra-passe para assegurar a sua conta de novo.",
 "Lost your password?" => "Esqueceu a sua password?",
 "remember" => "lembrar",
 "Log in" => "Entrar",
@@ -93,5 +95,6 @@
 "prev" => "anterior",
 "next" => "seguinte",
 "Security Warning!" => "Aviso de Segurança!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique a sua palavra-passe. <br/>Por razões de segurança, pode ser-lhe perguntada, ocasionalmente, a sua palavra-passe de novo.",
 "Verify" => "Verificar"
 );
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index c7cba8aad64..d0551be2483 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -34,8 +34,6 @@
 "ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
-"Requested" => "Solicitat",
-"Login failed!" => "Autentificare eșuată",
 "Username" => "Utilizator",
 "Request reset" => "Cerere trimisă",
 "Your password was reset" => "Parola a fost resetată",
@@ -64,7 +62,6 @@
 "Database tablespace" => "Tabela de spațiu a bazei de date",
 "Database host" => "Bază date",
 "Finish setup" => "Finalizează instalarea",
-"web services under your control" => "servicii web controlate de tine",
 "Sunday" => "Duminică",
 "Monday" => "Luni",
 "Tuesday" => "Marți",
@@ -84,6 +81,7 @@
 "October" => "Octombrie",
 "November" => "Noiembrie",
 "December" => "Decembrie",
+"web services under your control" => "servicii web controlate de tine",
 "Log out" => "Ieșire",
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "amintește",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index b68c5367aa3..7131beff98b 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
-"Requested" => "Запрошено",
-"Login failed!" => "Не удалось войти!",
 "Username" => "Имя пользователя",
 "Request reset" => "Запросить сброс",
 "Your password was reset" => "Ваш пароль был сброшен",
@@ -70,7 +68,6 @@
 "Database tablespace" => "Табличое пространство базы данных",
 "Database host" => "Хост базы данных",
 "Finish setup" => "Завершить установку",
-"web services under your control" => "Сетевые службы под твоим контролем",
 "Sunday" => "Воскресенье",
 "Monday" => "Понедельник",
 "Tuesday" => "Вторник",
@@ -90,6 +87,7 @@
 "October" => "Октябрь",
 "November" => "Ноябрь",
 "December" => "Декабрь",
+"web services under your control" => "Сетевые службы под твоим контролем",
 "Log out" => "Выйти",
 "Automatic logon rejected!" => "Автоматический вход в систему отключен!",
 "If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 065803eeb4d..610bb0b175b 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "Переназначение пароля",
 "Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
 "You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
-"Requested" => "Запрашиваемое",
-"Login failed!" => "Войти не удалось!",
+"Reset email send." => "Сброс отправки email.",
+"Request failed!" => "Не удалось выполнить запрос!",
 "Username" => "Имя пользователя",
 "Request reset" => "Сброс запроса",
 "Your password was reset" => "Ваш пароль был переустановлен",
@@ -70,7 +70,6 @@
 "Database tablespace" => "Табличная область базы данных",
 "Database host" => "Сервер базы данных",
 "Finish setup" => "Завершение настройки",
-"web services under your control" => "веб-сервисы под Вашим контролем",
 "Sunday" => "Воскресенье",
 "Monday" => "Понедельник",
 "Tuesday" => "Вторник",
@@ -90,6 +89,7 @@
 "October" => "Октябрь",
 "November" => "Ноябрь",
 "December" => "Декабрь",
+"web services under your control" => "веб-сервисы под Вашим контролем",
 "Log out" => "Выйти",
 "Automatic logon rejected!" => "Автоматический вход в систему отклонен!",
 "If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли пароль, Ваш аккаунт может быть подвергнут опасности!",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index a57c8b5854d..ad7ac98b8a8 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -9,6 +9,8 @@
 "No categories selected for deletion." => "මකා දැමීම සඳහා ප්‍රවර්ගයන් තෝරා නොමැත.",
 "Error" => "දෝෂයක්",
 "Password" => "මුර පදය ",
+"Unshare" => "නොබෙදු",
+"create" => "සදන්න",
 "Username" => "පරිශීලක නම",
 "To login page" => "පිවිසුම් පිටුවට",
 "New password" => "නව මුර පදයක්",
@@ -17,9 +19,10 @@
 "Apps" => "යෙදුම්",
 "Admin" => "පරිපාලක",
 "Help" => "උදව්",
+"Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
 "Add" => "එක් කරන්න",
+"Advanced" => "දියුණු/උසස්",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
-"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "Sunday" => "ඉරිදා",
 "Monday" => "සඳුදා",
 "Tuesday" => "අඟහරුවාදා",
@@ -39,5 +42,6 @@
 "October" => "ඔක්තෝබර්",
 "November" => "නොවැම්බර්",
 "December" => "දෙසැම්බර්",
+"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "next" => "ඊළඟ"
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b5676befd7b..8b76ccc537e 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -13,8 +13,8 @@
 "Error while sharing" => "Chyba počas zdieľania",
 "Error while unsharing" => "Chyba počas ukončenia zdieľania",
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
-"Shared with you and the group {group} by {owner}" => "Zdieľané s vami a so skupinou {group} užívateľom {owner}",
-"Shared with you by {owner}" => "Zdieľané s vami užívateľom {owner}",
+"Shared with you and the group {group} by {owner}" => "Zdieľané s vami a so skupinou {group} používateľom {owner}",
+"Shared with you by {owner}" => "Zdieľané s vami používateľom {owner}",
 "Share with" => "Zdieľať s",
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
@@ -23,18 +23,23 @@
 "Expiration date" => "Dátum expirácie",
 "Share via email:" => "Zdieľať cez e-mail:",
 "No people found" => "Užívateľ nenájdený",
+"Resharing is not allowed" => "Zdieľanie už zdieľanej položky nie je povolené",
+"Shared in {item} with {user}" => "Zdieľané v {item} s {user}",
 "Unshare" => "Zrušiť zdieľanie",
 "can edit" => "môže upraviť",
 "access control" => "riadenie prístupu",
 "create" => "vytvoriť",
+"update" => "aktualizácia",
 "delete" => "zmazať",
 "share" => "zdieľať",
 "Password protected" => "Chránené heslom",
+"Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu vypršania platnosti",
+"Error setting expiration date" => "Chyba pri nastavení dátumu vypršania platnosti",
 "ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
-"Requested" => "Požiadané",
-"Login failed!" => "Prihlásenie zlyhalo!",
+"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
+"Reset email send." => "Obnovovací email bol odoslaný.",
+"Request failed!" => "Požiadavka zlyhala!",
 "Username" => "Prihlasovacie meno",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
@@ -51,7 +56,9 @@
 "Edit categories" => "Úprava kategórií",
 "Add" => "Pridať",
 "Security Warning" => "Bezpečnostné varovanie",
-"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." => "Váš priečinok s dátami a vaše súbory sú pravdepodobne dostupné z internetu. .htaccess súbor dodávaný s inštaláciou ownCloud nespĺňa úlohu. Dôrazne vám doporučujeme nakonfigurovať webserver takým spôsobom, aby dáta v priečinku neboli verejné, alebo presuňte dáta mimo štruktúry priečinkov webservera.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nie je dostupný žiadny bezpečný generátor náhodných čísel, prosím, povoľte rozšírenie OpenSSL v PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátora náhodných čísel môže útočník predpovedať token pre obnovu hesla a prevziať kontrolu nad vaším kontom.",
+"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." => "Váš priečinok s dátami a Vaše súbory sú pravdepodobne dostupné z internetu. .htaccess súbor dodávaný s inštaláciou ownCloud nespĺňa úlohu. Dôrazne Vám doporučujeme nakonfigurovať webserver takým spôsobom, aby dáta v priečinku neboli verejné, alebo presuňte dáta mimo štruktúry priečinkov webservera.",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
 "Advanced" => "Pokročilé",
 "Data folder" => "Priečinok dát",
@@ -60,9 +67,9 @@
 "Database user" => "Hostiteľ databázy",
 "Database password" => "Heslo databázy",
 "Database name" => "Meno databázy",
+"Database tablespace" => "Tabuľkový priestor databázy",
 "Database host" => "Server databázy",
 "Finish setup" => "Dokončiť inštaláciu",
-"web services under your control" => "webové služby pod vašou kontrolou",
 "Sunday" => "Nedeľa",
 "Monday" => "Pondelok",
 "Tuesday" => "Utorok",
@@ -82,8 +89,11 @@
 "October" => "Október",
 "November" => "November",
 "December" => "December",
+"web services under your control" => "webové služby pod vašou kontrolou",
 "Log out" => "Odhlásiť",
 "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
+"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
+"Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu",
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
@@ -91,5 +101,6 @@
 "prev" => "späť",
 "next" => "ďalej",
 "Security Warning!" => "Bezpečnostné varovanie!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosím, overte svoje heslo. <br />Z bezpečnostných dôvodov môžete byť občas požiadaný o jeho opätovné zadanie.",
 "Verify" => "Overenie"
 );
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2c698d87fca..6c63ba04661 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "Ponastavitev gesla ownCloud",
 "Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}",
 "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-"Requested" => "Zahtevano",
-"Login failed!" => "Prijava je spodletela!",
 "Username" => "Uporabniško Ime",
 "Request reset" => "Zahtevaj ponastavitev",
 "Your password was reset" => "Geslo je ponastavljeno",
@@ -65,7 +63,6 @@
 "Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Dokončaj namestitev",
-"web services under your control" => "spletne storitve pod vašim nadzorom",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljek",
 "Tuesday" => "torek",
@@ -85,6 +82,7 @@
 "October" => "oktober",
 "November" => "november",
 "December" => "december",
+"web services under your control" => "spletne storitve pod vašim nadzorom",
 "Log out" => "Odjava",
 "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!",
 "Please change your password to secure your account again." => "Spremenite geslo za izboljšanje zaščite računa.",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index a8aa0d86c11..b2576c44445 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -4,8 +4,6 @@
 "Password" => "Лозинка",
 "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
 "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
-"Requested" => "Захтевано",
-"Login failed!" => "Несупела пријава!",
 "Username" => "Корисничко име",
 "Request reset" => "Захтевај ресетовање",
 "Your password was reset" => "Ваша лозинка је ресетована",
@@ -29,7 +27,6 @@
 "Database name" => "Име базе",
 "Database host" => "Домаћин базе",
 "Finish setup" => "Заврши подешавање",
-"web services under your control" => "веб сервиси под контролом",
 "Sunday" => "Недеља",
 "Monday" => "Понедељак",
 "Tuesday" => "Уторак",
@@ -49,6 +46,7 @@
 "October" => "Октобар",
 "November" => "Новембар",
 "December" => "Децембар",
+"web services under your control" => "веб сервиси под контролом",
 "Log out" => "Одјава",
 "Lost your password?" => "Изгубили сте лозинку?",
 "remember" => "упамти",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 71e8bf35d3b..af48a845720 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -3,8 +3,6 @@
 "Cancel" => "Otkaži",
 "Password" => "Lozinka",
 "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-"Requested" => "Zahtevano",
-"Login failed!" => "Nesupela prijava!",
 "Username" => "Korisničko ime",
 "Request reset" => "Zahtevaj resetovanje",
 "Your password was reset" => "Vaša lozinka je resetovana",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 68acd37912e..d10ee392fa8 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
 "You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
-"Requested" => "Begärd",
-"Login failed!" => "Misslyckad inloggning!",
+"Reset email send." => "Återställ skickad e-post.",
+"Request failed!" => "Begäran misslyckades!",
 "Username" => "Användarnamn",
 "Request reset" => "Begär återställning",
 "Your password was reset" => "Ditt lösenord har återställts",
@@ -70,7 +70,6 @@
 "Database tablespace" => "Databas tabellutrymme",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
-"web services under your control" => "webbtjänster under din kontroll",
 "Sunday" => "Söndag",
 "Monday" => "Måndag",
 "Tuesday" => "Tisdag",
@@ -90,6 +89,7 @@
 "October" => "Oktober",
 "November" => "November",
 "December" => "December",
+"web services under your control" => "webbtjänster under din kontroll",
 "Log out" => "Logga ut",
 "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
 "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 4fe2f966909..808929b8f3e 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -38,8 +38,6 @@
 "ownCloud password reset" => "ownCloud இன் கடவுச்சொல் மீளமைப்பு",
 "Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
 "You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-"Requested" => "கோரப்பட்டது",
-"Login failed!" => "புகுபதிகை தவறானது!",
 "Username" => "பயனாளர் பெயர்",
 "Request reset" => "கோரிக்கை மீளமைப்பு",
 "Your password was reset" => "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது",
@@ -70,7 +68,6 @@
 "Database tablespace" => "தரவுத்தள அட்டவணை",
 "Database host" => "தரவுத்தள ஓம்புனர்",
 "Finish setup" => "அமைப்பை முடிக்க",
-"web services under your control" => "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்",
 "Sunday" => "ஞாயிற்றுக்கிழமை",
 "Monday" => "திங்கட்கிழமை",
 "Tuesday" => "செவ்வாய்க்கிழமை",
@@ -90,6 +87,7 @@
 "October" => "ஐப்பசி",
 "November" => "கார்த்திகை",
 "December" => "மார்கழி",
+"web services under your control" => "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்",
 "Log out" => "விடுபதிகை செய்க",
 "Automatic logon rejected!" => "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!",
 "If you did not change your password recently, your account may be compromised!" => "உங்களுடைய கடவுச்சொல்லை அண்மையில் மாற்றவில்லையின், உங்களுடைய கணக்கு சமரசமாகிவிடும்!",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 75dade377eb..eb6e18c281d 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -13,6 +13,8 @@
 "Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
 "Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
 "Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
+"Shared with you and the group {group} by {owner}" => "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+"Shared with you by {owner}" => "ถูกแชร์ให้กับคุณโดย {owner}",
 "Share with" => "แชร์ให้กับ",
 "Share with link" => "แชร์ด้วยลิงก์",
 "Password protect" => "ใส่รหัสผ่านไว้",
@@ -22,6 +24,7 @@
 "Share via email:" => "แชร์ผ่านทางอีเมล",
 "No people found" => "ไม่พบบุคคลที่ต้องการ",
 "Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
+"Shared in {item} with {user}" => "ได้แชร์ {item} ให้กับ {user}",
 "Unshare" => "ยกเลิกการแชร์",
 "can edit" => "สามารถแก้ไข",
 "access control" => "ระดับควบคุมการเข้าใช้งาน",
@@ -35,8 +38,8 @@
 "ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
 "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-"Requested" => "ส่งคำร้องเรียบร้อยแล้ว",
-"Login failed!" => "ไม่สามารถเข้าสู่ระบบได้!",
+"Reset email send." => "รีเซ็ตค่าการส่งอีเมล",
+"Request failed!" => "คำร้องขอล้มเหลว!",
 "Username" => "ชื่อผู้ใช้งาน",
 "Request reset" => "ขอเปลี่ยนรหัสใหม่",
 "Your password was reset" => "รหัสผ่านของคุณถูกเปลี่ยนเรียบร้อยแล้ว",
@@ -53,6 +56,8 @@
 "Edit categories" => "แก้ไขหมวดหมู่",
 "Add" => "เพิ่ม",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "ยังไม่มีตัวสร้างหมายเลขแบบสุ่มให้ใช้งาน, กรุณาเปิดใช้งานส่วนเสริม PHP OpenSSL",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "หากปราศจากตัวสร้างหมายเลขแบบสุ่มที่ช่วยป้องกันความปลอดภัย ผู้บุกรุกอาจสามารถที่จะคาดคะเนรหัสยืนยันการเข้าถึงเพื่อรีเซ็ตรหัสผ่าน และเอาบัญชีของคุณไปเป็นของตนเองได้",
 "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." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
 "Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
 "Advanced" => "ขั้นสูง",
@@ -65,7 +70,6 @@
 "Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
 "Database host" => "Database host",
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
-"web services under your control" => "web services under your control",
 "Sunday" => "วันอาทิตย์",
 "Monday" => "วันจันทร์",
 "Tuesday" => "วันอังคาร",
@@ -85,11 +89,18 @@
 "October" => "ตุลาคม",
 "November" => "พฤศจิกายน",
 "December" => "ธันวาคม",
+"web services under your control" => "web services under your control",
 "Log out" => "ออกจากระบบ",
+"Automatic logon rejected!" => "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว",
+"If you did not change your password recently, your account may be compromised!" => "หากคุณยังไม่ได้เปลี่ยนรหัสผ่านของคุณเมื่อเร็วๆนี้, บัญชีของคุณอาจถูกบุกรุกโดยผู้อื่น",
+"Please change your password to secure your account again." => "กรุณาเปลี่ยนรหัสผ่านของคุณอีกครั้ง เพื่อป้องกันบัญชีของคุณให้ปลอดภัย",
 "Lost your password?" => "ลืมรหัสผ่าน?",
 "remember" => "จำรหัสผ่าน",
 "Log in" => "เข้าสู่ระบบ",
 "You are logged out." => "คุณออกจากระบบเรียบร้อยแล้ว",
 "prev" => "ก่อนหน้า",
-"next" => "ถัดไป"
+"next" => "ถัดไป",
+"Security Warning!" => "คำเตือนเพื่อความปลอดภัย!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "กรุณายืนยันรหัสผ่านของคุณ <br/> เพื่อความปลอดภัย คุณจะถูกขอให้กรอกรหัสผ่านอีกครั้ง",
+"Verify" => "ยืนยัน"
 );
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index d61821f7c41..faaef3d4fee 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -15,8 +15,6 @@
 "ownCloud password reset" => "ownCloud parola sıfırlama",
 "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
-"Requested" => "İstendi",
-"Login failed!" => "Giriş başarısız!",
 "Username" => "Kullanıcı adı",
 "Request reset" => "Sıfırlama iste",
 "Your password was reset" => "Parolanız sıfırlandı",
@@ -44,7 +42,6 @@
 "Database tablespace" => "Veritabanı tablo alanı",
 "Database host" => "Veritabanı sunucusu",
 "Finish setup" => "Kurulumu tamamla",
-"web services under your control" => "kontrolünüzdeki web servisleri",
 "Sunday" => "Pazar",
 "Monday" => "Pazartesi",
 "Tuesday" => "Salı",
@@ -64,6 +61,7 @@
 "October" => "Ekim",
 "November" => "Kasım",
 "December" => "Aralık",
+"web services under your control" => "kontrolünüzdeki web servisleri",
 "Log out" => "Çıkış yap",
 "Lost your password?" => "Parolanızı mı unuttunuz?",
 "remember" => "hatırla",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 17a68987bd5..480fab2afc1 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -25,7 +25,6 @@
 "Database password" => "Пароль для бази даних",
 "Database name" => "Назва бази даних",
 "Finish setup" => "Завершити налаштування",
-"web services under your control" => "веб-сервіс під вашим контролем",
 "Sunday" => "Неділя",
 "Monday" => "Понеділок",
 "Tuesday" => "Вівторок",
@@ -45,6 +44,7 @@
 "October" => "Жовтень",
 "November" => "Листопад",
 "December" => "Грудень",
+"web services under your control" => "веб-сервіс під вашим контролем",
 "Log out" => "Вихід",
 "Lost your password?" => "Забули пароль?",
 "remember" => "запам'ятати",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 59e9d8add5c..e9378294068 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -13,14 +13,20 @@
 "Error while sharing" => "Lỗi trong quá trình chia sẻ",
 "Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
 "Error while changing permissions" => "Lỗi trong quá trình phân quyền",
+"Shared with you and the group {group} by {owner}" => "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
+"Shared with you by {owner}" => "Đã được chia sẽ với bạn bởi {owner}",
 "Share with" => "Chia sẻ với",
 "Share with link" => "Chia sẻ với link",
+"Password protect" => "Mật khẩu bảo vệ",
 "Password" => "Mật khẩu",
 "Set expiration date" => "Đặt ngày kết thúc",
 "Expiration date" => "Ngày kết thúc",
 "Share via email:" => "Chia sẻ thông qua email",
 "No people found" => "Không tìm thấy người nào",
+"Resharing is not allowed" => "Chia sẻ lại không được phép",
+"Shared in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}",
 "Unshare" => "Gỡ bỏ chia sẻ",
+"can edit" => "được chỉnh sửa",
 "access control" => "quản lý truy cập",
 "create" => "tạo",
 "update" => "cập nhật",
@@ -32,8 +38,6 @@
 "ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
 "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
 "You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-"Requested" => "Yêu cầu",
-"Login failed!" => "Bạn đã nhập sai mật khẩu hay tên người dùng !",
 "Username" => "Tên người dùng",
 "Request reset" => "Yêu cầu thiết lập lại ",
 "Your password was reset" => "Mật khẩu của bạn đã được khôi phục",
@@ -50,7 +54,7 @@
 "Edit categories" => "Sửa thể loại",
 "Add" => "Thêm",
 "Security Warning" => "Cảnh bảo bảo mật",
-"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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
+"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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
 "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
 "Advanced" => "Nâng cao",
 "Data folder" => "Thư mục dữ liệu",
@@ -61,7 +65,6 @@
 "Database name" => "Tên cơ sở dữ liệu",
 "Database host" => "Database host",
 "Finish setup" => "Cài đặt hoàn tất",
-"web services under your control" => "các dịch vụ web dưới sự kiểm soát của bạn",
 "Sunday" => "Chủ nhật",
 "Monday" => "Thứ 2",
 "Tuesday" => "Thứ 3",
@@ -81,11 +84,18 @@
 "October" => "Tháng 10",
 "November" => "Tháng 11",
 "December" => "Tháng 12",
+"web services under your control" => "các dịch vụ web dưới sự kiểm soát của bạn",
 "Log out" => "Đăng xuất",
+"Automatic logon rejected!" => "Tự động đăng nhập đã bị từ chối!",
+"If you did not change your password recently, your account may be compromised!" => "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tài khoản của bạn có thể gặp nguy hiểm!",
+"Please change your password to secure your account again." => "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa.",
 "Lost your password?" => "Bạn quên mật khẩu ?",
 "remember" => "Nhớ",
 "Log in" => "Đăng nhập",
 "You are logged out." => "Bạn đã đăng xuất.",
 "prev" => "Lùi lại",
-"next" => "Kế tiếp"
+"next" => "Kế tiếp",
+"Security Warning!" => "Cảnh báo bảo mật!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vui lòng xác nhận mật khẩu của bạn. <br/> Vì lý do bảo mật thỉnh thoảng bạn có thể được yêu cầu nhập lại mật khẩu.",
+"Verify" => "Kiểm tra"
 );
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index cf28e77ef5d..0a2b72f8f4a 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -35,8 +35,6 @@
 "ownCloud password reset" => "私有云密码重置",
 "Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
 "You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
-"Requested" => "请求",
-"Login failed!" => "登陆失败!",
 "Username" => "用户名",
 "Request reset" => "要求重置",
 "Your password was reset" => "你的密码已经被重置了",
@@ -67,7 +65,6 @@
 "Database tablespace" => "数据库表格空间",
 "Database host" => "数据库主机",
 "Finish setup" => "完成安装",
-"web services under your control" => "你控制下的网络服务",
 "Sunday" => "星期天",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -87,6 +84,7 @@
 "October" => "十月",
 "November" => "十一月",
 "December" => "十二月",
+"web services under your control" => "你控制下的网络服务",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密码，那您的帐号可能被攻击了！",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index c2246437a8a..8bfa304482b 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -38,8 +38,7 @@
 "ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
-"Requested" => "已请求",
-"Login failed!" => "登录失败！",
+"Request failed!" => "请求失败！",
 "Username" => "用户名",
 "Request reset" => "请求重置",
 "Your password was reset" => "您的密码已重置",
@@ -57,6 +56,7 @@
 "Add" => "添加",
 "Security Warning" => "安全警告",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户",
 "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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
 "Advanced" => "高级",
@@ -69,7 +69,6 @@
 "Database tablespace" => "数据库表空间",
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
-"web services under your control" => "由您掌控的网络服务",
 "Sunday" => "星期日",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -89,6 +88,7 @@
 "October" => "十月",
 "November" => "十一月",
 "December" => "十二月",
+"web services under your control" => "由您掌控的网络服务",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您没有最近修改您的密码，您的帐户可能会受到影响！",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index a507a71edc6..703389d1818 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -15,8 +15,6 @@
 "ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
-"Requested" => "已要求",
-"Login failed!" => "登入失敗!",
 "Username" => "使用者名稱",
 "Request reset" => "要求重設",
 "Your password was reset" => "你的密碼已重設",
@@ -44,7 +42,6 @@
 "Database tablespace" => "資料庫 tablespace",
 "Database host" => "資料庫主機",
 "Finish setup" => "完成設定",
-"web services under your control" => "網路服務已在你控制",
 "Sunday" => "週日",
 "Monday" => "週一",
 "Tuesday" => "週二",
@@ -64,6 +61,7 @@
 "October" => "十月",
 "November" => "十一月",
 "December" => "十二月",
+"web services under your control" => "網路服務已在你控制",
 "Log out" => "登出",
 "Lost your password?" => "忘記密碼?",
 "remember" => "記住",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
new file mode 100644
index 00000000000..523520dc754
--- /dev/null
+++ b/core/lostpassword/controller.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Core_LostPassword_Controller {
+	protected static function displayLostPasswordPage($error, $requested) {
+		OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
+			array('error' => $error, 'requested' => $requested));
+	}
+	
+	protected static function displayResetPasswordPage($success, $args) {
+		$route_args = array();
+		$route_args['token'] = $args['token'];
+		$route_args['user'] = $args['user'];
+		OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
+			array('success' => $success, 'args' => $route_args));
+	}
+
+	protected static function checkToken($user, $token) {
+		return OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
+	}
+
+	public static function index($args) {
+		self::displayLostPasswordPage(false, false);
+	}
+
+	public static function sendEmail($args) {
+		if (OC_User::userExists($_POST['user'])) {
+			$token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
+			OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
+				hash('sha256', $token)); // Hash the token again to prevent timing attacks
+			$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
+			if (!empty($email)) {
+				$link = OC_Helper::linkToRoute('core_lostpassword_reset',
+					array('user' => $_POST['user'], 'token' => $token));
+				$link = OC_Helper::makeURLAbsolute($link);
+
+				$tmpl = new OC_Template('core/lostpassword', 'email');
+				$tmpl->assign('link', $link, false);
+				$msg = $tmpl->fetchPage();
+				$l = OC_L10N::get('core');
+				$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
+				OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+				echo('Mailsent');
+
+				self::displayLostPasswordPage(false, true);
+			} else {
+				self::displayLostPasswordPage(true, false);
+			}
+		} else {
+			self::displayLostPasswordPage(true, false);
+		}
+	}
+
+	public static function reset($args) {
+		// Someone wants to reset their password:
+		if(self::checkToken($args['user'], $args['token'])) {
+			self::displayResetPasswordPage(false, $args);
+		} else {
+			// Someone lost their password
+			self::displayLostPasswordPage(false, false);
+		}
+	}
+
+	public static function resetPassword($args) {
+		if (self::checkToken($args['user'], $args['token'])) {
+			if (isset($_POST['password'])) {
+				if (OC_User::setPassword($args['user'], $_POST['password'])) {
+					OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
+					OC_User::unsetMagicInCookie();
+					self::displayResetPasswordPage(true, $args);
+				} else {
+					self::displayResetPasswordPage(false, $args);
+				}
+			} else {
+				self::reset($args);
+			}
+		} else {
+			// Someone lost their password
+			self::displayLostPasswordPage(false, false);
+		}
+	}
+}
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
deleted file mode 100644
index 1da5bce8ea8..00000000000
--- a/core/lostpassword/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Frank Karlitschek frank@owncloud.org
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
-*/
-
-$RUNTIME_NOAPPS = true; //no apps
-require_once '../../lib/base.php';
-
-
-// Someone lost their password:
-if (isset($_POST['user'])) {
-	if (OC_User::userExists($_POST['user'])) {
-		$token = hash("sha256", OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
-		OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash("sha256", $token)); // Hash the token again to prevent timing attacks
-		$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
-		if (!empty($email)) {
-			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => $_POST['user'], 'token' => $token));
-			$tmpl = new OC_Template('core/lostpassword', 'email');
-			$tmpl->assign('link', $link, false);
-			$msg = $tmpl->fetchPage();
-			$l = OC_L10N::get('core');
-			$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
-			OC_MAIL::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
-			echo('sent');
-		}
-		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true));
-	} else {
-		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => true, 'requested' => false));
-	}
-} else {
-	OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => false));
-}
diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
deleted file mode 100644
index 7cd383921d7..00000000000
--- a/core/lostpassword/resetpassword.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Frank Karlitschek frank@owncloud.org
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
-*/
-
-$RUNTIME_NOAPPS = true; //no apps
-require_once '../../lib/base.php';
-
-// Someone wants to reset their password:
-if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === hash("sha256", $_GET['token'])) {
-	if (isset($_POST['password'])) {
-		if (OC_User::setPassword($_GET['user'], $_POST['password'])) {
-			OC_Preferences::deleteKey($_GET['user'], 'owncloud', 'lostpassword');
-			OC_Template::printGuestPage('core/lostpassword', 'resetpassword', array('success' => true));
-		} else {
-			OC_Template::printGuestPage('core/lostpassword', 'resetpassword', array('success' => false));
-		}
-	} else {
-		OC_Template::printGuestPage('core/lostpassword', 'resetpassword', array('success' => false));
-	}
-} else {
-	// Someone lost their password
-	OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => false));
-}
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 4b871963b80..55c070f3e0c 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,11 +1,11 @@
-<form action="index.php" method="post">
+<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
 	<fieldset>
 		<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
 		<?php if ($_['requested']): ?>
-			<?php echo $l->t('Requested'); ?>
+			<?php echo $l->t('Reset email send.'); ?>
 		<?php else: ?>
 			<?php if ($_['error']): ?>
-				<?php echo $l->t('Login failed!'); ?>
+				<?php echo $l->t('Request failed!'); ?>
 			<?php endif; ?>
 			<p class="infield">
 				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 56257de7f13..0ab32acca60 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -1,8 +1,8 @@
-<form action="<?php echo 'resetpassword.php?'.$_SERVER['QUERY_STRING']; ?>" method="post">
+<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_reset', $_['args']) ?>" method="post">
 	<fieldset>
 		<?php if($_['success']): ?>
 			<h1><?php echo $l->t('Your password was reset'); ?></h1>
-			<p><a href="<?php echo OC::$WEBROOT ?>/"><?php echo $l->t('To login page'); ?></a></p>
+			<p><a href="<?php echo OC_Helper::linkTo('', 'index.php') ?>/"><?php echo $l->t('To login page'); ?></a></p>
 		<?php else: ?>
 			<p class="infield">
 				<label for="password" class="infield"><?php echo $l->t( 'New password' ); ?></label>
diff --git a/core/routes.php b/core/routes.php
new file mode 100644
index 00000000000..cc0aa53a21e
--- /dev/null
+++ b/core/routes.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Core ajax actions
+// Search
+$this->create('search_ajax_search', '/search/ajax/search.php')
+	->actionInclude('search/ajax/search.php');
+// AppConfig
+$this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
+	->actionInclude('core/ajax/appconfig.php');
+// RequestToken
+$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php')
+	->actionInclude('core/ajax/requesttoken.php');
+// Share
+$this->create('core_ajax_share', '/core/ajax/share.php')
+	->actionInclude('core/ajax/share.php');
+// Translations
+$this->create('core_ajax_translations', '/core/ajax/translations.php')
+	->actionInclude('core/ajax/translations.php');
+// VCategories
+$this->create('core_ajax_vcategories_add', '/core/ajax/vcategories/add.php')
+	->actionInclude('core/ajax/vcategories/add.php');
+$this->create('core_ajax_vcategories_delete', '/core/ajax/vcategories/delete.php')
+	->actionInclude('core/ajax/vcategories/delete.php');
+$this->create('core_ajax_vcategories_edit', '/core/ajax/vcategories/edit.php')
+	->actionInclude('core/ajax/vcategories/edit.php');
+// Routing
+$this->create('core_ajax_routes', '/core/routes.json')
+	->action('OC_Router', 'JSRoutes');
+
+OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php';
+$this->create('core_lostpassword_index', '/lostpassword/')
+	->get()
+	->action('OC_Core_LostPassword_Controller', 'index');
+$this->create('core_lostpassword_send_email', '/lostpassword/')
+	->post()
+	->action('OC_Core_LostPassword_Controller', 'sendEmail');
+$this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}')
+	->get()
+	->action('OC_Core_LostPassword_Controller', 'reset');
+$this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}')
+	->post()
+	->action('OC_Core_LostPassword_Controller', 'resetPassword');
+
+// Not specifically routed
+$this->create('app_css', '/apps/{app}/{file}')
+	->requirements(array('file' => '.*.css'))
+	->action('OC', 'loadCSSFile');
+$this->create('app_index_script', '/apps/{app}/')
+	->defaults(array('file' => 'index.php'))
+	//->requirements(array('file' => '.*.php'))
+	->action('OC', 'loadAppScriptFile');
+$this->create('app_script', '/apps/{app}/{file}')
+	->defaults(array('file' => 'index.php'))
+	->requirements(array('file' => '.*.php'))
+	->action('OC', 'loadAppScriptFile');
diff --git a/core/templates/installation.php b/core/templates/installation.php
index c0b29ea909d..5a3bd2cc9f0 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -111,7 +111,7 @@
 			</p>
 			<p class="infield">
 				<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
-				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" />
+				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" />
 			</p>
 		</div>
 		<?php endif; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 1f39148b2b1..e6468cdcfb4 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -12,9 +12,10 @@
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
 			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
+			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
 			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
-			var firstDay = <?php echo json_encode($l->l('firstday')) ?>;
+			var firstDay = <?php echo json_encode($l->l('firstday', 'firstday')) ?>;
 		</script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 1f16fdf7c6c..d876fbc98e8 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -13,10 +13,10 @@
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
 			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
-			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate')) ?>;
+			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
 			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
-			var firstDay = <?php echo json_encode($l->l('firstday')) ?>;
+			var firstDay = <?php echo json_encode($l->l('firstday', 'firstday')) ?>;
 		</script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
author	Thomas Tanghus <thomas@tanghus.net>	2012-10-30 06:53:49 +0100
committer	Thomas Tanghus <thomas@tanghus.net>	2012-10-30 06:53:49 +0100
commit	5550cde03b34e86671652258e7f3bbc2a92b6111 (patch)
tree	ec6dd9ac1465a3ae4b9e4bbffdc1c87b78621b4b /core
parent	d9d8da0a5cee5fac1e5f24a321dd612f312af508 (diff)
parent	3fdf239b478273155a68ec4ede8d4e4dd54b504d (diff)
download	nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.tar.gz nextcloud-server-5550cde03b34e86671652258e7f3bbc2a92b6111.zip