diff --git a/AUTHORS b/AUTHORS
index 5f992b932ef63bd5662b4b99ffdce29fb28d7d4c..02439884d2f2937936e044d4926dc0d2d71b2dcc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,13 +4,7 @@ ownCloud is written by:
Jakob Sack
Jan-Christoph Borchardt
Michael Gapczynski
- François Kubler
- Kunal Ghosh
- Antonio José Gallo Sánchez
Arthur Schiwon
- Kamil Domański
- Aldo Giambelluca
- Dominik Schmidt
…
With help from many libraries and frameworks including:
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index d78dede95c027ec199f2bc4909ab3cf60180b787..22e5098d3bf1c62179f90a137af0506480d0cb44 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -1,6 +1,6 @@
-ul.multiselectoptions { z-index:49; position:absolute; background-color:#fff; padding-top:.5em; border-bottom-left-radius:.5em; border-bottom-right-radius:.5em; border:1px solid #ddd; border-top:none; }
+ul.multiselectoptions { z-index:49; position:absolute; background-color:#fff; padding-top:.5em; border:1px solid #ddd; border-top:none; -moz-border-radius-bottomleft:.5em; -webkit-border-bottom-left-radius:.5em; border-bottom-left-radius:.5em; -moz-border-radius-bottomright:.5em; -webkit-border-bottom-right-radius:.5em; border-bottom-right-radius:.5em; -moz-box-shadow:0 1px 1px #ddd; -webkit-box-shadow:0 1px 1px #ddd; box-shadow:0 1px 1px #ddd; }
div.multiselect { padding-right:.6em; display:inline; position:relative; display:inline-block }
div.multiselect.active { background-color:#fff; border-bottom:none; border-bottom-left-radius:0; border-bottom-right-radius:0; z-index:50; position:relative }
-div.multiselect>span:first-child { margin-right:2em; }
+div.multiselect>span:first-child { margin-right:2em; float:left; }
div.multiselect>span:last-child { float:right; position:relative }
ul.multiselectoptions input.new{ margin:0; padding-bottom:0.2em; padding-top:0.2em; border-top-left-radius:0; border-top-right-radius:0; }
diff --git a/core/css/styles.css b/core/css/styles.css
index e87f5975ebed6ec2c9122375dd7e08212cb1d0be..1be259993908cc156a279fb5cdf0922c950b7921 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -2,7 +2,7 @@
This file is licensed under the Affero General Public License version 3 or later.
See the COPYING-README file. */
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-style:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
body { line-height:1.5; }
table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
@@ -101,8 +101,8 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
tbody tr:hover, tr:active { background-color:#f8f8f8; }
-#body-settings .personalblock { padding:.5em 1em; margin:1em; border:1px solid #eee; font-weight:bold; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;}
-#body-settings div.personalblock:first-child { position:relative;margin-top:4.5em; padding:0; }
+#body-settings .personalblock { padding:.5em 1em; margin:1em; border:1px solid #eee; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;}
+#body-settings div.personalblock:first-child { position:relative; margin-top:4.5em; padding:0; }
#quota div { padding:.6em 1em; background:#e6e6e6; font-weight:normal; white-space:nowrap; }
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index c4ecd73e2071269d39dc7f13f4dbc0911015b390..6ea60e54c529da5045f59aba0d014de21303e686 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -1,15 +1,15 @@
<div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'] ?>%;">
- <p><?php echo $l->t( 'You\'re currently using' );?> <strong><?php echo $_['usage_relative'] ?>%</strong> (<?php echo $_['usage'] ?>) <?php echo $l->t( 'of your' );?> <?php echo $_['total_space'] ?> <?php echo $l->t( 'space' );?>.</p>
+ <p><?php echo $l->t( 'You use' );?> <strong><?php echo $_['usage'] ?></strong> <?php echo $l->t( 'of the available' );?> <?php echo $_['total_space'] ?></p>
</div></div>
<form id="passwordform">
<fieldset class="personalblock">
<div id="passwordchanged"><?php echo $l->t( 'Your password got changed');?></div>
<div id="passworderror"></div>
- <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t( 'Old password' );?>" />
+ <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t( 'Current password' );?>" />
<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t( 'New password' );?>" data-typetoggle="#show" />
<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t( 'show' );?></label>
- <input id="passwordbutton" type="submit" value="<?php echo $l->t( 'Change Password' );?>" />
+ <input id="passwordbutton" type="submit" value="<?php echo $l->t( 'Change password' );?>" />
</fieldset>
</form>