commit: 55a5b686ed6dc0b9a6bfc45e0eaf1f70e24f2aea parent 6f87bf2a1c76f1b94ad2119df7fb938c2307e370 Author: Pydo <pydo@tutanota.com> Date: Sat, 1 Oct 2016 10:46:18 -0400 Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration Resolved conflict searx/settings.ymlDiffstat:
131 files changed, 3446 insertions(+), 1727 deletions(-)diff --git a/AUTHORS.rst b/AUTHORS.rst@@ -1,4 +1,4 @@ -Searx was created by Adam Tauber and is maintained by Adam Tauber and Alexandre Flament. +Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament and Noémi Ványi. Major contributing authors: @@ -7,6 +7,7 @@ Major contributing authors: - Thomas Pointhuber - Alexandre Flament `@dalf <https://github.com/dalf>`_ - @Cqoicebordel +- Noémi Ványi People who have submitted patches/translates, reported bugs, consulted features or generally made searx better: @@ -39,12 +40,10 @@ generally made searx better: - @underr - Emmanuel Benazera - @GreenLunar -- Noemi Vanyi - Kang-min Liu - Kirill Isakov - Guilhem Bonnefille - Marc Abonce Seguin - - @jibe-b - Christian Pietsch @pietsch - @Maxqia @@ -52,3 +51,10 @@ generally made searx better: - YuLun Shih @imZack - Dmitry Mikhirev @mikhirev - David A Roberts `@davidar <https://github.com/davidar>`_ +- Jan Verbeek @blyxxyz +- Ammar Najjar @ammarnajjar +- @stepshal +- François Revol @mmuman +- marc @a01200356 +- Harry Wood @harry-wood +- Thomas Renard @threnarddiff --git a/CHANGELOG.rst b/CHANGELOG.rst@@ -1,3 +1,38 @@ +0.10.0 2016.09.06 +================= + +- New engines + + - Archive.is (general) + - INA (videos) + - Scanr (science) + - Google Scholar (science) + - Crossref (science) + - Openrepos (files) + - Microsoft Academic Search Engine (science) + - Hoogle (it) + - Diggbt (files) + - Dictzone (general - dictionary) + - Translated (general - translation) +- New Plugins + + - Infinite scroll on results page + - DOAI rewrite +- Full theme redesign +- Display the number of results +- Filter searches by date range +- Instance config API endpoint +- Dependency version updates +- Socks proxy support for outgoing requests +- 404 page + + +News +~~~~ + +@kvch joined the maintainer team + + 0.9.0 2016.05.24 ================ @@ -36,6 +71,7 @@ - Multilingual autocompleter - Qwant autocompleter backend + 0.8.1 2015.12.22 ================diff --git a/manage.sh b/manage.sh@@ -53,8 +53,8 @@ build_style() { styles() { echo '[!] Building styles' - build_style themes/default/less/style.less themes/default/css/style.css - build_style themes/default/less/style-rtl.less themes/default/css/style-rtl.css + build_style themes/legacy/less/style.less themes/legacy/css/style.css + build_style themes/legacy/less/style-rtl.less themes/legacy/css/style-rtl.css build_style themes/courgette/less/style.less themes/courgette/css/style.css build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css build_style less/bootstrap/bootstrap.less css/bootstrap.min.cssdiff --git a/requirements.txt b/requirements.txt@@ -9,4 +9,4 @@ pygments==2.1.3 pyopenssl==0.15.1 python-dateutil==2.5.3 pyyaml==3.11 -requests==2.10.0 +requests[socks]==2.10.0diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py@@ -57,11 +57,17 @@ def load_module(filename): def load_engine(engine_data): - engine_name = engine_data['engine'] + + if '_' in engine_data['name']: + logger.error('Engine name conains underscore: "{}"'.format(engine_data['name'])) + sys.exit(1) + + engine_module = engine_data['engine'] + try: - engine = load_module(engine_name + '.py') + engine = load_module(engine_module + '.py') except: - logger.exception('Cannot load engine "{}"'.format(engine_name)) + logger.exception('Cannot load engine "{}"'.format(engine_module)) return None for param_name in engine_data:diff --git a/searx/engines/dictzone.py b/searx/engines/dictzone.py@@ -0,0 +1,69 @@ +""" + Dictzone + + @website https://dictzone.com/ + @provide-api no + @using-api no + @results HTML (using search portal) + @stable no (HTML can change) + @parse url, title, content +""" + +import re +from urlparse import urljoin +from lxml import html +from cgi import escape +from searx.utils import is_valid_lang + +categories = ['general'] +url = u'http://dictzone.com/{from_lang}-{to_lang}-dictionary/{query}' +weight = 100 + +parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I) +results_xpath = './/table[@id="r"]/tr' + + +def request(query, params): + m = parser_re.match(unicode(query, 'utf8')) + if not m: + return params + + from_lang, to_lang, query = m.groups() + + from_lang = is_valid_lang(from_lang) + to_lang = is_valid_lang(to_lang) + + if not from_lang or not to_lang: + return params + + params['url'] = url.format(from_lang=from_lang[2], + to_lang=to_lang[2], + query=query) + + return params + + +def response(resp): + results = [] + + dom = html.fromstring(resp.text) + + for k, result in enumerate(dom.xpath(results_xpath)[1:]): + try: + from_result, to_results_raw = result.xpath('./td') + except: + continue + + to_results = [] + for to_result in to_results_raw.xpath('./p/a'): + t = to_result.text_content() + if t.strip(): + to_results.append(to_result.text_content()) + + results.append({ + 'url': urljoin(resp.url, '?%d' % k), + 'title': escape(from_result.text_content()), + 'content': escape('; '.join(to_results)) + }) + + return resultsdiff --git a/searx/engines/digbt.py b/searx/engines/digbt.py@@ -40,7 +40,7 @@ def response(resp): results = list() for result in search_res: url = urljoin(URL, result.xpath('.//a[@title]/@href')[0]) - title = result.xpath('.//a[@title]/text()')[0] + title = extract_text(result.xpath('.//a[@title]')) content = extract_text(result.xpath('.//div[@class="files"]')) files_data = extract_text(result.xpath('.//div[@class="tail"]')).split() filesize = get_torrent_size(files_data[FILESIZE], files_data[FILESIZE_MULTIPLIER])diff --git a/searx/engines/translated.py b/searx/engines/translated.py@@ -0,0 +1,65 @@ +""" + MyMemory Translated + + @website https://mymemory.translated.net/ + @provide-api yes (https://mymemory.translated.net/doc/spec.php) + @using-api yes + @results JSON + @stable yes + @parse url, title, content +""" +import re +from cgi import escape +from searx.utils import is_valid_lang + +categories = ['general'] +url = u'http://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}' +web_url = u'http://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}' +weight = 100 + +parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I) +api_key = '' + + +def request(query, params): + m = parser_re.match(unicode(query, 'utf8')) + if not m: + return params + + from_lang, to_lang, query = m.groups() + + from_lang = is_valid_lang(from_lang) + to_lang = is_valid_lang(to_lang) + + if not from_lang or not to_lang: + return params + + if api_key: + key_form = '&key=' + api_key + else: + key_form = '' + params['url'] = url.format(from_lang=from_lang[1], + to_lang=to_lang[1], + query=query, + key=key_form) + params['query'] = query + params['from_lang'] = from_lang + params['to_lang'] = to_lang + + return params + + +def response(resp): + results = [] + results.append({ + 'url': escape(web_url.format( + from_lang=resp.search_params['from_lang'][2], + to_lang=resp.search_params['to_lang'][2], + query=resp.search_params['query'])), + 'title': escape('[{0}-{1}] {2}'.format( + resp.search_params['from_lang'][1], + resp.search_params['to_lang'][1], + resp.search_params['query'])), + 'content': escape(resp.json()['responseData']['translatedText']) + }) + return resultsdiff --git a/searx/engines/wolframalpha_api.py b/searx/engines/wolframalpha_api.py@@ -18,10 +18,10 @@ api_key = '' # defined in settings.yml # xpath variables failure_xpath = '/queryresult[attribute::success="false"]' -answer_xpath = '//pod[attribute::primary="true"]/subpod/plaintext' input_xpath = '//pod[starts-with(attribute::id, "Input")]/subpod/plaintext' pods_xpath = '//pod' subpods_xpath = './subpod' +pod_primary_xpath = './@primary' pod_id_xpath = './@id' pod_title_xpath = './@title' plaintext_xpath = './plaintext' @@ -75,13 +75,15 @@ def response(resp): try: infobox_title = search_results.xpath(input_xpath)[0].text except: - infobox_title = None + infobox_title = "" pods = search_results.xpath(pods_xpath) result_chunks = [] + result_content = "" for pod in pods: pod_id = pod.xpath(pod_id_xpath)[0] pod_title = pod.xpath(pod_title_xpath)[0] + pod_is_result = pod.xpath(pod_primary_xpath) subpods = pod.xpath(subpods_xpath) if not subpods: @@ -94,6 +96,10 @@ def response(resp): if content and pod_id not in image_pods: + if pod_is_result or not result_content: + if pod_id != "Input": + result_content = "%s: %s" % (pod_title, content) + # if no input pod was found, title is first plaintext pod if not infobox_title: infobox_title = content @@ -109,6 +115,8 @@ def response(resp): if not result_chunks: return [] + title = "Wolfram|Alpha (%s)" % infobox_title + # append infobox results.append({'infobox': infobox_title, 'attributes': result_chunks, @@ -116,7 +124,7 @@ def response(resp): # append link to site results.append({'url': resp.request.headers['Referer'].decode('utf8'), - 'title': 'Wolfram|Alpha', - 'content': infobox_title}) + 'title': title, + 'content': result_content}) return resultsdiff --git a/searx/engines/wolframalpha_noapi.py b/searx/engines/wolframalpha_noapi.py@@ -8,9 +8,11 @@ # @stable no # @parse url, infobox +from cgi import escape from json import loads from time import time from urllib import urlencode +from lxml.etree import XML from searx.poolrequests import get as http_get @@ -34,7 +36,7 @@ search_url = url + 'input/json.jsp'\ referer_url = url + 'input/?{query}' token = {'value': '', - 'last_updated': 0} + 'last_updated': None} # pods to display as image in infobox # this pods do return a plaintext, but they look better and are more useful as images @@ -80,10 +82,12 @@ def response(resp): # TODO handle resp_json['queryresult']['assumptions'] result_chunks = [] - infobox_title = None + infobox_title = "" + result_content = "" for pod in resp_json['queryresult']['pods']: pod_id = pod.get('id', '') pod_title = pod.get('title', '') + pod_is_result = pod.get('primary', None) if 'subpods' not in pod: continue @@ -97,6 +101,10 @@ def response(resp): if subpod['plaintext'] != '(requires interactivity)': result_chunks.append({'label': pod_title, 'value': subpod['plaintext']}) + if pod_is_result or not result_content: + if pod_id != "Input": + result_content = pod_title + ': ' + subpod['plaintext'] + elif 'img' in subpod: result_chunks.append({'label': pod_title, 'image': subpod['img']}) @@ -108,7 +116,7 @@ def response(resp): 'urls': [{'title': 'Wolfram|Alpha', 'url': resp.request.headers['Referer'].decode('utf8')}]}) results.append({'url': resp.request.headers['Referer'].decode('utf8'), - 'title': 'Wolfram|Alpha', - 'content': infobox_title}) + 'title': 'Wolfram|Alpha (' + infobox_title + ')', + 'content': result_content}) return resultsdiff --git a/searx/search.py b/searx/search.py@@ -19,6 +19,7 @@ import gc import threading from thread import start_new_thread from time import time +from uuid import uuid4 import searx.poolrequests as requests_lib from searx.engines import ( categories, engines @@ -56,19 +57,20 @@ def search_request_wrapper(fn, url, engine_name, **kwargs): def threaded_requests(requests): timeout_limit = max(r[2]['timeout'] for r in requests) search_start = time() + search_id = uuid4().__str__() for fn, url, request_args, engine_name in requests: request_args['timeout'] = timeout_limit th = threading.Thread( target=search_request_wrapper, args=(fn, url, engine_name), kwargs=request_args, - name='search_request', + name=search_id, ) th._engine_name = engine_name th.start() for th in threading.enumerate(): - if th.name == 'search_request': + if th.name == search_id: remaining_time = max(0.0, timeout_limit - (time() - search_start)) th.join(remaining_time) if th.isAlive():diff --git a/searx/settings.yml b/searx/settings.yml@@ -25,7 +25,7 @@ outgoing: # communication with search engines pool_maxsize : 10 # Number of simultaneous requests by host # uncomment below section if you want to use a proxy # see http://docs.python-requests.org/en/latest/user/advanced/#proxies -# SOCKS proxies are not supported : see https://github.com/kennethreitz/requests/pull/478 +# SOCKS proxies are also supported: see http://docs.python-requests.org/en/master/user/advanced/#socks # proxies : # http : http://127.0.0.1:8080 # https: http://127.0.0.1:8080 @@ -377,7 +377,7 @@ engines: timeout : 10.0 disabled : True - - name : scanr_structures + - name : scanr structures shortcut: scs engine : scanr_structures disabled : True @@ -450,9 +450,9 @@ engines: # - name : urbandictionary # engine : xpath # search_url : http://www.urbandictionary.com/define.php?term={query} -# url_xpath : //div[@class="word"]//a/@href -# title_xpath : //div[@class="word"]//a -# content_xpath : //div[@class="definition"] +# url_xpath : //*[@class="word"]/@href +# title_xpath : //*[@class="def-header"] +# content_xpath : //*[@class="meaning"] # shortcut : ud - name : yahoo @@ -500,6 +500,19 @@ engines: shortcut: speu disabled: True + - name : dictzone + engine : dictzone + shortcut : dc + + - name : mymemory translated + engine : translated + shortcut : tl + timeout : 5.0 + disabled : True + # You can use without an API key, but you are limited to 1000 words/day + # See : http://mymemory.translated.net/doc/usagelimits.php + # api_key : '' + #The blekko technology and team have joined IBM Watson! -> https://blekko.com/ # - name : blekko images # engine : blekko_imagesdiff --git a/searx/settings_robot.yml b/searx/settings_robot.yml@@ -15,7 +15,7 @@ server: ui: themes_path : "" - default_theme : default + default_theme : legacy default_locale : "" outgoing: @@ -23,12 +23,12 @@ outgoing: useragent_suffix : "" engines: - - name : general_dummy + - name : general dummy engine : dummy categories : general shortcut : gd - - name : dummy_dummy + - name : dummy dummy engine : dummy categories : dummy shortcut : dddiff --git a/searx/static/themes/default/css/style-rtl.css b/searx/static/themes/legacy/css/style-rtl.cssdiff --git a/searx/static/themes/default/css/style.css b/searx/static/themes/legacy/css/style.cssdiff --git a/searx/static/themes/default/img/favicon.png b/searx/static/themes/legacy/img/favicon.pngBinary files differ.diff --git a/searx/static/themes/default/img/github_ribbon.png b/searx/static/themes/legacy/img/github_ribbon.pngBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_500px.ico b/searx/static/themes/legacy/img/icons/icon_500px.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_bing.ico b/searx/static/themes/legacy/img/icons/icon_bing.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_dailymotion.ico b/searx/static/themes/legacy/img/icons/icon_dailymotion.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_deezer.ico b/searx/static/themes/legacy/img/icons/icon_deezer.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_deviantart.ico b/searx/static/themes/legacy/img/icons/icon_deviantart.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_digg.ico b/searx/static/themes/legacy/img/icons/icon_digg.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_duckduckgo.ico b/searx/static/themes/legacy/img/icons/icon_duckduckgo.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_flickr.ico b/searx/static/themes/legacy/img/icons/icon_flickr.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_github.ico b/searx/static/themes/legacy/img/icons/icon_github.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_google play apps.ico b/searx/static/themes/legacy/img/icons/icon_google play apps.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_google play movies.ico b/searx/static/themes/legacy/img/icons/icon_google play movies.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_google play music.ico b/searx/static/themes/legacy/img/icons/icon_google play music.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_google.ico b/searx/static/themes/legacy/img/icons/icon_google.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_kickass.ico b/searx/static/themes/legacy/img/icons/icon_kickass.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_openstreetmap.ico b/searx/static/themes/legacy/img/icons/icon_openstreetmap.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_searchcode code.ico b/searx/static/themes/legacy/img/icons/icon_searchcode code.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_searchcode doc.ico b/searx/static/themes/legacy/img/icons/icon_searchcode doc.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_searchcode.ico b/searx/static/themes/legacy/img/icons/icon_searchcode.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_soundcloud.ico b/searx/static/themes/legacy/img/icons/icon_soundcloud.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_stackoverflow.ico b/searx/static/themes/legacy/img/icons/icon_stackoverflow.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_startpage.ico b/searx/static/themes/legacy/img/icons/icon_startpage.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_subtitleseeker.ico b/searx/static/themes/legacy/img/icons/icon_subtitleseeker.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_twitter.ico b/searx/static/themes/legacy/img/icons/icon_twitter.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_vimeo.ico b/searx/static/themes/legacy/img/icons/icon_vimeo.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_wikipedia.ico b/searx/static/themes/legacy/img/icons/icon_wikipedia.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_yahoo.ico b/searx/static/themes/legacy/img/icons/icon_yahoo.icoBinary files differ.diff --git a/searx/static/themes/default/img/icons/icon_youtube.ico b/searx/static/themes/legacy/img/icons/icon_youtube.icoBinary files differ.diff --git a/searx/static/themes/default/img/preference-icon.png b/searx/static/themes/legacy/img/preference-icon.pngBinary files differ.diff --git a/searx/static/themes/default/img/search-icon.png b/searx/static/themes/legacy/img/search-icon.pngBinary files differ.diff --git a/searx/static/themes/default/img/searx.png b/searx/static/themes/legacy/img/searx.pngBinary files differ.diff --git a/searx/static/themes/default/img/searx_logo.svg b/searx/static/themes/legacy/img/searx_logo.svgdiff --git a/searx/static/themes/default/js/searx.js b/searx/static/themes/legacy/js/searx.jsdiff --git a/searx/static/themes/default/less/autocompleter.less b/searx/static/themes/legacy/less/autocompleter.lessdiff --git a/searx/static/themes/default/less/code.less b/searx/static/themes/legacy/less/code.lessdiff --git a/searx/static/themes/default/less/definitions.less b/searx/static/themes/legacy/less/definitions.lessdiff --git a/searx/static/themes/default/less/mixins.less b/searx/static/themes/legacy/less/mixins.lessdiff --git a/searx/static/themes/default/less/search.less b/searx/static/themes/legacy/less/search.lessdiff --git a/searx/static/themes/default/less/style-rtl.less b/searx/static/themes/legacy/less/style-rtl.lessdiff --git a/searx/static/themes/default/less/style.less b/searx/static/themes/legacy/less/style.lessdiff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css@@ -1 +1 @@ -.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{background:#29314d;color:#01d7d4}.navbar>li>a{padding:0;margin:0}.navbar-nav>li>a{background:#29314d;padding:0 8px;margin:0;line-height:30px}.navbar,.navbar-default{background-color:#29314d;border:none;border-top:4px solid #01d7d4;padding-top:5px;color:#f6f9fa!important;font-weight:700;font-size:1.1em;text-transform:lowercase;margin-bottom:24px;height:30px;line-height:30px;z-index:10}.navbar .navbar-nav>li>a,.navbar-default .navbar-nav>li>a{color:#f6f9fa}.navbar .navbar-brand,.navbar-default .navbar-brand{font-weight:700;color:#01d7d4;line-height:30px;padding:0 30px;margin:0}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#01d7d4;background:#29314d}.navbar-toggle{margin-top:0}*{border-radius:0!important}html{position:relative;min-height:100%;color:#29314d}body{font-family:Roboto,Helvetica,Arial,sans-serif;margin-bottom:80px;background-color:#fff}body a{color:#08c}.footer{position:absolute;bottom:0;width:100%;height:60px;text-align:center;color:#999}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.onoff-checkbox{width:15%}.onoffswitch{position:relative;width:110px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #FFF!important;border-radius:50px!important}.onoffswitch-inner{display:block;transition:margin .3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:30px;padding:0;line-height:40px;font-size:20px;box-sizing:border-box;content:"";background-color:#EEE}.onoffswitch-switch{display:block;width:37px;background-color:#01d7d4;position:absolute;top:0;bottom:0;right:0;border:2px solid #FFF!important;border-radius:50px!important;transition:all .3s ease-in 0s}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-right:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:71px;background-color:#A1A1A1}.result_header{margin-top:6px;margin-bottom:4px;font-size:16px}.result_header .favicon{margin-bottom:-3px}.result_header a{color:#29314d;text-decoration:none}.result_header a:hover{color:#08c}.result_header a:visited{color:#684898}.result_header a .highlight{background-color:#f6f9fa}.result-content{margin-top:2px;margin-bottom:0;word-wrap:break-word;color:#666;font-size:13px}.result-content .highlight{font-weight:700}.external-link,.external-link a{color:#2ecc71}.external-link a,.external-link a a{margin-right:3px}.result-default,.result-code,.result-torrent,.result-videos,.result-map{clear:both;padding:2px 4px}.result-default:hover,.result-code:hover,.result-torrent:hover,.result-videos:hover,.result-map:hover{background-color:#f6f9fa}.result-images{float:left!important;width:24%;margin:.5%}.result-images a{display:block;width:100%;height:170px;background-size:cover}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-videos hr{margin:5px 0 15px 0}.result-videos .collapse{width:100%}.result-videos .in{margin-bottom:8px}.result-torrent{clear:both}.result-torrent b{margin-right:5px;margin-left:5px}.result-torrent .seeders{color:#2ecc71}.result-torrent .leechers{color:#f35e77}.result-map{clear:both}.result-code{clear:both}.result-code .code-fork,.result-code .code-fork a{color:#666}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:60px}.label-default{color:#a4a4a4;background:0 0}.infobox .panel-heading{background-color:#f6f9fa}.infobox .panel-heading .panel-title{font-weight:700}.infobox p{font-family:"DejaVu Serif",Georgia,Cambria,"Times New Roman",Times,serif!important;font-style:italic}.infobox .btn{background-color:#2ecc71;border:none}.infobox .btn a{color:#fff;margin:5px}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories,#categories{text-transform:capitalize;margin-bottom:.5rem;display:flex;flex-wrap:wrap;flex-flow:row wrap;align-content:stretch}.search_categories label,#categories label,.search_categories .input-group-addon,#categories .input-group-addon{flex-grow:1;flex-basis:auto;font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;border-right:none;color:#666;padding-bottom:.4rem;padding-top:.4rem;text-align:center}.search_categories label:last-child,#categories label:last-child,.search_categories .input-group-addon:last-child,#categories .input-group-addon:last-child{border-right:#ddd 1px solid}.search_categories input[type=checkbox]:checked+label,#categories input[type=checkbox]:checked+label{color:#29314d;font-weight:700;border-bottom:#01d7d4 5px solid}#main-logo{margin-top:10vh;margin-bottom:25px}#main-logo>img{max-width:350px;width:80%}#q{box-shadow:none;border-right:none;border-color:#a4a4a4}#search_form .input-group-btn .btn{border-color:#a4a4a4}#search_form .input-group-btn .btn:hover{background-color:#2ecc71;color:#fff}#advanced-search-container{display:none;text-align:left;margin-bottom:1rem;clear:both}#advanced-search-container label,#advanced-search-container .input-group-addon{font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;border-right:none;color:#666;padding-bottom:.4rem;padding-right:.7rem;padding-left:.7rem}#advanced-search-container label:last-child,#advanced-search-container .input-group-addon:last-child{border-right:#ddd 1px solid}#advanced-search-container input[type=radio]{display:none}#advanced-search-container input[type=radio]:checked+label{color:#29314d;font-weight:700;border-bottom:#01d7d4 5px solid}#advanced-search-container select{appearance:none;-webkit-appearance:none;-moz-appearance:none;font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;color:#666;padding-bottom:.4rem;padding-top:.4rem;padding-left:1rem;padding-right:5rem;margin-right:.5rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGnsAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW86/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNy0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC) 96% no-repeat}#check-advanced{display:none}#check-advanced:checked~#advanced-search-container{display:block}.advanced{padding:0;margin-top:.3rem;text-align:right}.advanced label,.advanced select{cursor:pointer}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}pre,code{font-family:'Ubuntu Mono','Courier New','Lucida Console',monospace!important}.lineno{margin-right:5px}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#556366;font-style:italic}.highlight .err{border:1px solid #ffa92f}.highlight .k{color:#BE74D5;font-weight:700}.highlight .o{color:#d19a66}.highlight .cm{color:#556366;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#556366;font-style:italic}.highlight .cs{color:#556366;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:#BE74D5;font-weight:700}.highlight .kd{color:#BE74D5;font-weight:700}.highlight .kn{color:#BE74D5;font-weight:700}.highlight .kp{color:#be74d5}.highlight .kr{color:#BE74D5;font-weight:700}.highlight .kt{color:#d46c72}.highlight .m{color:#d19a66}.highlight .s{color:#86c372}.highlight .na{color:#7d9029}.highlight .nb{color:#be74d5}.highlight .nc{color:#61AFEF;font-weight:700}.highlight .no{color:#d19a66}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#61afef}.highlight .nl{color:#a0a000}.highlight .nn{color:#61AFEF;font-weight:700}.highlight .nt{color:#BE74D5;font-weight:700}.highlight .nv{color:#dfc06f}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#d7dae0}.highlight .mf{color:#d19a66}.highlight .mh{color:#d19a66}.highlight .mi{color:#d19a66}.highlight .mo{color:#d19a66}.highlight .sb{color:#86c372}.highlight .sc{color:#86c372}.highlight .sd{color:#86C372;font-style:italic}.highlight .s2{color:#86c372}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#86c372}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:#be74d5}.highlight .sr{color:#b68}.highlight .s1{color:#86c372}.highlight .ss{color:#dfc06f}.highlight .bp{color:#be74d5}.highlight .vc{color:#dfc06f}.highlight .vg{color:#dfc06f}.highlight .vi{color:#dfc06f}.highlight .il{color:#d19a66}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;color:#556366}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}.highlight pre{background-color:#282C34;color:#D7DAE0;border:none;margin-bottom:25px;font-size:15px;padding:20px 10px}.highlight{font-weight:700} -\ No newline at end of file +.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{background:#29314d;color:#01d7d4}.navbar>li>a{padding:0;margin:0}.navbar-nav>li>a{background:#29314d;padding:0 8px;margin:0;line-height:30px}.navbar,.navbar-default{background-color:#29314d;border:none;border-top:4px solid #01d7d4;padding-top:5px;color:#f6f9fa!important;font-weight:700;font-size:1.1em;text-transform:lowercase;margin-bottom:24px;height:30px;line-height:30px;z-index:10}.navbar .navbar-nav>li>a,.navbar-default .navbar-nav>li>a{color:#f6f9fa}.navbar .navbar-brand,.navbar-default .navbar-brand{font-weight:700;color:#01d7d4;line-height:30px;padding:0 30px;margin:0}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#01d7d4;background:#29314d}.navbar-toggle{margin-top:0}*{border-radius:0!important}html{position:relative;min-height:100%;color:#29314d}body{font-family:Roboto,Helvetica,Arial,sans-serif;margin-bottom:80px;background-color:#fff}body a{color:#08c}.footer{position:absolute;bottom:0;width:100%;height:60px;text-align:center;color:#999}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.onoff-checkbox{width:15%}.onoffswitch{position:relative;width:110px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #FFF!important;border-radius:50px!important}.onoffswitch-inner{display:block;transition:margin .3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:30px;padding:0;line-height:40px;font-size:20px;box-sizing:border-box;content:"";background-color:#EEE}.onoffswitch-switch{display:block;width:37px;background-color:#01d7d4;position:absolute;top:0;bottom:0;right:0;border:2px solid #FFF!important;border-radius:50px!important;transition:all .3s ease-in 0s}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-right:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:71px;background-color:#A1A1A1}.result_header{margin-top:6px;margin-bottom:4px;font-size:16px}.result_header .favicon{margin-bottom:-3px}.result_header a{color:#29314d;text-decoration:none}.result_header a:hover{color:#08c}.result_header a:visited{color:#684898}.result_header a .highlight{background-color:#f6f9fa}.result-content{margin-top:2px;margin-bottom:0;word-wrap:break-word;color:#666;font-size:13px}.result-content .highlight{font-weight:700}.external-link,.external-link a{color:#2ecc71}.external-link a,.external-link a a{margin-right:3px}.result-default,.result-code,.result-torrent,.result-videos,.result-map{clear:both;padding:2px 4px}.result-default:hover,.result-code:hover,.result-torrent:hover,.result-videos:hover,.result-map:hover{background-color:#f6f9fa}.result-images{float:left!important;width:24%;margin:.5%}.result-images a{display:block;width:100%;background-size:cover}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-videos hr{margin:5px 0 15px 0}.result-videos .collapse{width:100%}.result-videos .in{margin-bottom:8px}.result-torrent{clear:both}.result-torrent b{margin-right:5px;margin-left:5px}.result-torrent .seeders{color:#2ecc71}.result-torrent .leechers{color:#f35e77}.result-map{clear:both}.result-code{clear:both}.result-code .code-fork,.result-code .code-fork a{color:#666}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:60px}.label-default{color:#a4a4a4;background:0 0}.result .text-muted small{word-wrap:break-word}.modal-wrapper{box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-wrapper{background-clip:padding-box;background-color:#fff;border:1px solid rgba(0,0,0,.2);border-radius:6px;box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0 none;position:relative}.infobox .panel-heading{background-color:#f6f9fa}.infobox .panel-heading .panel-title{font-weight:700}.infobox p{font-family:"DejaVu Serif",Georgia,Cambria,"Times New Roman",Times,serif!important;font-style:italic}.infobox .btn{background-color:#2ecc71;border:none}.infobox .btn a{color:#fff;margin:5px}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories,#categories{text-transform:capitalize;margin-bottom:.5rem;display:flex;flex-wrap:wrap;flex-flow:row wrap;align-content:stretch}.search_categories label,#categories label,.search_categories .input-group-addon,#categories .input-group-addon{flex-grow:1;flex-basis:auto;font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;border-right:none;color:#666;padding-bottom:.4rem;padding-top:.4rem;text-align:center}.search_categories label:last-child,#categories label:last-child,.search_categories .input-group-addon:last-child,#categories .input-group-addon:last-child{border-right:#ddd 1px solid}.search_categories input[type=checkbox]:checked+label,#categories input[type=checkbox]:checked+label{color:#29314d;font-weight:700;border-bottom:#01d7d4 5px solid}#main-logo{margin-top:10vh;margin-bottom:25px}#main-logo>img{max-width:350px;width:80%}#q{box-shadow:none;border-right:none;border-color:#a4a4a4}#search_form .input-group-btn .btn{border-color:#a4a4a4}#search_form .input-group-btn .btn:hover{background-color:#2ecc71;color:#fff}#advanced-search-container{display:none;text-align:left;margin-bottom:1rem;clear:both}#advanced-search-container label,#advanced-search-container .input-group-addon{font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;border-right:none;color:#666;padding-bottom:.4rem;padding-right:.7rem;padding-left:.7rem}#advanced-search-container label:last-child,#advanced-search-container .input-group-addon:last-child{border-right:#ddd 1px solid}#advanced-search-container input[type=radio]{display:none}#advanced-search-container input[type=radio]:checked+label{color:#29314d;font-weight:700;border-bottom:#01d7d4 5px solid}#advanced-search-container select{appearance:none;-webkit-appearance:none;-moz-appearance:none;font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;color:#666;padding-bottom:.4rem;padding-top:.4rem;padding-left:1rem;padding-right:5rem;margin-right:.5rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGnsAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW86/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNy0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC) 96% no-repeat}#check-advanced{display:none}#check-advanced:checked~#advanced-search-container{display:block}.advanced{padding:0;margin-top:.3rem;text-align:right}.advanced label,.advanced select{cursor:pointer}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}pre,code{font-family:'Ubuntu Mono','Courier New','Lucida Console',monospace!important}.lineno{margin-right:5px}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#556366;font-style:italic}.highlight .err{border:1px solid #ffa92f}.highlight .k{color:#BE74D5;font-weight:700}.highlight .o{color:#d19a66}.highlight .cm{color:#556366;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#556366;font-style:italic}.highlight .cs{color:#556366;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:#BE74D5;font-weight:700}.highlight .kd{color:#BE74D5;font-weight:700}.highlight .kn{color:#BE74D5;font-weight:700}.highlight .kp{color:#be74d5}.highlight .kr{color:#BE74D5;font-weight:700}.highlight .kt{color:#d46c72}.highlight .m{color:#d19a66}.highlight .s{color:#86c372}.highlight .na{color:#7d9029}.highlight .nb{color:#be74d5}.highlight .nc{color:#61AFEF;font-weight:700}.highlight .no{color:#d19a66}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#61afef}.highlight .nl{color:#a0a000}.highlight .nn{color:#61AFEF;font-weight:700}.highlight .nt{color:#BE74D5;font-weight:700}.highlight .nv{color:#dfc06f}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#d7dae0}.highlight .mf{color:#d19a66}.highlight .mh{color:#d19a66}.highlight .mi{color:#d19a66}.highlight .mo{color:#d19a66}.highlight .sb{color:#86c372}.highlight .sc{color:#86c372}.highlight .sd{color:#86C372;font-style:italic}.highlight .s2{color:#86c372}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#86c372}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:#be74d5}.highlight .sr{color:#b68}.highlight .s1{color:#86c372}.highlight .ss{color:#dfc06f}.highlight .bp{color:#be74d5}.highlight .vc{color:#dfc06f}.highlight .vg{color:#dfc06f}.highlight .vi{color:#dfc06f}.highlight .il{color:#d19a66}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;color:#556366}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}.highlight pre{background-color:#282C34;color:#D7DAE0;border:none;margin-bottom:25px;font-size:15px;padding:20px 10px}.highlight{font-weight:700} +\ No newline at end of filediff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css@@ -1 +1 @@ -html{position:relative;min-height:100%}body{margin-bottom:80px}.footer{position:absolute;bottom:0;width:100%;height:60px}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.onoff-checkbox{width:15%}.onoffswitch{position:relative;width:110px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #FFF!important;border-radius:50px!important}.onoffswitch-inner{display:block;transition:margin .3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:30px;padding:0;line-height:40px;font-size:20px;box-sizing:border-box;content:"";background-color:#EEE}.onoffswitch-switch{display:block;width:37px;background-color:#0C0;position:absolute;top:0;bottom:0;right:0;border:2px solid #FFF!important;border-radius:50px!important;transition:all .3s ease-in 0s}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-right:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:71px;background-color:#A1A1A1}.result_header{margin-bottom:5px;margin-top:20px}.result_header .favicon{margin-bottom:-3px}.result_header a{vertical-align:bottom}.result_header a .highlight{font-weight:700}.result-content{margin-top:5px;word-wrap:break-word}.result-content .highlight{font-weight:700}.result-default{clear:both}.result-images{float:left!important}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-torrents{clear:both}.result-map{clear:both}.result-code{clear:both}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:50px}.label-default{color:#AAA;background:#FFF}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories,#categories{text-transform:capitalize;margin-bottom:1.5rem;margin-top:1.5rem;display:flex;flex-wrap:wrap;align-content:stretch}.search_categories label,#categories label,.search_categories .input-group-addon,#categories .input-group-addon{flex-grow:1;flex-basis:auto;font-size:1.3rem;font-weight:400;background-color:#fff;border:#DDD 1px solid;border-right:none;color:#333;padding-bottom:.8rem;padding-top:.8rem;text-align:center}.search_categories label:last-child,#categories label:last-child,.search_categories .input-group-addon:last-child,#categories .input-group-addon:last-child{border-right:#DDD 1px solid}.search_categories input[type=checkbox]:checked+label,#categories input[type=checkbox]:checked+label{color:#000;font-weight:700;background-color:#EEE}#advanced-search-container{display:none;text-align:center;margin-bottom:1rem;clear:both}#advanced-search-container label,#advanced-search-container .input-group-addon{font-size:1.3rem;font-weight:400;background-color:#fff;border:#DDD 1px solid;border-right:none;color:#333;padding-bottom:.8rem;padding-left:1.2rem;padding-right:1.2rem}#advanced-search-container label:last-child,#advanced-search-container .input-group-addon:last-child{border-right:#DDD 1px solid}#advanced-search-container input[type=radio]{display:none}#advanced-search-container input[type=radio]:checked+label{color:#000;font-weight:700;background-color:#EEE}#check-advanced{display:none}#check-advanced:checked~#advanced-search-container{display:block}.advanced{padding:0;margin-top:.3rem;text-align:right}.advanced label,.advanced select{cursor:pointer}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080;font-style:italic}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:green;font-weight:700}.highlight .kd{color:green;font-weight:700}.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177c}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#BA2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#ba2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:green}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0} -\ No newline at end of file +html{position:relative;min-height:100%}body{margin-bottom:80px}.footer{position:absolute;bottom:0;width:100%;height:60px}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.onoff-checkbox{width:15%}.onoffswitch{position:relative;width:110px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #FFF!important;border-radius:50px!important}.onoffswitch-inner{display:block;transition:margin .3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:30px;padding:0;line-height:40px;font-size:20px;box-sizing:border-box;content:"";background-color:#EEE}.onoffswitch-switch{display:block;width:37px;background-color:#0C0;position:absolute;top:0;bottom:0;right:0;border:2px solid #FFF!important;border-radius:50px!important;transition:all .3s ease-in 0s}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-right:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:71px;background-color:#A1A1A1}.result_header{margin-bottom:5px;margin-top:20px}.result_header .favicon{margin-bottom:-3px}.result_header a{vertical-align:bottom}.result_header a .highlight{font-weight:700}.result-content{margin-top:5px;word-wrap:break-word}.result-content .highlight{font-weight:700}.result-default{clear:both}.result-images{float:left!important}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-torrents{clear:both}.result-map{clear:both}.result-code{clear:both}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:50px}.label-default{color:#AAA;background:#FFF}.result .text-muted small{word-wrap:break-word}.modal-wrapper{box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-wrapper{background-clip:padding-box;background-color:#fff;border:1px solid rgba(0,0,0,.2);border-radius:6px;box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0 none;position:relative}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories,#categories{text-transform:capitalize;margin-bottom:1.5rem;margin-top:1.5rem;display:flex;flex-wrap:wrap;align-content:stretch}.search_categories label,#categories label,.search_categories .input-group-addon,#categories .input-group-addon{flex-grow:1;flex-basis:auto;font-size:1.3rem;font-weight:400;background-color:#fff;border:#DDD 1px solid;border-right:none;color:#333;padding-bottom:.8rem;padding-top:.8rem;text-align:center}.search_categories label:last-child,#categories label:last-child,.search_categories .input-group-addon:last-child,#categories .input-group-addon:last-child{border-right:#DDD 1px solid}.search_categories input[type=checkbox]:checked+label,#categories input[type=checkbox]:checked+label{color:#000;font-weight:700;background-color:#EEE}#advanced-search-container{display:none;text-align:center;margin-bottom:1rem;clear:both}#advanced-search-container label,#advanced-search-container .input-group-addon{font-size:1.3rem;font-weight:400;background-color:#fff;border:#DDD 1px solid;border-right:none;color:#333;padding-bottom:.8rem;padding-left:1.2rem;padding-right:1.2rem}#advanced-search-container label:last-child,#advanced-search-container .input-group-addon:last-child{border-right:#DDD 1px solid}#advanced-search-container input[type=radio]{display:none}#advanced-search-container input[type=radio]:checked+label{color:#000;font-weight:700;background-color:#EEE}#check-advanced{display:none}#check-advanced:checked~#advanced-search-container{display:block}.advanced{padding:0;margin-top:.3rem;text-align:right}.advanced label,.advanced select{cursor:pointer}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080;font-style:italic}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:green;font-weight:700}.highlight .kd{color:green;font-weight:700}.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177c}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#BA2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#ba2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:green}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0} +\ No newline at end of filediff --git a/searx/static/themes/oscar/less/logicodev/results.less b/searx/static/themes/oscar/less/logicodev/results.less@@ -6,7 +6,7 @@ .favicon { margin-bottom:-3px; } - + a { color: @black; text-decoration: none; @@ -18,7 +18,7 @@ &:visited{ color: @violet; } - + .highlight { background-color: @dim-gray; // Chrome hack: bold is different size than normal @@ -64,10 +64,9 @@ float: left !important; width: 24%; margin: .5%; - a{ + a { display: block; width: 100%; - height: 170px; background-size: cover; } } @@ -148,3 +147,21 @@ color: @gray; background: transparent; } + +.result .text-muted small { + word-wrap: break-word; +} + +.modal-wrapper { + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); +} + +.modal-wrapper { + background-clip: padding-box; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + outline: 0 none; + position: relative; +}diff --git a/searx/static/themes/oscar/less/pointhi/results.less b/searx/static/themes/oscar/less/pointhi/results.less@@ -6,10 +6,10 @@ .favicon { margin-bottom:-3px; } - + a { vertical-align: bottom; - + .highlight { font-weight:bold; } @@ -81,3 +81,21 @@ color: #AAA; background: #FFF; } + +.result .text-muted small { + word-wrap: break-word; +} + +.modal-wrapper { + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); +} + +.modal-wrapper { + background-clip: padding-box; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + outline: 0 none; + position: relative; +}diff --git a/searx/templates/default/404.html b/searx/templates/default/404.html@@ -1,9 +0,0 @@ -{% extends "default/base.html" %} -{% block content %} -<div class="center"> - <h1>{{ _('Page not found') }}</h1> - {% autoescape false %} - <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.decode('utf-8').format(url_for('index'), _('search page'))) }}</p> - {% endautoescape %} -</div> -{% endblock %}diff --git a/searx/templates/default/about.html b/searx/templates/default/about.html@@ -1,66 +0,0 @@ -{% extends 'default/base.html' %} -{% block content %} -{% include 'default/github_ribbon.html' %} -<div class="row"{% if rtl %} dir="ltr"{% endif %}> - <h1>About <a href="{{ url_for('index') }}">searx</a></h1> - - <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users. - </p> - <h2>Why use searx?</h2> - <ul> - <li>searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li> - <li>searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you</li> - <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li> - </ul> - <p>If you do care about privacy, want to be a conscious user, or otherwise believe - in digital freedom, make searx your default search engine or run it on your own server</p> - -<h2>Technical details - How does it work?</h2> - -<p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, -inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br /> -It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, if searx used from the search bar it performs GET requests.<br /> -Searx can be added to your browser's search bar; moreover, it can be set as the default search engine. -</p> - -<h2>How can I make it my own?</h2> - -<p>Searx appreciates your concern regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list</a> to help other people reclaim their privacy and make the Internet freer! -<br />The more decentralized Internet is the more freedom we have!</p> - - -<h2>More about searx</h2> - -<ul> - <li><a href="https://github.com/asciimoo/searx">github</a></li> - <li><a href="https://www.ohloh.net/p/searx/">ohloh</a></li> - <li><a href="https://twitter.com/Searx_engine">twitter</a></li> - <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li> - <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li> -</ul> - - -<hr /> - -<h2 id="faq">FAQ</h2> - -<h3>How to add to firefox?</h3> -<p><a href="#" onclick="window.external.AddSearchProvider(window.location.protocol + '//' + window.location.host + '{{ url_for('opensearch') }}');">Install</a> searx as a search engine on any version of Firefox! (javascript required)</p> - -<h2 id="dev_faq">Developer FAQ</h2> - -<h3>New engines?</h3> -<ul> - <li>Edit your <a href="https://raw.github.com/asciimoo/searx/master/searx/settings.yml">settings.yml</a></li> - <li>Create your custom engine module, check the <a href="https://github.com/asciimoo/searx/blob/master/examples/basic_engine.py">example engine</a></li> -</ul> -<p>Don't forget to restart searx after config edit!</p> - -<h3>Installation/WSGI support?</h3> -<p>See the <a href="https://github.com/asciimoo/searx/wiki/Installation">installation and setup</a> wiki page</p> - -<h3>How to debug engines?</h3> -<p><a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.</p> - -</div> -{% endblock %}diff --git a/searx/templates/default/index.html b/searx/templates/default/index.html@@ -1,18 +0,0 @@ -{% extends "default/base.html" %} -{% block content %} -<div class="center"> - <div class="title"><h1>searx</h1></div> - {% include 'default/search.html' %} - <p class="top_margin"> - {% if rtl %} - <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> - {% endif %} - <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a> - {% if not rtl %} - <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> - {% endif %} - </p> -</div> -{% include 'default/github_ribbon.html' %} -{% endblock %} -diff --git a/searx/templates/default/preferences.html b/searx/templates/default/preferences.html@@ -1,129 +0,0 @@ -{% extends "default/base.html" %} -{% block head %} {% endblock %} -{% block content %} -<div class="row"> - <h2>{{ _('Preferences') }}</h2> - - <form method="post" action="{{ url_for('preferences') }}" id="search_form"> - <fieldset> - <legend>{{ _('Default categories') }}</legend> - {% set display_tooltip = false %} - {% include 'default/categories.html' %} - </fieldset> - <fieldset> - <legend>{{ _('Search language') }}</legend> - <p> - <select name='language'> - <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> - {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %} - <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> - {% endfor %} - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('Interface language') }}</legend> - <p> - <select name='locale'> - {% for locale_id,locale_name in locales.items() | sort %} - <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> - {% endfor %} - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('Autocomplete') }}</legend> - <p> - <select name="autocomplete"> - <option value=""> - </option> - {% for backend in autocomplete_backends %} - <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> - {% endfor %} - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('Image proxy') }}</legend> - <p> - <select name='image_proxy'> - <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> - <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled') }}</option> - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('Method') }}</legend> - <p> - <select name='method'> - <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> - <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('SafeSearch') }}</legend> - <p> - <select name='safesearch'> - <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option> - <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option> - <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('Themes') }}</legend> - <p> - <select name="theme"> - {% for name in themes %} - <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> - {% endfor %} - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('Results on new tabs') }}</legend> - <p> - <select name='results_on_new_tab'> - <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option> - <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option> - </select> - </p> - </fieldset> - <fieldset> - <legend>{{ _('Currently used search engines') }}</legend> - - <table> - <tr> - <th>{{ _('Engine name') }}</th> - <th>{{ _('Category') }}</th> - <th>{{ _('Allow') }} / {{ _('Block') }}</th> - </tr> - {% for categ in all_categories %} - {% for search_engine in engines_by_category[categ] %} - - {% if not search_engine.private %} - <tr> - <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td> - <td>{{ _(categ) }}</td> - <td class="engine_checkbox"> - <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} /> - <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> - <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> - </td> - </tr> - {% endif %} - {% endfor %} - {% endfor %} - </table> - </fieldset> - <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} - <br /> - {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} - </p> - - <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('index') }}">{{ _('back') }}</a></div> - </form> -</div> -{% endblock %}diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html@@ -1,100 +0,0 @@ -{% extends "default/base.html" %} -{% block title %}{{ q }} - {% endblock %} -{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&format=rss&{% for category in selected_categories %}category_{{ category }}=1&{% endfor %}pageno={{ pageno }}">{% endblock %} -{% block content %} -<div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div> -<div class="small search center"> - {% include 'default/search.html' %} -</div> -<div id="results"> - <div id="sidebar"> - - <div id="search_url"> - {{ _('Search URL') }}: - <input type="text" value="{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}" readonly /> - </div> - <div id="apis"> - {{ _('Download results') }} - {% for output_type in ('csv', 'json', 'rss') %} - <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <div class="left"> - <input type="hidden" name="q" value="{{ q }}" /> - <input type="hidden" name="format" value="{{ output_type }}" /> - {% for category in selected_categories %} - <input type="hidden" name="category_{{ category }}" value="1"/> - {% endfor %} - <input type="hidden" name="pageno" value="{{ pageno }}" /> - <input type="submit" value="{{ output_type }}" /> - </div> - </form> - {% endfor %} - </div> - </div> - - {% if answers %} - <div id="answers"><span>{{ _('Answers') }}</span> - {% for answer in answers %} - <span>{{ answer }}</span> - {% endfor %} - </div> - {% endif %} - - {% if suggestions %} - <div id="suggestions"><span id="suggestions-title">{{ _('Suggestions') }} : </span> - {% set first = true %} - {% for suggestion in suggestions %} - {% if not first %} • {% endif %}<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <input type="hidden" name="q" value="{{ suggestion }}"> - <input type="submit" class="suggestion" value="{{ suggestion }}" /> - </form> - {% set first = false %} - {% endfor %} - </div> - {% endif %} - - {% if infoboxes %} - <div id="infoboxes"> - {% for infobox in infoboxes %} - {% include 'default/infobox.html' %} - {% endfor %} - </div> - {% endif %} - - {% for result in results %} - {% if result['template'] %} - {% include get_result_template('default', result['template']) %} - {% else %} - {% include 'default/result_templates/default.html' %} - {% endif %} - {% endfor %} - - {% if paging %} - <div id="pagination"> - {% if pageno > 1 %} - <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <div class="{% if rtl %}right{% else %}left{% endif %}"> - <input type="hidden" name="q" value="{{ q }}" /> - {% for category in selected_categories %} - <input type="hidden" name="category_{{ category }}" value="1"/> - {% endfor %} - <input type="hidden" name="pageno" value="{{ pageno-1 }}" /> - <input type="submit" value="<< {{ _('previous page') }}" /> - </div> - </form> - {% endif %} - <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <div class="{% if rtl %}left{% else %}right{% endif %}"> - {% for category in selected_categories %} - <input type="hidden" name="category_{{ category }}" value="1"/> - {% endfor %} - <input type="hidden" name="q" value="{{ q }}" /> - <input type="hidden" name="pageno" value="{{ pageno+1 }}" /> - <input type="submit" value="{{ _('next page') }} >>" /> - </div> - </form> - - <br /> - </div> - {% endif %} -</div> -{% endblock %}diff --git a/searx/templates/default/search.html b/searx/templates/default/search.html@@ -1,8 +0,0 @@ -<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form"> - <div id="search_wrapper"> - <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" size="100" {% if q %}value="{{ q }}"{% endif %}/> - <input type="submit" value="search" id="search_submit" /> - </div> - {% set display_tooltip = true %} - {% include 'default/categories.html' %} -</form>diff --git a/searx/templates/default/stats.html b/searx/templates/default/stats.html@@ -1,22 +0,0 @@ -{% extends "default/base.html" %} -{% block head %} {% endblock %} -{% block content %} -<h2>{{ _('Engine stats') }}</h2> - -{% for stat_name,stat_category in stats %} -<div class="left"> - <table> - <tr colspan="3"> - <th>{{ stat_name }}</th> - </tr> - {% for engine in stat_category %} - <tr> - <td>{{ engine.name }}</td> - <td>{{ '%.02f'|format(engine.avg) }}</td> - <td class="percentage"><div style="width: {{ engine.percentage }}%"> </div></td> - </tr> - {% endfor %} - </table> -</div> -{% endfor %} -{% endblock %}diff --git a/searx/templates/legacy/404.html b/searx/templates/legacy/404.html@@ -0,0 +1,9 @@ +{% extends "legacy/base.html" %} +{% block content %} +<div class="center"> + <h1>{{ _('Page not found') }}</h1> + {% autoescape false %} + <p>{{ _('Go to %(search_page)s.', search_page='<a href="{}">{}</a>'.decode('utf-8').format(url_for('index'), _('search page'))) }}</p> + {% endautoescape %} +</div> +{% endblock %}diff --git a/searx/templates/legacy/about.html b/searx/templates/legacy/about.html@@ -0,0 +1,66 @@ +{% extends 'legacy/base.html' %} +{% block content %} +{% include 'legacy/github_ribbon.html' %} +<div class="row"{% if rtl %} dir="ltr"{% endif %}> + <h1>About <a href="{{ url_for('index') }}">searx</a></h1> + + <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users. + </p> + <h2>Why use searx?</h2> + <ul> + <li>searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li> + <li>searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you</li> + <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li> + </ul> + <p>If you do care about privacy, want to be a conscious user, or otherwise believe + in digital freedom, make searx your default search engine or run it on your own server</p> + +<h2>Technical details - How does it work?</h2> + +<p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, +inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br /> +It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, if searx used from the search bar it performs GET requests.<br /> +Searx can be added to your browser's search bar; moreover, it can be set as the default search engine. +</p> + +<h2>How can I make it my own?</h2> + +<p>Searx appreciates your concern regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list</a> to help other people reclaim their privacy and make the Internet freer! +<br />The more decentralized Internet is the more freedom we have!</p> + + +<h2>More about searx</h2> + +<ul> + <li><a href="https://github.com/asciimoo/searx">github</a></li> + <li><a href="https://www.ohloh.net/p/searx/">ohloh</a></li> + <li><a href="https://twitter.com/Searx_engine">twitter</a></li> + <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li> + <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li> +</ul> + + +<hr /> + +<h2 id="faq">FAQ</h2> + +<h3>How to add to firefox?</h3> +<p><a href="#" onclick="window.external.AddSearchProvider(window.location.protocol + '//' + window.location.host + '{{ url_for('opensearch') }}');">Install</a> searx as a search engine on any version of Firefox! (javascript required)</p> + +<h2 id="dev_faq">Developer FAQ</h2> + +<h3>New engines?</h3> +<ul> + <li>Edit your <a href="https://raw.github.com/asciimoo/searx/master/searx/settings.yml">settings.yml</a></li> + <li>Create your custom engine module, check the <a href="https://github.com/asciimoo/searx/blob/master/examples/basic_engine.py">example engine</a></li> +</ul> +<p>Don't forget to restart searx after config edit!</p> + +<h3>Installation/WSGI support?</h3> +<p>See the <a href="https://github.com/asciimoo/searx/wiki/Installation">installation and setup</a> wiki page</p> + +<h3>How to debug engines?</h3> +<p><a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.</p> + +</div> +{% endblock %}diff --git a/searx/templates/default/base.html b/searx/templates/legacy/base.htmldiff --git a/searx/templates/default/categories.html b/searx/templates/legacy/categories.htmldiff --git a/searx/templates/default/github_ribbon.html b/searx/templates/legacy/github_ribbon.htmldiff --git a/searx/templates/legacy/index.html b/searx/templates/legacy/index.html@@ -0,0 +1,18 @@ +{% extends "legacy/base.html" %} +{% block content %} +<div class="center"> + <div class="title"><h1>searx</h1></div> + {% include 'legacy/search.html' %} + <p class="top_margin"> + {% if rtl %} + <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> + {% endif %} + <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a> + {% if not rtl %} + <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> + {% endif %} + </p> +</div> +{% include 'legacy/github_ribbon.html' %} +{% endblock %} +diff --git a/searx/templates/default/infobox.html b/searx/templates/legacy/infobox.htmldiff --git a/searx/templates/default/opensearch.xml b/searx/templates/legacy/opensearch.xmldiff --git a/searx/templates/default/opensearch_response_rss.xml b/searx/templates/legacy/opensearch_response_rss.xmldiff --git a/searx/templates/legacy/preferences.html b/searx/templates/legacy/preferences.html@@ -0,0 +1,129 @@ +{% extends "legacy/base.html" %} +{% block head %} {% endblock %} +{% block content %} +<div class="row"> + <h2>{{ _('Preferences') }}</h2> + + <form method="post" action="{{ url_for('preferences') }}" id="search_form"> + <fieldset> + <legend>{{ _('Default categories') }}</legend> + {% set display_tooltip = false %} + {% include 'legacy/categories.html' %} + </fieldset> + <fieldset> + <legend>{{ _('Search language') }}</legend> + <p> + <select name='language'> + <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> + {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %} + <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> + {% endfor %} + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('Interface language') }}</legend> + <p> + <select name='locale'> + {% for locale_id,locale_name in locales.items() | sort %} + <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> + {% endfor %} + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('Autocomplete') }}</legend> + <p> + <select name="autocomplete"> + <option value=""> - </option> + {% for backend in autocomplete_backends %} + <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> + {% endfor %} + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('Image proxy') }}</legend> + <p> + <select name='image_proxy'> + <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> + <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled') }}</option> + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('Method') }}</legend> + <p> + <select name='method'> + <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> + <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('SafeSearch') }}</legend> + <p> + <select name='safesearch'> + <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option> + <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option> + <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('Themes') }}</legend> + <p> + <select name="theme"> + {% for name in themes %} + <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> + {% endfor %} + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('Results on new tabs') }}</legend> + <p> + <select name='results_on_new_tab'> + <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option> + <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option> + </select> + </p> + </fieldset> + <fieldset> + <legend>{{ _('Currently used search engines') }}</legend> + + <table> + <tr> + <th>{{ _('Engine name') }}</th> + <th>{{ _('Category') }}</th> + <th>{{ _('Allow') }} / {{ _('Block') }}</th> + </tr> + {% for categ in all_categories %} + {% for search_engine in engines_by_category[categ] %} + + {% if not search_engine.private %} + <tr> + <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td> + <td>{{ _(categ) }}</td> + <td class="engine_checkbox"> + <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} /> + <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> + <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> + </td> + </tr> + {% endif %} + {% endfor %} + {% endfor %} + </table> + </fieldset> + <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} + <br /> + {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} + </p> + + <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('index') }}">{{ _('back') }}</a></div> + </form> +</div> +{% endblock %}diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/legacy/result_templates/code.htmldiff --git a/searx/templates/default/result_templates/default.html b/searx/templates/legacy/result_templates/default.htmldiff --git a/searx/templates/default/result_templates/images.html b/searx/templates/legacy/result_templates/images.htmldiff --git a/searx/templates/default/result_templates/map.html b/searx/templates/legacy/result_templates/map.htmldiff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/legacy/result_templates/torrent.htmldiff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/legacy/result_templates/videos.htmldiff --git a/searx/templates/legacy/results.html b/searx/templates/legacy/results.html@@ -0,0 +1,100 @@ +{% extends "legacy/base.html" %} +{% block title %}{{ q }} - {% endblock %} +{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&format=rss&{% for category in selected_categories %}category_{{ category }}=1&{% endfor %}pageno={{ pageno }}">{% endblock %} +{% block content %} +<div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div> +<div class="small search center"> + {% include 'legacy/search.html' %} +</div> +<div id="results"> + <div id="sidebar"> + + <div id="search_url"> + {{ _('Search URL') }}: + <input type="text" value="{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}" readonly /> + </div> + <div id="apis"> + {{ _('Download results') }} + {% for output_type in ('csv', 'json', 'rss') %} + <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> + <div class="left"> + <input type="hidden" name="q" value="{{ q }}" /> + <input type="hidden" name="format" value="{{ output_type }}" /> + {% for category in selected_categories %} + <input type="hidden" name="category_{{ category }}" value="1"/> + {% endfor %} + <input type="hidden" name="pageno" value="{{ pageno }}" /> + <input type="submit" value="{{ output_type }}" /> + </div> + </form> + {% endfor %} + </div> + </div> + + {% if answers %} + <div id="answers"><span>{{ _('Answers') }}</span> + {% for answer in answers %} + <span>{{ answer }}</span> + {% endfor %} + </div> + {% endif %} + + {% if suggestions %} + <div id="suggestions"><span id="suggestions-title">{{ _('Suggestions') }} : </span> + {% set first = true %} + {% for suggestion in suggestions %} + {% if not first %} • {% endif %}<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> + <input type="hidden" name="q" value="{{ suggestion }}"> + <input type="submit" class="suggestion" value="{{ suggestion }}" /> + </form> + {% set first = false %} + {% endfor %} + </div> + {% endif %} + + {% if infoboxes %} + <div id="infoboxes"> + {% for infobox in infoboxes %} + {% include 'legacy/infobox.html' %} + {% endfor %} + </div> + {% endif %} + + {% for result in results %} + {% if result['template'] %} + {% include get_result_template('legacy', result['template']) %} + {% else %} + {% include 'legacy/result_templates/default.html' %} + {% endif %} + {% endfor %} + + {% if paging %} + <div id="pagination"> + {% if pageno > 1 %} + <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> + <div class="{% if rtl %}right{% else %}left{% endif %}"> + <input type="hidden" name="q" value="{{ q }}" /> + {% for category in selected_categories %} + <input type="hidden" name="category_{{ category }}" value="1"/> + {% endfor %} + <input type="hidden" name="pageno" value="{{ pageno-1 }}" /> + <input type="submit" value="<< {{ _('previous page') }}" /> + </div> + </form> + {% endif %} + <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> + <div class="{% if rtl %}left{% else %}right{% endif %}"> + {% for category in selected_categories %} + <input type="hidden" name="category_{{ category }}" value="1"/> + {% endfor %} + <input type="hidden" name="q" value="{{ q }}" /> + <input type="hidden" name="pageno" value="{{ pageno+1 }}" /> + <input type="submit" value="{{ _('next page') }} >>" /> + </div> + </form> + + <br /> + </div> + {% endif %} +</div> +{% endblock %}diff --git a/searx/templates/legacy/search.html b/searx/templates/legacy/search.html@@ -0,0 +1,8 @@ +<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form"> + <div id="search_wrapper"> + <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" size="100" {% if q %}value="{{ q }}"{% endif %}/> + <input type="submit" value="search" id="search_submit" /> + </div> + {% set display_tooltip = true %} + {% include 'legacy/categories.html' %} +</form>diff --git a/searx/templates/legacy/stats.html b/searx/templates/legacy/stats.html@@ -0,0 +1,22 @@ +{% extends "legacy/base.html" %} +{% block head %} {% endblock %} +{% block content %} +<h2>{{ _('Engine stats') }}</h2> + +{% for stat_name,stat_category in stats %} +<div class="left"> + <table> + <tr colspan="3"> + <th>{{ stat_name }}</th> + </tr> + {% for engine in stat_category %} + <tr> + <td>{{ engine.name }}</td> + <td>{{ '%.02f'|format(engine.avg) }}</td> + <td class="percentage"><div style="width: {{ engine.percentage }}%"> </div></td> + </tr> + {% endfor %} + </table> +</div> +{% endfor %} +{% endblock %}diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html@@ -6,7 +6,7 @@ <div class="modal fade" id="modal-{{ index }}" tabindex="-1" role="dialog" aria-hidden="true"> <div class="modal-dialog"> - <div class="modal-content"> + <div class="modal-wrapper"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> <h4 class="modal-title">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result.title|striptags }}</h4> @@ -20,8 +20,14 @@ <span class="label label-default pull-right">{{ result.engine }}</span> <p class="text-muted pull-left">{{ result.pretty_url }}</p> <div class="clearfix"></div> - <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a> - <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('View source') }}</a> + <div class="row"> + <div class="col-md-6"> + <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a> + </div> + <div class="col-md-6"> + <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('View source') }}</a> + </div> + </div> </div> </div> </div>diff --git a/searx/templates/pix-art/preferences.html b/searx/templates/pix-art/preferences.html@@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <div class="row">diff --git a/searx/templates/pix-art/stats.html b/searx/templates/pix-art/stats.html@@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <h2>{{ _('Engine stats') }}</h2>diff --git a/searx/translations/bg/LC_MESSAGES/messages.mo b/searx/translations/bg/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/bg/LC_MESSAGES/messages.po b/searx/translations/bg/LC_MESSAGES/messages.po@@ -3,94 +3,124 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# poke amom <van_ds_ff@mail.bg>, 2015 +# ubone <van_ds_ff@mail.bg>, 2015 +# ubone <van_ds_ff@mail.bg>, 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/asciimoo/searx/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "файлове" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" -msgstr "общ" +msgstr "общо" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "музика" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "социална мрежа" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "изображения" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "видео" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" -msgstr "ай-ти" +msgstr "IT" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "новини" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "карта" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "наука" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "преди {minutes} минута(минути)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "преди {hours} час(ове), {minutes} минута(минути)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Страницата зарежда (сек)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Брой резултати" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Грешки" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Поправи HTTP връзки на HTTPS, ако е възможно" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Търси при избор на категория" @@ -105,7 +135,7 @@ msgstr "Търси веднага при избрана категория. Из msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" +msgstr "Показва IP-то ви и др. инфо, ако търсенето е \"ip\" или \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -115,6 +145,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +257,8 @@ msgstr "Метод" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Безопасно търсене" @@ -260,31 +316,30 @@ msgid "Red" msgstr "Червено" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Използвани търсачки в момента " #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Име на търсачка" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Категория" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +347,16 @@ msgstr "Позволи" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Забрани" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,43 +364,43 @@ msgid "" msgstr "Тези настройки се съхраняват във вашите бисквитки. Това ни позволява да не съхраняваме тази информация за вас." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Тези бисквитки служат за ваше удобство. Ние не ги използваме, за да Ви следим." +msgstr "Тези бисквитки служат за ваше удобство. Ние не ги използваме, за да ви следим." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "запази" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Върни първоначалните" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "назад" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Търси URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Свали резултатите" @@ -357,19 +411,19 @@ msgstr "Отговори" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Предложения" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "предишна страница" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "следваща страница" @@ -405,13 +459,13 @@ msgstr "Лийчър" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "магнитна връзка" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "торент файл" @@ -419,18 +473,37 @@ msgstr "торент файл" msgid "Click on the magnifier to perform search" msgstr "Кликнете лупичката, за да изпълните търсене" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "кеширана" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -448,17 +521,17 @@ msgid "General" msgstr "Общи" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Търсачки" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Добавки" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Бисквитки" @@ -493,36 +566,46 @@ msgstr "Филтрирай съдържание" msgid "Change searx layout" msgstr "Промени оформлението на searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Пряк път" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Средно време" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Макс. време" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Това е списък на бисквитки с техните стойности, които searx съхранява на вашия компютър." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Име на бисквитката" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Стойност" @@ -530,7 +613,7 @@ msgstr "Стойност" msgid "Search results" msgstr "Резултати от търсенето" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Връзки" @@ -539,18 +622,26 @@ msgstr "Връзки" msgid "Start search" msgstr "Започни търсене" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Покажи филтрите за търсене" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Скрий филтрите за търсене" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "статистики" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po@@ -15,89 +15,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:07+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 18:40+0000\n" "Last-Translator: Thomas Pointhuber\n" "Language-Team: German (http://www.transifex.com/asciimoo/searx/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "Dateien" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "Allgemein" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "Musik" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "Soziale Medien" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "Bilder" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "Videos" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "IT" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "Neuigkeiten" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "Karte" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "Wissenschaft" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Ladezeit (sek)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Trefferanzahl" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Punkte" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Punkte pro Treffer" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Fehler" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "DOAI umschreiben" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Vermeidet Bezahlschranken durch die Weiterleitung zu der Open-Access Version falls möglich" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Wandelt wenn möglich HTTP Links in HTTPS Links um" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Undendliches Scrollen" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Lädt automatisch die nächste Seite wenn das Ende der aktuellen Seite erreicht wurde" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Öffne Links in einem neuen Browser Tab" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Links werden normalerweise im gleichen Fenster geöffnet. Dieses Plugin überschreibt dieses Verhalten und öffnet Links in einem neuen Browser Tab bzw Fenster.\n(es wird JavaScript benötigt)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Starte Suche wenn Kategorie angeklickt wird" @@ -122,6 +151,32 @@ msgstr "Tracker-URL entferner" msgid "Remove trackers arguments from the returned URL" msgstr "Entferne Tracker Argumente von den URLs" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Vim angelehnte Tastenkombinationen" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navigiere in der Ergebnisseite mit Vim ähnlichen Tastataurkombinationen (es wird JavaScript benötigt).\nDrücke \"h\" auf der Start bzw. Ergebnisseite um eine Hifefenster anzuzeigen" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "Seite nicht gefunden" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Gehe zu %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "Suchseite" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -208,8 +263,8 @@ msgstr "Methode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Sichere Suche (SafeSearch)" @@ -267,31 +322,30 @@ msgid "Red" msgstr "Rot" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Aktuell benutzte Suchmaschinen" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Suchmaschinenname" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Kategorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -299,17 +353,16 @@ msgstr "Erlauben" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blockieren" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -317,8 +370,8 @@ msgid "" msgstr "Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, damit wir keine Ihrer persönlichen Daten speichern müssen." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -326,34 +379,34 @@ msgid "" msgstr "Diese Cookies dienen einzig Ihrem Komfort. Wir verwenden sie nicht, um Sie zu überwachen." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "Speichern" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Zurücksetzen" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "Zurück" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Such-URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Ergebnisse herunterladen" @@ -364,19 +417,19 @@ msgstr "Antworten" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Vorschläge" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "vorherige Seite" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "nächste Seite" @@ -412,13 +465,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "Magnet Link" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "Torrent" @@ -426,18 +479,37 @@ msgstr "Torrent" msgid "Click on the magnifier to perform search" msgstr "klicke auf die Lupe, um die Suche zu starten" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "Ergebniss in neuem Tab" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "Ein" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "Aus" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "Im Cache" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Experteneinstellungen" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "eine privatsphären-respektierende, hackbare Metasuchmaschine" @@ -455,17 +527,17 @@ msgid "General" msgstr "Allgemein" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Suchmaschinen" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Erweiterungen" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -500,36 +572,46 @@ msgstr "Inhalte filtern" msgid "Change searx layout" msgstr "ändere das Aussehen von searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "wähle das Aussehen des Design" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Aussehen" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Abkürzung" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "mittlere Zeit" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "max. Zeit" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Diese Liste zeigt alle Daten welche searx auf deinem Computer speichert." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Mit dieser Liste können Sie die Transparenz von searx bewerten" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Cookie Name" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Wert" @@ -537,7 +619,7 @@ msgstr "Wert" msgid "Search results" msgstr "Suchergebnisse" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Links" @@ -546,18 +628,26 @@ msgstr "Links" msgid "Start search" msgstr "Suche starten" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Suchfilter anzeigen" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Suchfilter verstecken" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "Statistiken" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "Jederzeit" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "Letzter Tag" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "Letzte Woche" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "Letztes Monat" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/el_GR/LC_MESSAGES/messages.mo b/searx/translations/el_GR/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/el_GR/LC_MESSAGES/messages.po b/searx/translations/el_GR/LC_MESSAGES/messages.po@@ -8,89 +8,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Greek (Greece) (http://www.transifex.com/asciimoo/searx/language/el_GR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "αρχεία" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "γενικά" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "μουσική" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "κοινωνικά δίκτυα" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "εικόνες" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "νέα" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "χάρτης" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Αριθμός αποτελεσμάτων" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Λάθη" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -115,6 +144,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +256,8 @@ msgstr "Μέθοδος" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "" @@ -260,31 +315,30 @@ msgid "Red" msgstr "Κόκκινο" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Κατηγορία" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "αποθήκευση" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "πίσω" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "" @@ -357,19 +410,19 @@ msgstr "Απαντήσεις" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Προτάσεις" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "προηγούμενη σελίδα" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "επόμενη σελίδα" @@ -405,13 +458,13 @@ msgstr "" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "" @@ -419,18 +472,37 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -448,17 +520,17 @@ msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -493,36 +565,46 @@ msgstr "" msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -530,7 +612,7 @@ msgstr "" msgid "Search results" msgstr "Αποτελέσματα αναζήτησης" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Σύνδεσμοι" @@ -539,18 +621,26 @@ msgstr "Σύνδεσμοι" msgid "Start search" msgstr "Έναρξη αναζήτησης" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Προβολή φίλτρων αναζήτησης" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Απόκρυψη φίλτρων αναζήτησης" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "στατιστικά" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/eo/LC_MESSAGES/messages.mo b/searx/translations/eo/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/eo/LC_MESSAGES/messages.po b/searx/translations/eo/LC_MESSAGES/messages.po@@ -3,94 +3,123 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# juanda097 <juanda097@openmailbox.org>, 2015 +# juanda097 <juanda097@openmailbox.org>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Esperanto (http://www.transifex.com/asciimoo/searx/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "dosieroj" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "ĝenerala" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "muziko" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "sociaj retservoj" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "bildoj" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videoj" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "novaĵoj" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "mapo" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "scienco" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Nombro de rezultoj" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Poentaroj" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Poentaroj por unu rezulto" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Eraroj" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Reverki HTTP ligiloj HTTP se eble" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -115,6 +144,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -196,15 +251,15 @@ msgstr "" #: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" -msgstr "" +msgstr "Metodo" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" -msgstr "" +msgstr " SekuraSerĉo" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 @@ -260,31 +315,30 @@ msgid "Red" msgstr "Ruĝa" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" -msgstr "" +msgstr " Aktuale uzitajn serĉilojn" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" -msgstr "" +msgstr " Motoro nomo" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Kategorio" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "Permesi" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloko" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Deŝuto rezultoj" @@ -357,21 +410,21 @@ msgstr "Respondoj" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" -msgstr "" +msgstr " antaŭa paĝo" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" -msgstr "" +msgstr " sekvanta paĝo" #: searx/templates/courgette/search.html:3 #: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 @@ -405,13 +458,13 @@ msgstr "" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "" @@ -419,18 +472,37 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -445,20 +517,20 @@ msgstr "" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:25 msgid "General" -msgstr "" +msgstr "Ĝenerala" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" -msgstr "" +msgstr "Motoroj" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -493,36 +565,46 @@ msgstr "" msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -530,26 +612,34 @@ msgstr "" msgid "Search results" msgstr "Serĉrezultoj" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "" #: searx/templates/oscar/search.html:6 #: searx/templates/oscar/search_full.html:11 msgid "Start search" +msgstr "Komenco serĉo" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "statistiko" + +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" msgstr "" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" msgstr "" -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" msgstr "" -#: searx/templates/oscar/stats.html:2 -msgid "stats" -msgstr "statistiko" +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po@@ -7,94 +7,125 @@ # Alejandro León Aznar, 2014 # Alejandro León Aznar, 2014-2015 # juanda097 <juanda097@openmailbox.org>, 2016 +# marc, 2016 # Oscar Carrero <ocf@openmailbox.org>, 2015 +# wefwefew ewfewfewf <nnnedmz0d@moakt.ws>, 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-02-24 23:02+0000\n" -"Last-Translator: juanda097 <juanda097@openmailbox.org>\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/asciimoo/searx/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "Archivos" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "General" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "Música" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "Medios sociales" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "Imágenes" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "Vídeos" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" -msgstr "TIC" +msgstr "Informática" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" -msgstr "noticias" +msgstr "Noticias" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" -msgstr "mapa" +msgstr "Mapa" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "ciencia" +msgstr "Ciencia" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "hace {hours} hora(s) y {minutes} minuto(s)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Tiempo de carga (segundos)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Puntuaciones" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Puntuaciones por resultado" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Errores" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Cambiar los enlaces HTTP a HTTPS si es posible" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Abrir los enlaces del resultado en una nueva pestaña del navegador" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Los resultados se abren en la misma ventana por defecto. Este plugin sobrescribe el comportamiento por defecto para abrir enlaces en nuevas pestañas / ventanas. (es necesario JavaScript)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Buscar en la categoría seleccionada" @@ -119,6 +150,32 @@ msgstr "Eliminador de URL rastreadora" msgid "Remove trackers arguments from the returned URL" msgstr "Eliminar los argumentos de los rastreadores en la URL devuelta" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Teclas de acceso rápido como-Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navegar por los resultados de búsqueda con las teclas de acceso rápido como-Vim (es necesario JavaScript). Pulse la tecla \"h\" en la página principal o en el resultado para obtener ayuda." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -205,8 +262,8 @@ msgstr "Método" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Búsqueda segura" @@ -264,31 +321,30 @@ msgid "Red" msgstr "Rojo" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Motores de búsqueda actualmente en uso" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nombre del motor de búsqueda" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categoría" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -296,17 +352,16 @@ msgstr "Permitir" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloquear" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -314,8 +369,8 @@ msgid "" msgstr "Esta configuración se guarda en sus cookies, lo que nos permite no almacenar dicha información sobre usted." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -323,34 +378,34 @@ msgid "" msgstr "Estas cookies son para su propia comodidad, no las utilizamos para rastrearle." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "Guardar" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Restablecer configuración por defecto" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "Atrás" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL de la búsqueda" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Descargar resultados" @@ -361,19 +416,19 @@ msgstr "Respuestas" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Sugerencias" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "Página anterior" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "Página siguiente" @@ -409,13 +464,13 @@ msgstr "Descargador" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "magnet link (enlace sin archivo)" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "archivo torrent" @@ -423,18 +478,37 @@ msgstr "archivo torrent" msgid "Click on the magnifier to perform search" msgstr "Haz clic en la lupa para realizar la búsqueda" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "en caché" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Creado por" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "un metabuscador hackable que respeta la privacidad" @@ -452,17 +526,17 @@ msgid "General" msgstr "General" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Motores" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Plugins" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -497,36 +571,46 @@ msgstr "Filtro de contenido" msgid "Change searx layout" msgstr "Cambiar aspecto de searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Elige un estilo para este tema" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Estilo" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Atajo" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Tiempo promedio" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Tiempo máximo" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Esta es la lista de cookies y sus valores que searx está almacenando en tu ordenador." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Con esa lista puedes valorar la transparencia de searx." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Nombre de la cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Valor" @@ -534,7 +618,7 @@ msgstr "Valor" msgid "Search results" msgstr "Buscar" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Enlaces" @@ -543,18 +627,26 @@ msgstr "Enlaces" msgid "Start search" msgstr "Comenzar búsqueda" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Mostrar filtros de búsqueda" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Ocultar filtros de búsqueda" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "estadísitcas" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po@@ -13,89 +13,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:31+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 17:58+0000\n" "Last-Translator: Cqoicebordel <david.barouh@wanadoo.fr>\n" "Language-Team: French (http://www.transifex.com/asciimoo/searx/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "fichiers" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "général" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "musique" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "réseaux sociaux" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "images" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "vidéos" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "informatique" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "actus" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "carte" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "science" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "il y a {hours} heure(s), {minutes} minute(s)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Chargement de la page (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Nombre de résultats" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Score" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Score par résultat" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Erreurs" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "Utiliser DOAI" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Contourne les verrous payants de certaines publications scientifiques en redirigeant vers la version ouverte de ces papiers si elle est disponible." + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Réécrire les liens HTTP en HTTPS si possible" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Défilement infini" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Charge automatiquement la page suivante quand vous arriver en bas de la page" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Ouvrir les liens de résultats dans un nouvel onglet" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Les résultats sont ouvert dans la même fenêtre par défaut. Cette extension change le comportement par défaut pour ouvrir les liens dans des nouveaux onglets ou fenêtres (Javascript est nécessaire)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Lancer la recherche lors du choix d'une catégorie" @@ -120,6 +149,32 @@ msgstr "Nettoyeur d'URL de suivis" msgid "Remove trackers arguments from the returned URL" msgstr "Retire les arguments utilisés pour vous pister des URL retournées" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Raccourcis comme Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Parcourez les résultats de recherche avec des raccourcis clavier similaires à Vim (Javascript est nécessaire. Appuyez sur \"h\" dans la fenêtre principale de résultats pour afficher de l'aide." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "Page non trouvée" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Aller à %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "la page d'accueil" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -206,8 +261,8 @@ msgstr "Méthode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Recherche sécurisée" @@ -265,31 +320,30 @@ msgid "Red" msgstr "Rouge" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Moteurs de recherche actuellement utilisés" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nom du moteur" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Catégorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -297,17 +351,16 @@ msgstr "Autoriser" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloquer" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -315,8 +368,8 @@ msgid "" msgstr "Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas collecter vos données." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -324,34 +377,34 @@ msgid "" msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utilisons pas pour vous espionner." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "enregistrer" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Remettre les valeurs par défaut" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "retour" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL de recherche" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Télécharger les résultats" @@ -362,19 +415,19 @@ msgstr "Réponses" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Suggestions" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "page précédente" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "page suivante" @@ -410,13 +463,13 @@ msgstr "Téléchargeurs" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "lien magnet" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "fichier torrent" @@ -424,18 +477,37 @@ msgstr "fichier torrent" msgid "Click on the magnifier to perform search" msgstr "Cliquez sur la loupe pour effectuer une recherche" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "Résultats dans de nouveaux onglets" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "On" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "Off" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "en cache" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Paramètres avancés" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "un meta-moteur de recherche hackable et respectueux de la vie privée" @@ -453,17 +525,17 @@ msgid "General" msgstr "Général" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Moteurs" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Plugins" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -498,36 +570,46 @@ msgstr "Filtrer le contenu" msgid "Change searx layout" msgstr "Modifier l'affichage de searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Choisir un style pour ce thème" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Style" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Raccourcis" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Temps moy." -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Temps max" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "C'est une liste de cookies et de leurs valeurs que searx enregistre sur votre ordinateur." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Avec cette liste, vous pouvez juger de la transparence de searx." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Nom du cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Valeur" @@ -535,7 +617,7 @@ msgstr "Valeur" msgid "Search results" msgstr "Résultats de recherche" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Liens" @@ -544,18 +626,26 @@ msgstr "Liens" msgid "Start search" msgstr "Lancer une recherche" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Afficher les filtres de recherche" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Cacher les filtres de recherche" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "statistiques" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "N'importe quand" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "Dernières 24h" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "Semaine précédente" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "Mois précédent" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 @@ -586,7 +676,7 @@ msgstr "Information !" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "il n'y a pas de cookies définit pour le moment." +msgstr "il n'y a pas de cookies définis pour le moment." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. "diff --git a/searx/translations/he/LC_MESSAGES/messages.mo b/searx/translations/he/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/he/LC_MESSAGES/messages.po b/searx/translations/he/LC_MESSAGES/messages.po@@ -12,112 +12,167 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-03-01 15:21+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-05 18:36+0000\n" "Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n" "Language-Team: Hebrew (http://www.transifex.com/asciimoo/searx/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "קבצים" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "כללי" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "מוזיקה" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "מדיה חברתית" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "תמונות" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "סרטונים" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "IT" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "חדשות" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" -msgstr "מפה" +msgstr "מפות" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "מדע" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "לפני {minutes} דקות" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "לפני {hours} שעות, {minutes} דקות" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "עומס עמוד (שניות)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "מספר תוצאות" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "דירוג" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "דירוג לכל תוצאה" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "שגיאות" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "שכתוב DOAI" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" -msgstr "שכתב קישורי HTTP לקישורי HTTPS כאשר אפשר" +msgstr "שכתוב קישורי HTTP לקישורי HTTPS כאשר ניתן" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "גלילה אינסופית" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "טען אוטומטית עמוד הלאה כאשר גוללים לתחתית של עמוד נוכחי" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "פתח קישורי תוצאה בכרטיסיות דפדפן חדשות" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "תוצאות נפתחות בתוך אותו חלון באופן שגרתי. תוסף זה משכתב את ההתנהגות השגרתית כדי לפתוח קישורים בתוך כרטיסיות/חלונות חדשים. (JavaScript נדרש)" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "חפש בעת בחירת קטגוריה" +msgstr "חיפוש בעת בחירת קטגוריה" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "בצע חיפוש כאשר קטגוריה נבחרת. נטרל כדי לבחור קטגוריות מרובות. (מצריך JavaScript)" +msgstr "ביצוע חיפוש כאשר קטגוריה נבחרת. יש לנטרל את תוסף זה כדי לבחור קטגוריות מרובות. (מצריך JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "מציגה כתובת IP המשוייכת לך אם השאילתא היא \"ip\" וגם סוכן משתמש אם שאילתא מכילה \"user agent\"." +msgstr "הצגת כתובת IP המשוייכת לך אם השאילתא היא \"ip\" וגם סוכן משתמש אם השאילתא מכילה \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" -msgstr "מסיר URL גשש" +msgstr "הסרת Tracker URL" #: searx/plugins/tracker_url_remover.py:27 msgid "Remove trackers arguments from the returned URL" -msgstr "הסר ארגומנטים מאתרים מתוך URL מוחזר" +msgstr "הסרת ארגומנטים מאתרים מתוך URL מוחזר" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "מקשים חמים Vim-like" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "ניווט בתוצאות בעזרת מקשים חמים Vim-like (JavaScript נדרש). לחיצה על קליד \"h\" במסך ראשי או תוצאות תציג דו שיח עזרה." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "עמוד לא נמצא" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "עבור אל %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -205,8 +260,8 @@ msgstr "שיטה" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "חיפוש בטוח" @@ -233,7 +288,7 @@ msgstr "בלי" #: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" -msgstr "מוטיבים" +msgstr "עיצובים" #: searx/templates/courgette/preferences.html:83 msgid "Color" @@ -264,31 +319,30 @@ msgid "Red" msgstr "אדום" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "מנועי חיפוש בשימוש עתה" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "שם מנוע" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "קטגוריה" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -296,17 +350,16 @@ msgstr "התר" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "חסום" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -314,8 +367,8 @@ msgid "" msgstr "הגדרות אלו מאוחסנות בתוך העוגיות שלך, אלו מאפשרות לנו לא לאחסן את מידע זה אודותייך." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -323,34 +376,34 @@ msgid "" msgstr "עוגיות אלו משרתות את נוחותך הבלעדית, אנחנו לא משתמשים בהן כדי לעקוב אחריך." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "שמור" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "אפס ברירות מחדל" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "חזור" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "קישור חיפוש" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "הורד תוצאות" @@ -361,19 +414,19 @@ msgstr "תשובות" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "הצעות" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "עמוד קודם" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "עמוד הבא" @@ -409,13 +462,13 @@ msgstr "יונקים" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "קישור magnet" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "קובץ torrent" @@ -423,18 +476,37 @@ msgstr "קובץ torrent" msgid "Click on the magnifier to perform search" msgstr "לחצו על הזכוכית מגדלת כדי לבצע חיפוש" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "תוצאות בכרטיסיות חדשות" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "מוטמן" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "הגדרות מתקדמות" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "מופעל באמצעות" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "מנוע מטא-חיפוש גמיש, ומכבד פרטיות" @@ -444,7 +516,7 @@ msgstr "בית" #: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 msgid "Toggle navigation" -msgstr "Toggle ניווט" +msgstr "החלף ניווט" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:25 @@ -452,17 +524,17 @@ msgid "General" msgstr "כללי" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "מנועים" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "תוספים" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "עוגיות" @@ -480,53 +552,63 @@ msgstr "מציאת דברים בזמן הקלדה" #: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" -msgstr "שלוף תוצאות תמונה דרך searx" +msgstr "שליפת (מבעד Proxy) תוצאות תמונה דרך searx" #: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" -msgstr "שינוי האופן בו טפסים נשלחים, <a href=\"http://he.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">למדו עוד אודות שיטות בקשה (request methods)</a>" +msgstr "שינוי האופן בו טפסים נשלחים, <a href=\"https://he.wikipedia.org/wiki/Hypertext_Transfer_Protocol#.D7.A9.D7.99.D7.98.D7.95.D7.AA_.D7.91.D7.A7.D7.A9.D7.94\" rel=\"external\">למדו עוד אודות שיטות בקשה (request methods)</a>" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" -msgstr "סנן תוכן" +msgstr "סינון תוכן" #: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "שינוי ממשק searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "בחר סגנון עבור עיצוב זה" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "סגנון" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "קיצור דרך" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "זמן ממוצע" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "זמן מירבי" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "זוהי רשימה של עוגיות וערכיהן אשר searx מאחסנת על המחשב שלך." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "בעזרת רשימה זו, באפשרותך לגשת אל searx transparency." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "שם עוגייה" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "ערך" @@ -534,7 +616,7 @@ msgstr "ערך" msgid "Search results" msgstr "תוצאות חיפוש" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "קישורים" @@ -543,18 +625,26 @@ msgstr "קישורים" msgid "Start search" msgstr "התחל חיפוש" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "הצג מסנני חיפוש" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "הסתר מסנני חיפוש" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "סטטיסטיקות" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "כל עת" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "יום אחרון" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "שבוע אחרון" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "חודש אחרון" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po@@ -5,96 +5,126 @@ # Translators: # Adam Tauber <asciimoo@gmail.com>, 2014-2016 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014 +# Noémi Ványi <sitbackandwait@gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-02-06 08:36+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:42+0000\n" "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/asciimoo/searx/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "fájlok" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "általános" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "zene" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "közösségi média" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "képek" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videók" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "hírek" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "térkép" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "tudomány" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} perce" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} óra, {minutes} perce" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Válaszidők (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Találatok száma" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Pontszámok" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Pontszámok találatonként" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Hibák" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "Szabad publikációs oldalak" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Publikácós linkeknél szabad forrás használat, amennyiben lehetséges" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "HTTP linkek lecserélése HTTPS-re" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Végtelenített találatok" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "További találatok automatikus betöltése" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Találatok megnyitása új lapon" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "A találatok az aktuális oldalon nyílnak meg alapértelmezetten. Ez a plugin megváltoztatja ezt a működést és új lapra nyitja meg a találatokat. (ez a funkció JavaScript-et igényel)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "Azonnal keresés kategória választással" +msgstr "Azonnali keresés kategória választással" #: searx/plugins/search_on_category_select.py:19 msgid "" @@ -116,6 +146,32 @@ msgstr "Tracker URL eltávolítás" msgid "Remove trackers arguments from the returned URL" msgstr "Felhasználó követéshez használt találati URL paraméterek eltávolítása" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Vim típusú billentyűzetes navigáció" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navigálj néhány gombnyomással a találatok között. Aktiválás után a \"h\" betű lenyomásával jeleníthető meg részletes segítség a használatról. (Ez a funkció JavaScript-et igényel)" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "Az oldal nem található" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Vissza a %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "kereső oldalra" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +258,8 @@ msgstr "Method" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Felnőtt tartalom szűrés" @@ -250,7 +306,7 @@ msgstr "Zöld" #: searx/templates/courgette/preferences.html:89 msgid "Cyan" -msgstr "Türkisz" +msgstr "Türkiz" #: searx/templates/courgette/preferences.html:90 msgid "Orange" @@ -261,31 +317,30 @@ msgid "Red" msgstr "Piros" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Jelenleg használt keresők" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Kereső neve" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Kategória" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,17 +348,16 @@ msgstr "Engedélyezés" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Tiltás" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -311,8 +365,8 @@ msgid "" msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -320,34 +374,34 @@ msgid "" msgstr "Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a felhasználók követésére." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "mentés" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Alapbeállítások visszaállítása" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "vissza" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Keresési URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Találatok letöltése" @@ -358,19 +412,19 @@ msgstr "Válaszok" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Javaslatok" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "előző oldal" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "következő oldal" @@ -406,13 +460,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "magnet link" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "torrent fájl" @@ -420,18 +474,37 @@ msgstr "torrent fájl" msgid "Click on the magnifier to perform search" msgstr "A nagyítóra kattintva indítható a keresés" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "Eredmények új tabon" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "On" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "Off" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "tárolt" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Keresés beállításai" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Az oldalt kiszolgálja: " -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "egy privátszféra tisztelő, könnyen módosítható metakereső" @@ -449,17 +522,17 @@ msgid "General" msgstr "Általános" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" -msgstr "Kereső motorok" +msgstr "Keresőmotorok" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Pluginek" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Sütik" @@ -494,36 +567,46 @@ msgstr "Tartalom szűrés" msgid "Change searx layout" msgstr "Megjelenés" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Válassz megjelenést ehhez a témához" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Megjelenés" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Rövidítés" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Átlag idő" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Maximális idő" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Searx által használt sütik listája." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Ez a lista a kereső transzparenciáját hivatott megmutatni." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Süti név" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Érték" @@ -531,7 +614,7 @@ msgstr "Érték" msgid "Search results" msgstr "Keresési eredmények" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Linkek" @@ -540,18 +623,26 @@ msgstr "Linkek" msgid "Start search" msgstr "Keresés indítása" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Keresési szűrők megjelenítése" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Keresési szűrők elrejtése" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "statisztikák" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "Bármikor" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "Legutóbbi nap" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "Legutóbbi hét" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "Legutóbbi hónap" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po@@ -10,89 +10,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/asciimoo/searx/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "documenti" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "generale" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "musica" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "social media" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "immagini" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "video" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "notizie" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "mappe" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "di {minutes} minuti fa" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "di {ore} h e {minutes} minuti fa" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr " Caricamento della pagina (secondi)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Risultati ottenuti" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Punteggio" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Punteggio per risultato" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Errori" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -117,6 +146,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -203,8 +258,8 @@ msgstr "Metodo" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Ricerca rassicurato" @@ -262,31 +317,30 @@ msgid "Red" msgstr "Rosso" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Motori di ricerca attualmente in uso" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nome del motore" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categoria" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -294,17 +348,16 @@ msgstr "Autorizza" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blocca" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -312,8 +365,8 @@ msgid "" msgstr "Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non conservare dati su di te." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -321,34 +374,34 @@ msgid "" msgstr "I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie per sorvegliarti." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "salva" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Azzerare default" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "indietro" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL della ricerca" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Scarica i risultati" @@ -359,19 +412,19 @@ msgstr "Riposte" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Suggerimenti" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "pagina precedente" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "pagina successiva" @@ -407,13 +460,13 @@ msgstr "" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "" @@ -421,18 +474,37 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -450,17 +522,17 @@ msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -495,36 +567,46 @@ msgstr "" msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -532,7 +614,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "" @@ -541,16 +623,24 @@ msgstr "" msgid "Start search" msgstr "" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" +#: searx/templates/oscar/stats.html:2 +msgid "stats" msgstr "" -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" msgstr "" -#: searx/templates/oscar/stats.html:2 -msgid "stats" +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" msgstr "" #: searx/templates/oscar/messages/first_time.html:4diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po@@ -3,6 +3,7 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Akio Nishimura <akionux@gmail.com>, 2016 # Thomas Pointhuber, 2014-2015 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014,2016 # Lucas Phillips <mail@lep.pw>, 2015 @@ -13,89 +14,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-02-14 00:11+0000\n" -"Last-Translator: Akio Nishimura <akionux@gmail.com>\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/asciimoo/searx/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "ファイル" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "一般" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "音楽" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "ソーシャルメディア" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "画像" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "動画" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "情報技術" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "お知らせ" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "地図" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "学問" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes}分前" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours}時間と{minutes}分前" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "ページ読み込み時間 (秒)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "通知の数" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "スコア" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "検索結果当たりスコア" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "エラー" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "可能ならばHTTPリンクをHTTPSリンクに書き換える" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "検索結果のリンクを新しいタブで開く" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "デフォルトでは結果は同じウィンドウで開きます。このプラグインはデフォルトの動作を書き換えて新しいタブ/ウィンドウで開くようにします。(JavaScriptが必要です)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "カテゴリ選択したら検索を実行" @@ -120,6 +150,32 @@ msgstr "トラッカーURLリムーバー" msgid "Remove trackers arguments from the returned URL" msgstr "返されたURLからトラッカー引数を消去します。" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Vim風のホットキー" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "検索結果をVim風のホットキーで操作します(JavaScriptが必要)。メインページまたは検索結果ページで\"h\"キーを押してヘルプを表示します。" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -206,8 +262,8 @@ msgstr "方法" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "安全な検索" @@ -265,31 +321,30 @@ msgid "Red" msgstr "赤" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "現在使用中の検索エンジン" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "検索エンジン名" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "カテゴリー" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -297,17 +352,16 @@ msgstr "許可する" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "禁止する" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -315,8 +369,8 @@ msgid "" msgstr "これらの設定はあなたのクッキーに保存されますが、これはサーバーがあなたの情報の保存するわけではありません。" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -324,34 +378,34 @@ msgid "" msgstr "クッキーはあなたが便利に使えるようにするために使うのであって、サーバーはあなたを追跡するためにクッキーを使うことはありません。" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "保存" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "デフォルト設定に戻す" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "戻る" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URLを検索する" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "ダウンロードするファイル形式" @@ -362,19 +416,19 @@ msgstr "回答" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "提案" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "前のページ" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "次のページ" @@ -410,13 +464,13 @@ msgstr "リーチャー" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "マグネットリンク" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "トレントファイル" @@ -424,18 +478,37 @@ msgstr "トレントファイル" msgid "Click on the magnifier to perform search" msgstr "検索を実行するには虫めがねをクリックしてください" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "キャッシュ" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "提供:" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "プライバシー保護を重視した、ハッカブルなメタサーチエンジン" @@ -453,17 +526,17 @@ msgid "General" msgstr "一般設定" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "検索エンジン" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "プラグイン" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "クッキー" @@ -498,36 +571,46 @@ msgstr "コンテンツをフィルタリングする" msgid "Change searx layout" msgstr "searxのレイアウトの変更" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "このテーマのスタイルを選択" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "スタイル" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "ショートカット" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "平均時間" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "最大時間" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "これはクッキーのリストで、これらの値はあなたのコンピュータに保存されています。" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "このリストによって、あなたはsearxの透明性を評価できます。" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "クッキー名" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "値" @@ -535,7 +618,7 @@ msgstr "値" msgid "Search results" msgstr "検索結果" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "リンク" @@ -544,18 +627,26 @@ msgstr "リンク" msgid "Start search" msgstr "検索を開始" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "サーチフィルタを表示" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "サーチフィルタを隠す" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "統計" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po@@ -9,89 +9,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-31 11:35+0000\n" -"Last-Translator: Nathan Follens\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/asciimoo/searx/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "bestanden" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "algemeen" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "muziek" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "social media" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "afbeeldingen" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "video's" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "nieuws" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "kaart" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "wetenschap" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} min geleden" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} uur, {minutes} min geleden" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Pagina laadt (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Aantal zoekresultaten" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Scores" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Scores per zoekresultaat" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Fouten" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Herschrijf HTTP-koppelingen naar HTTPS, indien mogelijk" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Open koppelingen in nieuwe tabbladen" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Resultaten worden standaard in hetzelfde venster geopend. Deze plug-in overschrijft het standaardgedrag zodat koppelingen in nieuwe tabbladen/vensters geopend worden. (JavaScript vereist)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Zoeken bij selecteren van categorie" @@ -116,6 +145,32 @@ msgstr "Tracker-URL verwijderaar" msgid "Remove trackers arguments from the returned URL" msgstr "Verwijdert trackerargumenten van de gekregen URL" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Sneltoetsen als in Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Blader door zoekresultaten met sneltoetsen zoals die in Vim (JavaScript vereist). Druk op \"h\" op de hoofdpagina of de pagina met resultaten voor hulp." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +257,8 @@ msgstr "Methode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "SafeSearch" @@ -261,31 +316,30 @@ msgid "Red" msgstr "Rood" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Momenteel gebruikte zoekmachines" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Naam zoekmachine" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,17 +347,16 @@ msgstr "Toestaan" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blokkeren" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -311,8 +364,8 @@ msgid "" msgstr "Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets over jou te bewaren." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -320,34 +373,34 @@ msgid "" msgstr "Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies niet om je te volgen." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "bewaren" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Standaardinstellingen herstellen" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "terug" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Zoek URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Downloaden zoekresultaten" @@ -358,19 +411,19 @@ msgstr "Antwoorden" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Suggesties" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "vorige pagina" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "volgende pagina" @@ -406,13 +459,13 @@ msgstr "Ophaler" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "magneetlink" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "torrentbestand" @@ -420,18 +473,37 @@ msgstr "torrentbestand" msgid "Click on the magnifier to perform search" msgstr "Klik op het vergrootglas om te zoeken" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "gecached" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "een privacy eerbiedigende, aanpasbare metazoekmachine" @@ -449,17 +521,17 @@ msgid "General" msgstr "Algemeen" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Zoekmachines" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Plugins" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -494,36 +566,46 @@ msgstr "Filteren content" msgid "Change searx layout" msgstr "Wijzig searx layout" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Kies een stijl voor dit thema" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Stijl" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Snelkoppeling" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Gem. duur" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Max. duur" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Dit is de lijst van cookies en hun waarden die searx op je computer opslaat." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Met deze lijst kan je de openheid van searx beoordelen." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Cookienaam" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Waarde" @@ -531,7 +613,7 @@ msgstr "Waarde" msgid "Search results" msgstr "Zoekresultaten" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Links" @@ -540,18 +622,26 @@ msgstr "Links" msgid "Start search" msgstr "Start zoeken" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Toon zoekfilters" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Verberg zoekfilters" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "stats" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/pt/LC_MESSAGES/messages.mo b/searx/translations/pt/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/pt_BR/LC_MESSAGES/messages.mo b/searx/translations/pt_BR/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/pt_BR/LC_MESSAGES/messages.po b/searx/translations/pt_BR/LC_MESSAGES/messages.po@@ -8,89 +8,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/asciimoo/searx/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "Arquivos" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "geral" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "áudio" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "rede social" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "imagens" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "vídeos" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "códigos" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "notícias" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "mapas" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutos} minuto(s) atrás" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{horas} hora(s), {minutos} minuto(s) atrás" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Carregamento da página (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Pontuações" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Pontuações por resultado" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Erros" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Redirecionar conexões HTTP para HTTPS, se possível" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Pesquisar na categoria selecionada" @@ -115,6 +144,32 @@ msgstr "Remover Tracker da url" msgid "Remove trackers arguments from the returned URL" msgstr "Remover argumentos de url retornáveis" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +256,8 @@ msgstr "Método" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Busca Segura" @@ -260,31 +315,30 @@ msgid "Red" msgstr "Vermelho" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Serviço de busca usado atualmente" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nome do serviço" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categoria" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "Ativo" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloqueado" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "Essas configurações são armazenadas em seus cookies, nos não armazenamos nenhum dado a seu respeito." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "Estes cookies servem ao seu único propósito, nós não usamos esses cookies para rastreá-lo." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "salvar" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Redefinir configurações" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "voltar" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Buscar URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Resultados para download" @@ -357,19 +410,19 @@ msgstr "Perguntas" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Sugestões" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "Página anterior" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "Próxima página" @@ -405,13 +458,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "Link magnético" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "Arquivo torrent" @@ -419,18 +472,37 @@ msgstr "Arquivo torrent" msgid "Click on the magnifier to perform search" msgstr "Clique na lupa para executar a busca" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "em cache" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Distribuído por" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "um mecanismo de metabusca que respeita a sua privacidade" @@ -448,17 +520,17 @@ msgid "General" msgstr "Geral" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Buscadores" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Complementos" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -493,36 +565,46 @@ msgstr "Filtrar conteúdo" msgid "Change searx layout" msgstr "Alterar interface do searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Atalhos" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Avg.tempo" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Tempo máximo" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Esta é a lista de cookies que searx está armazenando em seu computador." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Com essa lista, você pode avaliar a transparência do searx." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Nome do cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Valor" @@ -530,7 +612,7 @@ msgstr "Valor" msgid "Search results" msgstr "Procurar resultados" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Links" @@ -539,18 +621,26 @@ msgstr "Links" msgid "Start search" msgstr "Iniciar busca" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Mostrar filtros de busca" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Ocultar filtros de busca" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "estatísticas" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/ro/LC_MESSAGES/messages.mo b/searx/translations/ro/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/ro/LC_MESSAGES/messages.po b/searx/translations/ro/LC_MESSAGES/messages.po@@ -8,89 +8,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Romanian (http://www.transifex.com/asciimoo/searx/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "fișiere" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "general" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "muzică" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "rețele sociale" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "imagini" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videouri" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "el(ea)" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "știri" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "hartă" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} minut(e) în urmă" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} oră(e), {minutes} minut(e) în urmă" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Încărcarea paginilor (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Numărul de rezultate" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Scoruri" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Scoruri per rezultat" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Erori" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Rescrie legăturile HTTP cu HTTPS dacă e posibil" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Căutare în categoria selectată" @@ -115,6 +144,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +256,8 @@ msgstr "Metodă" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "CăutareSigură" @@ -260,31 +315,30 @@ msgid "Red" msgstr "Roșu" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Motoarele de căutare folosite curent" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Numele motorului" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "Permite" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blochează" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "Aceste setări sunt stocate în cookie-urile d-voastră, aceasta ne permite să nu stocăm aceste date despre d-voastră." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "Aceste cookie-uri servesc doar pentru confortul d-voastră, noi nu stocăm aceste cookie-uri pentru a vă urmări." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "salvează" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Resetează valorile implicite" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "înapoi" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL de căutare" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Descarcă rezultate" @@ -357,19 +410,19 @@ msgstr "Răspunsuri" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Sugestii" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "pagina anterioară" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "pagina următoare" @@ -405,13 +458,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "legătură magnet" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "fișier torrent" @@ -419,18 +472,37 @@ msgstr "fișier torrent" msgid "Click on the magnifier to perform search" msgstr "Apăsați pe lupă pentru a executa căutarea" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "stocat temporar" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Motorizat de" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "un meta-motor de căutare care respectă confidențialitatea" @@ -448,17 +520,17 @@ msgid "General" msgstr "General" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Motoare" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Module" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -493,36 +565,46 @@ msgstr "Filtrează conținutul" msgid "Change searx layout" msgstr "Schimbă aspectul lui searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -530,7 +612,7 @@ msgstr "" msgid "Search results" msgstr "Rezultatele căutării" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Legături" @@ -539,18 +621,26 @@ msgstr "Legături" msgid "Start search" msgstr "Pornește căutarea" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Arată filtrele căutării" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Ascunde filtrele căutării" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "statistici" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/ru/LC_MESSAGES/messages.mo b/searx/translations/ru/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/ru/LC_MESSAGES/messages.po b/searx/translations/ru/LC_MESSAGES/messages.po@@ -5,108 +5,138 @@ # Translators: # dimqua <dimqua@riseup.net>, 2015 # dimqua <dimqua@riseup.net>, 2015 +# Дмитрий Михирев <bizdelnick@gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/asciimoo/searx/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "файлы" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "общие" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "музыка" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "соцсети" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "картинки" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "видео" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "IT" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "новости" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "карты" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "наука" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} минут назад" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} час, {minutes} минут назад" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Время загрузки (сек)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Число результатов" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Попаданий" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Попаданий за результат" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Ошибок" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "По возможности заменять в ссылках HTTP на HTTPS" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" msgstr "" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "" +msgstr "Искать при выборе категории" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" +msgstr "Выполнять поиск сразу при выборе категории. Отключить выбор нескольких категорий. (Требуется JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" +msgstr "Показывает IP-адрес при запросе \"ip\" и user-agent при запросе \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -116,6 +146,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -145,7 +201,7 @@ msgstr "Опции" #: searx/templates/oscar/preferences.html:36 #: searx/templates/oscar/preferences.html:38 msgid "Default categories" -msgstr "Категории по-умолчанию" +msgstr "Категории по умолчанию" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 @@ -172,7 +228,7 @@ msgstr "Язык интерфейса" #: searx/templates/default/preferences.html:35 #: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" -msgstr "Авто-подсказки" +msgstr "Автодополнение" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 @@ -202,8 +258,8 @@ msgstr "Метод" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Безопасный поиск" @@ -238,7 +294,7 @@ msgstr "Цвет" #: searx/templates/courgette/preferences.html:86 msgid "Blue (default)" -msgstr "Синий (по-умолчанию)" +msgstr "Синий (по умолчанию)" #: searx/templates/courgette/preferences.html:87 msgid "Violet" @@ -261,31 +317,30 @@ msgid "Red" msgstr "Красный" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Используемые поисковые движки" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Имя движка" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Категория" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,61 +348,60 @@ msgstr "Разрешить" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Блокировать" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " "data about you." -msgstr "Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить эти сведения о Вас." +msgstr "Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить эти сведения о вас." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Данные cookies применяются для вашего удобства, мы не используем их, чтобы отслеживать Вас." +msgstr "Данные cookies применяются для вашего удобства, мы не используем их чтобы отслеживать вас." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "сохранить" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" -msgstr "" +msgstr "Восстановить настройки по умолчанию" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "назад" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Ссылка на поиск" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Загрузить результаты" @@ -358,19 +412,19 @@ msgstr "Ответы" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Предложения" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "предыдущая стр." #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "следующая стр. " @@ -406,13 +460,13 @@ msgstr "Личер" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "магнет-ссылка" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "торрент-файл" @@ -420,18 +474,37 @@ msgstr "торрент-файл" msgid "Click on the magnifier to perform search" msgstr "Нажмите на лупу, чтобы выполнить поиск" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "в архиве" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Используется" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "свободный движок метапоиска, уважающий вашу приватность" @@ -449,19 +522,19 @@ msgid "General" msgstr "Общие" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Движки" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" -msgstr "" +msgstr "Плагины" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" -msgstr "" +msgstr "Cookies" #: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" @@ -494,44 +567,54 @@ msgstr "Использовать ли фильтр контента" msgid "Change searx layout" msgstr "Изменить тему сайта" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 -msgid "Shortcut" +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 -msgid "Avg. time" +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 +msgid "Shortcut" +msgstr "Ускоритель" + +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 +msgid "Avg. time" +msgstr "Среднее время" + +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" -msgstr "" +msgstr "Максимальное время" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "" +msgstr "Это список cookies и их значений, которые searx хранит на вашем компьютере." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" -msgstr "" +msgstr "Имя cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" -msgstr "" +msgstr "Значение" #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Результаты поиска" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Ссылки" @@ -540,18 +623,26 @@ msgstr "Ссылки" msgid "Start search" msgstr "Начать поиск" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Показать фильтры поиска" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Скрыть фильтры поиска" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "статистика" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 @@ -578,11 +669,11 @@ msgstr "Пожалуйста включите JavaScript, чтобы испол #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" -msgstr "" +msgstr "Информация!" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "" +msgstr "в данный момент cookies не установлены." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -596,7 +687,7 @@ msgstr "Сожалеем!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "результатов не найдено. Попробуйте другой запрос или выберете больше категорий." +msgstr "результатов не найдено. Попробуйте другой запрос или выберите больше категорий." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -656,19 +747,19 @@ msgstr "Байт" #: searx/templates/oscar/result_templates/torrent.html:10 msgid "kiB" -msgstr "Кбайт" +msgstr "КиБ" #: searx/templates/oscar/result_templates/torrent.html:11 msgid "MiB" -msgstr "Мбайт" +msgstr "МиБ" #: searx/templates/oscar/result_templates/torrent.html:12 msgid "GiB" -msgstr "Гбайт" +msgstr "ГиБ" #: searx/templates/oscar/result_templates/torrent.html:13 msgid "TiB" -msgstr "Тбайт" +msgstr "ТиБ" #: searx/templates/oscar/result_templates/torrent.html:15 msgid "Number of Files" @@ -684,4 +775,4 @@ msgstr "скрыть видео" #: searx/templates/pix-art/results.html:28 msgid "Load more..." -msgstr "" +msgstr "Загрузить ещё…"diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po@@ -3,95 +3,124 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# Caner Başaran <basaran.caner@gmail.com>, 2014-2015 +# Caner Başaran <basaran.caner@gmail.com>, 2014-2016 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/asciimoo/searx/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "dosyalar" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "genel" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "müzik" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "sosyal medya" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "görseller" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videolar" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "bilişim" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "haberler" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "harita" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "bilim" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} dakika() önce" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} saat(), {minutes} dakika() önce" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Yüklenen sayfa (sn)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Sonuç sayısı" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Hatalar" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Mümkünse HTTP bağlantıları HTTPS olarak düzelt" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Bağlantıları yeni sekmede aç" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -116,6 +145,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +257,8 @@ msgstr "Sorgu gönderim yöntemi" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Güvenli Arama" @@ -261,31 +316,30 @@ msgid "Red" msgstr "Kırmızı" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Şu anda kullanılan arama motorları" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Motor adı" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Türü" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,17 +347,16 @@ msgstr "İzin ver" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Engelle" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -311,8 +364,8 @@ msgid "" msgstr "Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda veri saklamak için değildir." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -320,34 +373,34 @@ msgid "" msgstr "Bu çerezler size kolaylık sağlar. Sizi takip etmek için kullanılmaz." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "kaydet" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Varsayılanları sıfırla" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "geri" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Arama Bağlantısı" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Arama sonuçlarını indir" @@ -358,19 +411,19 @@ msgstr "" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Öneriler" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "önceki sayfa" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "sonraki sayfa" @@ -406,13 +459,13 @@ msgstr "Sömürenler" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "mıknatıs bağlantı" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "torrent dosyası" @@ -420,18 +473,37 @@ msgstr "torrent dosyası" msgid "Click on the magnifier to perform search" msgstr "Arama yapmak için büyütece tıklayın" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "önbellek" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Gücümün kaynağı" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta arama motoru" @@ -449,17 +521,17 @@ msgid "General" msgstr "Genel" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Motorlar" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Eklentiler" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -494,36 +566,46 @@ msgstr "İçeriyi süz" msgid "Change searx layout" msgstr "searx yerleşim düzenini değiştir" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -531,7 +613,7 @@ msgstr "" msgid "Search results" msgstr "Arama sonuçları" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Bağlantılar" @@ -540,18 +622,26 @@ msgstr "Bağlantılar" msgid "Start search" msgstr "Aramayı başlat" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Arama süzgeçlerini göster" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Arama süzgeçlerini gizle" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "istatistikler" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.mo b/searx/translations/zh_CN/LC_MESSAGES/messages.moBinary files differ.diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.po b/searx/translations/zh_CN/LC_MESSAGES/messages.po@@ -9,89 +9,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 16:25+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-05 09:42+0000\n" "Last-Translator: wenke\n" "Language-Team: Chinese (China) (http://www.transifex.com/asciimoo/searx/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "文件" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" -msgstr "一般" +msgstr "全部" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "音乐" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "社交媒体" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "图片" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "视频" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "新闻" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "地图" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "学术" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes}分钟之前" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours}小时{minutes}分钟之前" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "页面加载 （秒）" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "结果数" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "得分" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "每个结果等分" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "错误" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "DOAI改写" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "如果可能的话重定向HTTP链接到HTTPS" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "无限滚动" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "滚动到当前页面底部时自动加载下一页" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "在新标签页打开搜索链接" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "搜索结果默认在原窗口打开。这个插件使其在新标签页/窗口打开。（需要启用JavaScript ）" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "搜索类别选择" @@ -100,13 +129,13 @@ msgstr "搜索类别选择" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "如果选中一个类别立即搜索。禁用选择多个类别功能。（JavaScript 启用）" +msgstr "选中一个类别立即搜索。禁用可以选择多个类别搜索。（JavaScript 启用）" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "搜索“ip”显示你的ip和搜索内容包括“user agent”显示你的user agent。" +msgstr "搜索“ip”显示你的ip以及搜索内容含有“user agent”显示你的user agent。" #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -116,6 +145,32 @@ msgstr "移除跟踪链接" msgid "Remove trackers arguments from the returned URL" msgstr "从返回的链接中移除跟踪参数" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "类vim快捷键" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "使用类vim快捷键浏览搜索结果（JavaScript启用）。按“h”键获取帮助。" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "未找到网页" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "返回%(search_page)s。" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "搜索页面" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +257,8 @@ msgstr "方法" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "安全搜索" @@ -261,31 +316,30 @@ msgid "Red" msgstr "红色" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "目前使用的搜索引擎" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "搜索引擎名称" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "类别" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,61 +347,60 @@ msgstr "允许" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "阻止" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " "data about you." -msgstr "这些设置保存你的cookie，这代表我们不能储存你的数据。" +msgstr "这些设置保存在你的cookie，我们不能保存你的数据。" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "这些cookie是为了让你更加方便，我们不会使用这些cookie跟踪你。" +msgstr "这些cookie是为了让你更加方便，我们不会使用这些cookie追踪你。" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "保存" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "恢复默认" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "返回" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "搜索链接" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "下载结果" @@ -358,19 +411,19 @@ msgstr "回答" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "搜索建议" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "上一页" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "下一页" @@ -406,13 +459,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "磁力链接" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "种子文件" @@ -420,18 +473,37 @@ msgstr "种子文件" msgid "Click on the magnifier to perform search" msgstr "点击放大镜执行搜索" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "在新标签页打开搜索结果" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "开" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "关" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "缓存" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "高级设置" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "一个尊重隐私，可再开发的元搜索引擎" @@ -449,17 +521,17 @@ msgid "General" msgstr "常规" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "搜索引擎" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "插件" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookie" @@ -484,7 +556,7 @@ msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" -msgstr "更改请求方法，<a href=\"http://zh.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">了解更多请求方法相关</a>" +msgstr "更改请求方法，<a href=\"http://zh.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">深入了解请求方法</a>" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -494,36 +566,46 @@ msgstr "过滤内容" msgid "Change searx layout" msgstr "改变searx布局" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "选择这个主题的样式" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "样式" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "快捷键" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "平均时间" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "最大时间" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "这是searx保存在你的电脑上的cookie列表。" +msgstr "这里展示了searx保存在你的电脑上的cookie。" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." -msgstr "有了这个列表，你可以评价searx透明度。" +msgstr "有了这个列表，你可以评估searx透明度。" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "cookie名称" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "值" @@ -531,7 +613,7 @@ msgstr "值" msgid "Search results" msgstr "搜索结果" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "链接" @@ -540,18 +622,26 @@ msgstr "链接" msgid "Start search" msgstr "开始搜索" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "显示搜索过滤器" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "隐藏搜索过滤器" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "统计" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "时间不限" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "过去一天内" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "过去一周内" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "过去一个月内" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5diff --git a/searx/utils.py b/searx/utils.py@@ -9,6 +9,7 @@ from HTMLParser import HTMLParser from random import choice from searx.version import VERSION_STRING +from searx.languages import language_codes from searx import settings from searx import logger @@ -255,3 +256,17 @@ def get_torrent_size(filesize, filesize_multiplier): filesize = None return filesize + + +def is_valid_lang(lang): + is_abbr = (len(lang) == 2) + if is_abbr: + for l in language_codes: + if l[0][:2] == lang.lower(): + return (True, l[0][:2], l[1].lower()) + return False + else: + for l in language_codes: + if l[1].lower() == lang.lower(): + return (True, l[0][:2], l[1].lower()) + return Falsediff --git a/searx/version.py b/searx/version.py@@ -18,7 +18,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. # version of searx VERSION_MAJOR = 0 -VERSION_MINOR = 9 +VERSION_MINOR = 10 VERSION_BUILD = 0 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR,diff --git a/searx/webapp.py b/searx/webapp.py@@ -395,11 +395,9 @@ def index(): search.paging = True if search.request_data.get('format', 'html') == 'html': - if 'content' in result: - result['content'] = highlight_content(result['content'], - search.query.encode('utf-8')) # noqa - result['title'] = highlight_content(result['title'], - search.query.encode('utf-8')) + if 'content' in result and result['content']: + result['content'] = highlight_content(result['content'][:1024], search.query.encode('utf-8')) + result['title'] = highlight_content(result['title'], search.query.encode('utf-8')) else: if result.get('content'): result['content'] = html_to_text(result['content']).strip() @@ -559,7 +557,6 @@ def preferences(): lang = request.preferences.get_value('language') disabled_engines = request.preferences.engines.get_disabled() allowed_plugins = request.preferences.plugins.get_enabled() - results_on_new_tab = request.preferences.get_value('results_on_new_tab') # stats for preferences page stats = {} @@ -724,7 +721,7 @@ def config(): @app.errorhandler(404) def page_not_found(e): - return render('404.html') + return render('404.html'), 404 def run(): @@ -732,7 +729,8 @@ def run(): debug=settings['general']['debug'], use_debugger=settings['general']['debug'], port=settings['server']['port'], - host=settings['server']['bind_address'] + host=settings['server']['bind_address'], + threaded=True )diff --git a/tests/robot/test_basic.robot b/tests/robot/test_basic.robot@@ -24,8 +24,8 @@ Preferences page Page Should Contain Preferences Page Should Contain Default categories Page Should Contain Currently used search engines - Page Should Contain dummy_dummy - Page Should Contain general_dummy + Page Should Contain dummy dummy + Page Should Contain general dummy Switch category Go To http://localhost:11111/preferences @@ -67,7 +67,7 @@ Change theme Page Should Contain about Page Should Contain preferences Go To http://localhost:11111/preferences - List Selection Should Be theme default + List Selection Should Be theme legacy Select From List theme oscar Submit Form id=search_form Location Should Be http://localhost:11111/ @@ -139,7 +139,7 @@ Block a plugin Page Should Contain about Page Should Contain preferences Go To http://localhost:11111/preferences - List Selection Should Be theme default + List Selection Should Be theme legacy Select From List theme oscar Submit Form id=search_form Location Should Be http://localhost:11111/diff --git a/tests/unit/engines/test_digbt.py b/tests/unit/engines/test_digbt.py@@ -28,7 +28,9 @@ class TestDigBTEngine(SearxTestCase): <table class="table"> <tr><td class="x-item"> <div> - <a title="The Big Bang Theory" class="title" href="/The-Big-Bang-Theory-d2.html">The Big Bang Theory</a> + <a title="The Big Bang Theory" class="title" href="/The-Big-Bang-Theory-d2.html"> + The Big <span class="highlight">Bang</span> Theory + </a> <span class="ctime"><span style="color:red;">4 hours ago</span></span> </div> <div class="files">diff --git a/tests/unit/engines/test_wolframalpha_api.py b/tests/unit/engines/test_wolframalpha_api.py@@ -103,7 +103,8 @@ class TestWolframAlphaAPIEngine(SearxTestCase): self.assertEqual(referer_url, results[0]['urls'][0]['url']) self.assertEqual('Wolfram|Alpha', results[0]['urls'][0]['title']) self.assertEqual(referer_url, results[1]['url']) - self.assertEqual('Wolfram|Alpha', results[1]['title']) + self.assertEqual('Wolfram|Alpha (input_plaintext)', results[1]['title']) + self.assertIn('result_plaintext', results[1]['content']) # test calc xml = """<?xml version='1.0' encoding='UTF-8'?> @@ -161,4 +162,5 @@ class TestWolframAlphaAPIEngine(SearxTestCase): self.assertEqual(referer_url, results[0]['urls'][0]['url']) self.assertEqual('Wolfram|Alpha', results[0]['urls'][0]['title']) self.assertEqual(referer_url, results[1]['url']) - self.assertEqual('Wolfram|Alpha', results[1]['title']) + self.assertEqual('Wolfram|Alpha (integral_plaintext)', results[1]['title']) + self.assertIn('integral_plaintext', results[1]['content'])diff --git a/tests/unit/engines/test_wolframalpha_noapi.py b/tests/unit/engines/test_wolframalpha_noapi.py@@ -140,7 +140,8 @@ class TestWolframAlphaNoAPIEngine(SearxTestCase): self.assertEqual(referer_url, results[0]['urls'][0]['url']) self.assertEqual('Wolfram|Alpha', results[0]['urls'][0]['title']) self.assertEqual(referer_url, results[1]['url']) - self.assertEqual('Wolfram|Alpha', results[1]['title']) + self.assertEqual('Wolfram|Alpha (input_plaintext)', results[1]['title']) + self.assertIn('result_plaintext', results[1]['content']) # test calc json = r""" @@ -219,4 +220,5 @@ class TestWolframAlphaNoAPIEngine(SearxTestCase): self.assertEqual(referer_url, results[0]['urls'][0]['url']) self.assertEqual('Wolfram|Alpha', results[0]['urls'][0]['title']) self.assertEqual(referer_url, results[1]['url']) - self.assertEqual('Wolfram|Alpha', results[1]['title']) + self.assertEqual('Wolfram|Alpha (integral_plaintext)', results[1]['title']) + self.assertIn('integral_plaintext', results[1]['content'])diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py@@ -44,7 +44,7 @@ class ViewsTestCase(SearxTestCase): webapp.Search.search = search_mock def get_current_theme_name_mock(override=None): - return 'default' + return 'legacy' webapp.get_current_theme_name = get_current_theme_name_mock @@ -58,7 +58,7 @@ class ViewsTestCase(SearxTestCase): def test_index_html(self): result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '<h3 class="result_title"><img width="14" height="14" class="favicon" src="/static/themes/default/img/icons/icon_youtube.ico" alt="youtube" /><a href="http://second.test.xyz" rel="noreferrer">Second <span class="highlight">Test</span></a></h3>', # noqa + '<h3 class="result_title"><img width="14" height="14" class="favicon" src="/static/themes/legacy/img/icons/icon_youtube.ico" alt="youtube" /><a href="http://second.test.xyz" rel="noreferrer">Second <span class="highlight">Test</span></a></h3>', # noqa result.data ) self.assertIn(