Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-03-18 09:41:05 +01:00
commit 5918b52a2f
2 changed files with 20 additions and 27 deletions

View File

@ -92,16 +92,12 @@ if (isset($_POST['mode'])) {
$response = PMA_Response::getInstance();
$response->getFooter()->setMinimal();
?>
<br/>
<div>
<?php
echo '<br/>';
echo '<div>';
if (! empty($message)) {
$message->display();
}
?>
<form name="form1" method="post" action="pmd_pdf.php">
<?php
echo '<form name="form1" method="post" action="pmd_pdf.php">';
echo PMA_URL_getHiddenInputs($db);
echo '<div>';
echo '<fieldset><legend>' . __('Import/Export coordinates for PDF schema') . '</legend>';
@ -144,19 +140,19 @@ echo '<label for="newpage">' . __('New page name: ') . '</label>';
echo '<input id="newpage" type="text" name="newpage" />';
echo '<p>' . __('Export/Import to scale:');
echo '<select name="scale">';
echo '<option value="1">1:1</option>';
echo '<option value="2">1:2</option>';
echo '<option value="3" selected="selected">1:3 (' . __('recommended'). ')</option>';
echo '<option value="4">1:4</option>';
echo '<option value="5">1:5</option>';
echo '</select>';
echo '</p>';
echo '<input type="submit" value="' . __('Go') . '"/>';
echo '</fieldset>';
echo '</div>';
echo '</form>';
echo '</div>';
?>
<select name="scale">
<option value="1">1:1</option>
<option value="2">1:2</option>
<option value="3" selected="selected">
1:3 (<?php echo __('recommended'); ?>)
</option>
<option value="4">1:4</option>
<option value="5">1:5</option>
</select>
</p>
<input type="submit" value="<?php echo __('Go'); ?>"/>
</fieldset>
</div>
</form>
</div>

View File

@ -81,10 +81,7 @@ function PMD_errorSave()
if (! empty($die_save_pos)) {
header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache");
?>
<root
act='save_pos'
return='<?php echo __('Modifications have been saved'); ?>'></root>
<?php
echo '<root act="save_pos" return="'
. __('Modifications have been saved') . '"></root>';
}
?>