Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable...

diff --cc settings/templates/admin.php
index 6c4fddd375d9944a39019f3f9f1d51fcc37b24b3,397616a0a08251ce152546be8c64cd06295cfa28..22c0b2b5f2f21b6bed20cf20253f2e2a6d2dc5df
--- 1/settings/templates/admin.php
--- 2/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@@ -150,11 -149,10 +150,11 @@@ if (!$_['internetconnectionworking']) 
                        <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
                                <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
                                       value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
-                               <label for="allowPublicUpload"><?php p($l->t('Allow anonymous uploads'));?></label><br/>
-                               <em><?php p($l->t('Allow users to enable others to anonymously upload into their publicly shared folders')); ?></em>
+                               <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
+                               <em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em>
                        </td>
                </tr>
 +              <?php } ?>
                <tr>
                        <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
                                <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"