gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-11-30 13:46:17 +01:00
commit 5efb085912
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/navigation/NavigationTree.class.php
View File

@ -519,7 +519,7 @@ class PMA_NavigationTree
}
/**
* Recursively groups tree nodes given a sperarator
* Recursively groups tree nodes given a separator
*
* @param Node $node The node to group
*

24
prefs_manage.php
View File

@ -315,18 +315,20 @@ echo '</div>'
. '<input type="radio" id="export_local_storage" name="export_type"'
. ' value="local_storage" disabled="disabled" />'
. '<label for="export_local_storage">'
. __('Save to browser\'s storage') . '</label>';
. __('Save to browser\'s storage') . '</label>'
. '</div>'
. '<div id="opts_export_local_storage" class="prefsmanage_opts disabled">'
. '<span class="localStorage-supported">'
. __('Settings will be saved in your browser\'s local storage.')
. '<span class="localStorage-exists">'
. '<br /><b>' . __('Existing settings will be overwritten!') . '</b>'
. '</span>'
. '</span>'
. '<div class="localStorage-unsupported">'
. PMA_Message::notice(
__('This feature is not supported by your web browser')
)->display();
?>
</div>
<div id="opts_export_local_storage" class="prefsmanage_opts disabled">
<span class="localStorage-supported">
<?php echo __('Settings will be saved in your browser\'s local storage.') ?>
<span class="localStorage-exists">
<br /><b><?php echo __('Existing settings will be overwritten!') ?></b>
</span>
</span>
<div class="localStorage-unsupported">
<?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
</div>
</div>
<br />