Merge branch 'master' into no-inline-js

4 files changed, 8 insertions, 4 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index 7771fd52b9e..3c172d11df8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -96,7 +96,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #controls .button { display:inline-block; }
 #content { height: 100%; width: 100%; position: relative; }
 #content-wrapper { height: 100%; width: 100%; padding-top: 3.5em; padding-left: 12.5em; box-sizing: border-box; -moz-box-sizing: border-box; position: absolute;}
-#leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
+#leftcontent, .leftcontent { position:fixed; top: 0; overflow:auto; width:20em; background:#f8f8f8; border-right:1px solid #ddd; box-sizing: border-box; -moz-box-sizing: border-box; height: 100%; padding-top: 6.4em }
 #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
 #leftcontent li.active, .leftcontent li.active { font-weight:bold; }
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 1239ee86034..3f1a2909531 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -126,5 +126,6 @@
 "remember" => "gogoratu",
 "Log in" => "Hasi saioa",
 "prev" => "aurrekoa",
-"next" => "hurrengoa"
+"next" => "hurrengoa",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
 );
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 49b686423ab..a9e20fc6466 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -126,5 +126,6 @@
 "remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
 "prev" => "előző",
-"next" => "következő"
+"next" => "következő",
+"Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
 );
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 6c098e211d3..626ede4cc70 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -43,6 +43,7 @@
 "Share with link" => "共享链接",
 "Password protect" => "密码保护",
 "Password" => "密码",
+"Email link to person" => "发送链接到个人",
 "Send" => "发送",
 "Set expiration date" => "设置过期日期",
 "Expiration date" => "过期日期",
@@ -125,5 +126,6 @@
 "remember" => "记住",
 "Log in" => "登录",
 "prev" => "上一页",
-"next" => "下一页"
+"next" => "下一页",
+"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。"
 );