Unverified Commit 1a850cf1 authored by Noémi Ványi's avatar Noémi Ványi Committed by GitHub
Browse files

Merge branch 'master' into language_aliases_fix

parents 0169b63e 35d82ed6
...@@ -20,5 +20,6 @@ description = gettext('Results are opened in the same window by default. ' ...@@ -20,5 +20,6 @@ description = gettext('Results are opened in the same window by default. '
'This plugin overwrites the default behaviour to open links on new tabs/windows. ' 'This plugin overwrites the default behaviour to open links on new tabs/windows. '
'(JavaScript required)') '(JavaScript required)')
default_on = False default_on = False
preference_section = 'ui'
js_dependencies = ('plugins/js/open_results_on_new_tab.js',) js_dependencies = ('plugins/js/open_results_on_new_tab.js',)
...@@ -5,6 +5,7 @@ description = gettext('Navigate search results with Vim-like hotkeys ' ...@@ -5,6 +5,7 @@ description = gettext('Navigate search results with Vim-like hotkeys '
'(JavaScript required). ' '(JavaScript required). '
'Press "h" key on main or result page to get help.') 'Press "h" key on main or result page to get help.')
default_on = False default_on = False
preference_section = 'ui'
js_dependencies = ('plugins/js/vim_hotkeys.js',) js_dependencies = ('plugins/js/vim_hotkeys.js',)
css_dependencies = ('plugins/css/vim_hotkeys.css',) css_dependencies = ('plugins/css/vim_hotkeys.css',)
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
</select> </select>
</p> </p>
<div class="description">{{ _('Filter content') }}</p> <p class="description">{{ _('Filter content') }}</p>
</fieldset> </fieldset>
{{ plugin_preferences('general') }} {{ plugin_preferences('general') }}
<fieldset> <fieldset>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</table> </table>
<div> </div>
{{ tab_footer() }} {{ tab_footer() }}
{% endfor %} {% endfor %}
{{ tabs_close() }} {{ tabs_close() }}
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
{{ _('With that list, you can assess searx transparency.') }}<br /> {{ _('With that list, you can assess searx transparency.') }}<br />
</p> </p>
{% if cookies %} {% if cookies %}
<table class="cookies"> <table class="cookies">
<tr> <tr>
<th>{{ _('Cookie name') }}</th> <th>{{ _('Cookie name') }}</th>
...@@ -186,14 +186,14 @@ ...@@ -186,14 +186,14 @@
</table> </table>
{% else %} {% else %}
{% include 'oscar/messages/no_cookies.html' %} {% include 'oscar/messages/no_cookies.html' %}
{% endif %} {% endif %}
<h4>{{ _('Search URL of the currently saved preferences') }} :</h4> <h4>{{ _('Search URL of the currently saved preferences') }} :</h4>
<div class="selectable_url"> <div class="selectable_url">
<pre>{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&amp;q=%s{% endraw %}</pre> <pre>{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&amp;q=%s{% endraw %}</pre>
</div> </div>
<p class="small_font">{{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }}</p> <p class="small_font">{{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }}</p>
{{ tab_footer() }} {{ tab_footer() }}
{{ tab_header('maintab', 'privacy', _('Privacy')) }} {{ tab_header('maintab', 'privacy', _('Privacy')) }}
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
<div class="description">{{ _('Proxying image results through searx') }}</div> <div class="description">{{ _('Proxying image results through searx') }}</div>
</fieldset> </fieldset>
{{ plugin_preferences('privacy') }} {{ plugin_preferences('privacy') }}
{{ tab_footer() }} {{ tab_footer() }}
{{ tabs_close() }} {{ tabs_close() }}
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
<p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}
<br /> <br />
{{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
</p> </p>
<input type="submit" value="{{ _('save') }}" /> <input type="submit" value="{{ _('save') }}" />
<div class="{% if rtl %}left{% else %}right{% endif %} preferences_back"><a href="{{ url_for('clear_cookies') }}">{{ _('Reset defaults') }}</a></div> <div class="{% if rtl %}left{% else %}right{% endif %} preferences_back"><a href="{{ url_for('clear_cookies') }}">{{ _('Reset defaults') }}</a></div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment