From ebc0c4b85bc382efcf64ad0b2613d70a193b18f2 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 20 Jan 2013 00:06:40 +0100 Subject: [tx-robot] updated from transifex --- core/l10n/eu.php | 3 ++- core/l10n/hu_HU.php | 3 ++- core/l10n/zh_CN.php | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'core') 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，这可能需要一些时间。" ); -- cgit v1.2.3 From 8817b603d7bbd0b4e0e0ab066d9c3486a7edf32f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 21 Jan 2013 18:29:18 +0100 Subject: Fix scrolling of leftcontent --- core/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') 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; } -- cgit v1.2.3