Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-01-22 19:00:59 +01:00
commit 411d440feb
120 changed files with 120 additions and 120 deletions

View File

@ -15,4 +15,4 @@
class="allow_null"
title="<?= __('You don\'t have sufficient privileges to perform this '
. 'operation; Please refer to the documentation for more details');?>"/>
<?php endif; ?>
<?php endif; ?>

View File

@ -25,4 +25,4 @@ $attribute = mb_strtoupper($attribute);
<?= $attribute_types[$j]; ?>
</option>
<?php endfor; ?>
</select>
</select>

View File

@ -228,4 +228,4 @@ $ci_offset = -1;
'type_prefix' => 'input_',
)); ?>
</td>
<?php endif; ?>
<?php endif; ?>

View File

@ -5,4 +5,4 @@
checked="checked"
<?php endif; ?>
type="checkbox"
value="AUTO_INCREMENT" />
value="AUTO_INCREMENT" />

View File

@ -7,4 +7,4 @@
htmlspecialchars($comments_map[$columnMeta['Field']])
: ''
?>"
class="textfield" />
class="textfield" />

View File

@ -48,4 +48,4 @@ if ($type_upper == 'BIT') {
size="12"
value="<?= htmlspecialchars($defaultValue); ?>"
class="textfield default_value" />
<?php endif; ?>
<?php endif; ?>

View File

@ -167,4 +167,4 @@ use PMA\libraries\StorageEngine;
</fieldset>
<div id="properties_message">
</div>
</form>
</form>

View File

@ -4,4 +4,4 @@
checked="checked"
<?php endif; ?>
type="checkbox"
value="auto_increment" />
value="auto_increment" />

View File

@ -27,4 +27,4 @@
<?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'SPATIAL') ? 'selected="selected"' : '');?>>
SPATIAL
</option>
</select>
</select>

View File

@ -8,4 +8,4 @@
<a href="#" class="open_enum_editor">
<?= __('Edit ENUM/SET values'); ?>
</a>
</p>
</p>

View File

@ -43,4 +43,4 @@ if (empty($title)) {
<?= __('Pick from Central Columns'); ?>
</a>
</p>
<?php endif; ?>
<?php endif; ?>

View File

@ -5,4 +5,4 @@
<?php endif; ?>
type="checkbox"
value="NULL"
class="allow_null"/>
class="allow_null"/>

View File

@ -5,4 +5,4 @@
disabled="disabled"
<?php endif; ?>>
<?= PMA\libraries\Util::getSupportedDatatypes(true, $type_upper); ?>
</select>
</select>

View File

@ -45,4 +45,4 @@ if (isset($columnMeta['Expression'])) {
value="<?= htmlspecialchars($expression); ?>"
placeholder="<?= __('Expression'); ?>"
class="textfield expression" />
<?php endif; ?>
<?php endif; ?>

View File

@ -14,4 +14,4 @@
</option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</select>

View File

@ -12,4 +12,4 @@
<?= sprintf(__('after %s'), PMA\libraries\Util::backquote(htmlspecialchars($move_columns[$mi]->name))); ?>
</option>
<?php endfor; ?>
</select>
</select>

View File

@ -168,4 +168,4 @@ $valueTypeOptions = array('', 'LESS THAN', 'LESS THAN MAXVALUE', 'IN');
<?php $odd = !$odd; ?>
<?php endforeach; ?>
</table>
<?php endif; ?>
<?php endif; ?>

View File

@ -130,4 +130,4 @@
</tr>
<?php endforeach; ?>
</table>
<br />
<br />

View File

@ -24,4 +24,4 @@
</option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</select>

View File

@ -6,4 +6,4 @@
class="textfield"
value="<?= (isset($columnMeta['Field']) && isset($mime_map[$columnMeta['Field']][$options_key])) ?
htmlspecialchars($mime_map[$columnMeta['Field']], [$options_key])
: '' ?>" />
: '' ?>" />

View File

@ -1,4 +1,4 @@
<div class="error">
<img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" />
<?= $msg; ?>
</div>
</div>

View File

@ -20,4 +20,4 @@
<fieldset class="tblFooters">
<input type="submit" value="<?= __('Go'); ?>" />
</fieldset>
</form>
</form>

View File

@ -81,4 +81,4 @@
</td>
</tr>
</tbody>
</table>
</table>

View File

@ -137,4 +137,4 @@
<?php endfor; ?>
</tbody>
</table>
<?php endfor; ?>
<?php endfor; ?>

View File

@ -44,4 +44,4 @@
</td>
</tr>
</tbody>
</table>
</table>

View File

@ -8,4 +8,4 @@
</label>
<?= PMA_getHtmlForPageSelector($cfgRelation, $db); ?>
</fieldset>
</form>
</form>

View File

@ -135,4 +135,4 @@
</td>
</tr>
</tbody>
</table>
</table>

View File

@ -7,4 +7,4 @@
<div id="script_contr" class="hide"><?= htmlspecialchars(json_encode($script_contr)); ?></div>
<div id="script_display_field" class="hide"><?= htmlspecialchars(json_encode($script_display_field)); ?></div>
<div id="script_display_page" class="hide"><?= htmlspecialchars($display_page); ?></div>
<div id="pmd_tables_enabled" class="hide"><?= htmlspecialchars($cfgRelation['pdfwork']); ?></div>
<div id="pmd_tables_enabled" class="hide"><?= htmlspecialchars($cfgRelation['pdfwork']); ?></div>

View File

@ -105,4 +105,4 @@
</td>
</tr>
</tbody>
</table>
</table>

View File

@ -270,4 +270,4 @@
</td>
</tr>
</tbody>
</table>
</table>

View File

@ -30,4 +30,4 @@ $choices = array(
</tbody>
</table>
</fieldset>
</form>
</form>

View File

@ -7,4 +7,4 @@
</option>
<?php endforeach; ?>
<?php endif; ?>
</select>
</select>

View File

@ -16,4 +16,4 @@
<input type="hidden" name="submit_sql" value="true">
<?= PMA_URL_getHiddenInputs($_GET['db']); ?>
</form>
</div>
</div>

View File

@ -63,4 +63,4 @@
</td>
</tr>
</tbody>
</table>
</table>

View File

@ -8,4 +8,4 @@
<input type="hidden" name="page_number" value="<?= htmlspecialchars($page); ?>" />
<?= PMA_pluginGetOptions('Schema', $export_list); ?>
</fieldset>
</form>
</form>

View File

@ -186,4 +186,4 @@ function getImg($path)
<?= __('Pin text'); ?>
</span>
</a>
</div>
</div>

View File

@ -66,4 +66,4 @@
</div>
</div>
</div>
<!-- end layer_menu -->
<!-- end layer_menu -->

View File

@ -100,4 +100,4 @@
</td>
</tr>
</tbody>
</table>
</table>

View File

@ -90,4 +90,4 @@ $cell_text = ($approx_rows)
: '-');?></th>
<?php endif; ?>
</tr>
</tbody>
</tbody>

View File

@ -1,3 +1,3 @@
<a href="sql.php<?= $tbl_url_query; ?>&amp;pos=0">
<?= $title; ?>
</a>
</a>

View File

@ -1,3 +1,3 @@
<a href="sql.php<?= $tbl_url_query; ?>&amp;pos=0" title="<?= $title; ?>">
<?= $truename; ?>
</a>
</a>

View File

@ -39,4 +39,4 @@
<?php endif; ?>
</select>
<?= implode("\n", $hidden_fields); ?>
</div>
</div>

View File

@ -1,3 +1,3 @@
<a class="truncate_table_anchor ajax" href="sql.php<?= $tbl_url_query; ?>&amp;sql_query=<?= $sql_query; ?>&amp;message_to_show=<?= $message_to_show; ?>">
<?= $title; ?>
</a>
</a>

View File

@ -12,4 +12,4 @@ $fav_params = array('db' => $db,
title="<?= $already_favorite ? __("Remove from Favorites") : __("Add to Favorites"); ?>"
data-favtargets="<?= md5($db . "." . $current_table['TABLE_NAME']); ?>" >
<?= !$already_favorite ? $titles['NoFavorite'] : $titles['Favorite']; ?>
</a>
</a>

View File

@ -4,4 +4,4 @@
</a>
<a href="db_datadict.php<?= $url_query; ?>" target="print_view">
<?= PMA\libraries\Util::getIcon('b_tblanalyse.png', __('Data dictionary'), true); ?></a>
</p>
</p>

View File

@ -1,3 +1,3 @@
<a href="tbl_select.php<?= $tbl_url_query; ?>">
<?= $title; ?>
</a>
</a>

View File

@ -32,4 +32,4 @@
)
) ?>
<?php endif; ?>
</div>
</div>

View File

@ -19,4 +19,4 @@
<?php endforeach; ?>
</tbody>
</table>
</fieldset>
</fieldset>

View File

@ -63,4 +63,4 @@ if (! empty($_REQUEST['tbl_group'])) {
}
echo PMA\libraries\Util::linkOrButton(
$url, $title . $order_img, $order_link_params
);
);

View File

@ -184,4 +184,4 @@
</td>
<?php endif; ?>
</tr>
</tr>

View File

@ -123,4 +123,4 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
</tr>
</thead>
<tbody>
<?php $GLOBALS['colspan_for_structure'] = $cnt + $action_colspan + 3; ?>
<?php $GLOBALS['colspan_for_structure'] = $cnt + $action_colspan + 3; ?>

View File

@ -8,4 +8,4 @@
'eye_grey.png', __('Tracking is not active.')
); ?>
<?php endif; ?>
</a>
</a>

View File

@ -32,4 +32,4 @@
<?= $hidden_inputs ?>
<?= $hidden_fields ?>
</form>
</form>

View File

@ -29,4 +29,4 @@ $uri = isset($uri) ? $uri : null;
//]]>
</script>
</body>
</html>
</html>

View File

@ -38,4 +38,4 @@
<?php if (!empty($mysql_help_page)): ?>
<?= PMA\libraries\Util::showMySQLDocu($mysql_help_page) ?>
<?php endif; ?>
</li>
</li>

View File

@ -24,4 +24,4 @@
<?php elseif (!empty($content)): ?>
<?= $content ?>
<?php endif; ?>
</ul>
</ul>

View File

@ -42,4 +42,4 @@ if (!isset($logo)) {
</a>
<?php endif; ?>
</div>
<!-- LOGO END -->
<!-- LOGO END -->

View File

@ -12,4 +12,4 @@
<a href="#yes"><?= __('Yes') ?></a>
/ <a href="#no"><?= __('No') ?></a>
</form>
</div>
</div>

View File

@ -8,4 +8,4 @@
<?php else: ?>
<?= PMA\libraries\Util::formatSql($query_data); ?>
<?php endif; ?>
</div>
</div>

View File

@ -13,4 +13,4 @@
<?php endif; ?>
<input type="text" id="text_dbname" name="dbname" />
<?= Util::showHint(__('Wildcards % and _ should be escaped with a \ to use them literally.'))?>
<?= Util::showHint(__('Wildcards % and _ should be escaped with a \ to use them literally.'))?>

View File

@ -11,4 +11,4 @@
</select>
<?php endif; ?>
<input type="text" id="text_routinename" name="routinename" />
<input type="text" id="text_routinename" name="routinename" />

View File

@ -11,4 +11,4 @@
</select>
<?php endif; ?>
<input type="text" id="text_tablename" name="tablename" />
<input type="text" id="text_tablename" name="tablename" />

View File

@ -23,4 +23,4 @@
<input type="submit" value="Go">
</fieldset>
</form>
</div>
</div>

View File

@ -65,4 +65,4 @@
<fieldset class="tblFooters">
<input type="submit" value="<?= __('Go'); ?>" />
</fieldset>
</form>
</form>

View File

@ -11,4 +11,4 @@
<td><?= $editLink; ?></td>
<td><?= $revokeLink; ?></td>
</tr>
</tr>

View File

@ -3,4 +3,4 @@
<?= PMA\libraries\Util::getHtmlTab($tab, $url_params); ?>
<?php endforeach; ?>
</ul>
<div class="clearfloat"></div>
<div class="clearfloat"></div>

View File

@ -27,4 +27,4 @@
<?php endforeach; ?>
<?php endforeach; ?>
</table>
</div>
</div>

View File

@ -33,4 +33,4 @@
</span>
<?php endif; ?>
</li>
</ul>
</ul>

View File

@ -39,4 +39,4 @@
<?php endif; ?>
<th></th>
</tr>
</tfoot>
</tfoot>

View File

@ -37,4 +37,4 @@
<?= __('Action'); ?>
</th>
</tr>
</thead>
</thead>

View File

@ -62,4 +62,4 @@
<?= \PMA\libraries\Util::getIcon('s_rights.png', __('Check privileges')); ?>
</a>
</td>
</tr>
</tr>

View File

@ -39,4 +39,4 @@
<?= $support; ?>
</p>
<?= $variables; ?>
<?php endif; ?>
<?php endif; ?>

View File

@ -22,4 +22,4 @@
<?php $odd_row = !$odd_row; ?>
<?php endforeach; ?>
</tbody>
</table>
</table>

View File

@ -30,4 +30,4 @@
<?php $odd_row = !$odd_row; ?>
<?php endforeach; ?>
</tbody>
</table>
</table>

View File

@ -5,4 +5,4 @@
</a>
<?php endforeach; ?>
</div>
<br />
<br />

View File

@ -8,4 +8,4 @@
'b_help.png',
__('Documentation'),
array('style' => 'display:none', 'id' => 'docImage')
) ?>
) ?>

View File

@ -2,4 +2,4 @@
<td class="var-action"></td>
<td class="var-name session">(<?= __('Session value'); ?> )</td>
<td class="var-value value">&nbsp;<?= htmlspecialchars($value); ?></td>
</tr>
</tr>

View File

@ -6,4 +6,4 @@
style="vertical-align: baseline;"
value="<?= htmlspecialchars($filterValue); ?>" />
</div>
</fieldset>
</fieldset>

View File

@ -21,4 +21,4 @@
<?php endif; ?>
</td>
<td class="var-value value <?= ($isSuperuser ? ' editable' : '') ?>">&nbsp;<?= htmlspecialchars($value); ?></td>
</tr>
</tr>

View File

@ -4,4 +4,4 @@
<td class="var-name"><?= __('Variable'); ?></td>
<td class="var-value"><?= __('Session value'); ?> / <?= __('Global value'); ?></td>
</tr>
</thead>
</thead>

View File

@ -17,4 +17,4 @@
<input type="hidden" name="unlim_num_rows"
value="<?= htmlspecialchars($unlim_num_rows); ?>" />
</div>
</fieldset>
</fieldset>

View File

@ -159,4 +159,4 @@
</div>
</fieldset>
</form>
</div>
</div>

View File

@ -81,4 +81,4 @@
}
</script>
</fieldset>
</div>
</div>

View File

@ -242,4 +242,4 @@
<button type="submit" id="preview_index_frm"><?= __('Preview SQL'); ?></button>
<input type="submit" id="save_index_frm" value="<?= __('Go'); ?>" />
</fieldset>
</form>
</form>

View File

@ -126,4 +126,4 @@
<input type="button" class="preview_sql" value="<?= __('Preview SQL'); ?>" />
<input type="submit" value="<?= __('Save'); ?>" />
</fieldset>
</form>
</form>

View File

@ -9,4 +9,4 @@
<?= htmlspecialchars($one_label); ?>
</option>
<?php endforeach; ?>
</select>
</select>

View File

@ -195,4 +195,4 @@ if ($foreign_db) {
</span>
<?php endif; ?>
</td>
</tr>
</tr>

View File

@ -76,4 +76,4 @@ if ($foreign_db && $foreign_table) {
)
); ?>
</td>
</tr>
</tr>

View File

@ -15,4 +15,4 @@
<?= htmlspecialchars($foreign); ?>
</option>
<?php endif; ?>
</select>
</select>

View File

@ -4,4 +4,4 @@
preg_replace('@\(.*@s', '', $columnTypes[$column_index]),
$columnNullFlags[$column_index], $selected_operator
); ?>
</select>
</select>

View File

@ -23,4 +23,4 @@
)) ?>
<?php endif; ?>
</tbody>
</table>
</table>

View File

@ -19,4 +19,4 @@ switch ($searchType) {
<form method="post" action="<?= $scriptName; ?>" name="insertForm" id="<?= $formId; ?>" class="ajax lock-page">
<?= PMA_URL_getHiddenInputs($db, $table); ?>
<input type="hidden" name="goto" value="<?= $goto; ?>" />
<input type="hidden" name="back" value="<?= $scriptName; ?>" />
<input type="hidden" name="back" value="<?= $scriptName; ?>" />

View File

@ -36,4 +36,4 @@
<?php else: ?>
&nbsp;
<?php endif; ?>
</td>
</td>

View File

@ -129,4 +129,4 @@ if ($_foreigners
value="<?= $criteriaValues[$column_index]; ?>"
<?php endif; ?>/>
<?php endif; ?>
<?php endif; ?>

View File

@ -75,4 +75,4 @@
); ?>
</fieldset>
<br style="clear: both;" />
<br style="clear: both;" />

View File

@ -45,4 +45,4 @@
: $GLOBALS['cfg']['maxRowPlotLimit']); ?>" />
</td>
</tr>
</table>
</table>

View File

@ -39,4 +39,4 @@
<fieldset class="tblFooters">
<input type="submit" name="replace" value="<?= __('Replace'); ?>" />
</fieldset>
</form>
</form>

View File

@ -49,4 +49,4 @@ for (
value="<?= $columnCollations[$column_index]; ?>" />
</td>
</tr>
<?php endfor; ?>
<?php endfor; ?>

View File

@ -85,4 +85,4 @@ for ($i = 0; $i < 4; $i++): ?>
id="collations_<?= $i; ?>" />
</td>
</tr>
<?php endfor; ?>
<?php endfor; ?>

View File

@ -23,4 +23,4 @@
false,
false,
'useRegex'
); ?>
); ?>

Some files were not shown because too many files have changed in this diff Show More