merged develop back in

This commit is contained in:
Peter 'Pita' Martischka 2012-11-13 07:43:48 -08:00
commit 6de7634357
40 changed files with 9664 additions and 5 deletions

View file

@ -318,7 +318,7 @@
<div id="embed" class="popup">
<% e.begin_block("embedPopup"); %>
<div id="embedreadonly" class="right acl-write">
<input type="checkbox" id="readonlyinput" onClick="padeditbar.setEmbedLinks();">
<input type="checkbox" id="readonlyinput">
<label for="readonlyinput" data-l10n-id="pad.share.readonly"></label>
</div>
<h1 data-l10n-id="pad.share"></h1>