diff options
| -rw-r--r-- | feedlist.js | 4 | ||||
| -rw-r--r-- | tt-rss.php | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/feedlist.js b/feedlist.js index 177f057cd..0d4589331 100644 --- a/feedlist.js +++ b/feedlist.js @@ -554,7 +554,7 @@ function mouse_move_handler(e) { } function enable_selection(b) { - disable_selection = !b; + selection_disabled = !b; } function enable_resize(b) { @@ -589,7 +589,7 @@ function mouse_up_handler(e) { try { mouse_is_down = false; - if (!disable_selection) { + if (!selection_disabled) { document.onselectstart = null; var e = document.getElementById("headlineActionsBody"); if (e) Element.hide(e); diff --git a/tt-rss.php b/tt-rss.php index 66e59bfd7..35b63dfea 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -150,26 +150,26 @@ window.onload = init; <div style="float : right"> <select id="quickMenuChooser" onchange="quickMenuChange()"> <option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option> - <option value="qmcSearch"><?php echo __('Search') ?></option> + <option value="qmcSearch"><?php echo __('Search...') ?></option> <!-- <option value="qmcPrefs"><?php echo __('Preferences') ?></option> --> <option disabled="disabled">--------</option> <option style="color : #5050aa" disabled="disabled"><?php echo __('Feed actions:') ?></option> - <option value="qmcAddFeed"><?php echo __(' Subscribe to feed') ?></option> - <option value="qmcEditFeed"><?php echo __(' Edit this feed') ?></option> - <!-- <option value="qmcClearFeed"><?php echo __(' Clear articles') ?></option> --> - <option value="qmcRescoreFeed"><?php echo __(' Rescore feed') ?></option> - <option value="qmcRemoveFeed"><?php echo __(' Unsubscribe') ?></option> + <option value="qmcAddFeed"> <?php echo __('Subscribe to feed...') ?></option> + <option value="qmcEditFeed"> <?php echo __('Edit this feed...') ?></option> + <!-- <option value="qmcClearFeed"> <?php echo __('Clear articles') ?></option> --> + <option value="qmcRescoreFeed"> <?php echo __('Rescore feed') ?></option> + <option value="qmcRemoveFeed"> <?php echo __('Unsubscribe') ?></option> <option disabled="disabled">--------</option> <option style="color : #5050aa" disabled="disabled"><?php echo __('All feeds:') ?></option> - <option value="qmcCatchupAll"><?php echo __(' Mark as read') ?></option> - <option value="qmcShowOnlyUnread"><?php echo __(' (Un)hide read feeds') ?></option> + <option value="qmcCatchupAll"> <?php echo __('Mark as read') ?></option> + <option value="qmcShowOnlyUnread"> <?php echo __('(Un)hide read feeds') ?></option> <option disabled="disabled">--------</option> <option style="color : #5050aa" disabled="disabled"><?php echo __('Other actions:') ?></option> - <option value="qmcAddLabel"><?php echo __(' Create label') ?></option> - <option value="qmcAddFilter"><?php echo __(' Create filter') ?></option> - <option value="qmcResetUI"><?php echo __(' Reset UI layout') ?></option> - <option value="qmcResetCats"><?php echo __(' Reset category order') ?></option> + <option value="qmcAddLabel"> <?php echo __('Create label...') ?></option> + <option value="qmcAddFilter"> <?php echo __('Create filter...') ?></option> + <option value="qmcResetUI">> <?php echo __('Reset UI layout') ?></option> + <option value="qmcResetCats">> <?php echo __('Reset category order') ?></option> <option value="qmcHKhelp"><?php echo __(' Keyboard shortcuts') ?></option> </select> |