From 57e618edf7a72cb65620e5664941fb11130d2145 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Thu, 9 Jul 2015 23:05:45 +0200 Subject: [PATCH 01/53] Add Image on opensearch --- searx/templates/courgette/opensearch.xml | 1 + searx/templates/default/opensearch.xml | 1 + searx/templates/oscar/opensearch.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/searx/templates/courgette/opensearch.xml b/searx/templates/courgette/opensearch.xml index f39283f99..ff9eac55b 100644 --- a/searx/templates/courgette/opensearch.xml +++ b/searx/templates/courgette/opensearch.xml @@ -3,6 +3,7 @@ searx Search searx UTF-8 + {{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }} searx metasearch {% if opensearch_method == 'get' %} diff --git a/searx/templates/default/opensearch.xml b/searx/templates/default/opensearch.xml index f39283f99..ff9eac55b 100644 --- a/searx/templates/default/opensearch.xml +++ b/searx/templates/default/opensearch.xml @@ -3,6 +3,7 @@ searx Search searx UTF-8 + {{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }} searx metasearch {% if opensearch_method == 'get' %} diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml index f39283f99..ff9eac55b 100644 --- a/searx/templates/oscar/opensearch.xml +++ b/searx/templates/oscar/opensearch.xml @@ -3,6 +3,7 @@ searx Search searx UTF-8 + {{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }} searx metasearch {% if opensearch_method == 'get' %} From d0830d4edf8a9ee794d5897afd813c88f0ea720b Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 2 Aug 2015 19:03:55 +0200 Subject: [PATCH 02/53] [enh] add settings option to set listening address - closes #397 --- searx/settings.yml | 1 + searx/settings_robot.yml | 1 + searx/webapp.py | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/searx/settings.yml b/searx/settings.yml index 03d895363..31bde02af 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,5 +1,6 @@ server: port : 8888 + bind_address : "127.0.0.1" # address to listen on secret_key : "ultrasecretkey" # change this! debug : False # Debug mode, only for development request_timeout : 2.0 # seconds diff --git a/searx/settings_robot.yml b/searx/settings_robot.yml index c6fe2282f..36907e6eb 100644 --- a/searx/settings_robot.yml +++ b/searx/settings_robot.yml @@ -1,5 +1,6 @@ server: port : 11111 + bind_address : 127.0.0.1 secret_key : "ultrasecretkey" # change this! debug : False request_timeout : 3.0 # seconds diff --git a/searx/webapp.py b/searx/webapp.py index fb7157b47..d45d01ecc 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -777,7 +777,8 @@ def run(): app.run( debug=settings['server']['debug'], use_debugger=settings['server']['debug'], - port=settings['server']['port'] + port=settings['server']['port'], + host=settings['server']['bind_address'] ) From 1fcf066a8188b28eb644ea304a131d40b1b341eb Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 2 Aug 2015 19:38:27 +0200 Subject: [PATCH 03/53] [mod] change settings file structure according to #314 --- searx/autocomplete.py | 2 +- searx/engines/__init__.py | 2 +- searx/poolrequests.py | 8 ++++---- searx/settings.yml | 26 +++++++++++++++----------- searx/settings_robot.yml | 17 ++++++++++++----- searx/utils.py | 3 ++- searx/webapp.py | 22 +++++++++++----------- 7 files changed, 46 insertions(+), 34 deletions(-) diff --git a/searx/autocomplete.py b/searx/autocomplete.py index 1a324b8a9..264d0cc1f 100644 --- a/searx/autocomplete.py +++ b/searx/autocomplete.py @@ -29,7 +29,7 @@ from searx.poolrequests import get as http_get def get(*args, **kwargs): if 'timeout' not in kwargs: - kwargs['timeout'] = settings['server']['request_timeout'] + kwargs['timeout'] = settings['outgoing']['request_timeout'] return http_get(*args, **kwargs) diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index 42e1f08bc..447138d3b 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -75,7 +75,7 @@ def load_engine(engine_data): engine.safesearch = False if not hasattr(engine, 'timeout'): - engine.timeout = settings['server']['request_timeout'] + engine.timeout = settings['outgoing']['request_timeout'] if not hasattr(engine, 'shortcut'): engine.shortcut = '' diff --git a/searx/poolrequests.py b/searx/poolrequests.py index e2a757665..c44bdc7e2 100644 --- a/searx/poolrequests.py +++ b/searx/poolrequests.py @@ -39,11 +39,11 @@ class HTTPAdapterWithConnParams(requests.adapters.HTTPAdapter): block=self._pool_block, **self._conn_params) -if settings.get('source_ips'): +if settings['outgoing'].get('source_ips'): http_adapters = cycle(HTTPAdapterWithConnParams(pool_connections=100, source_address=(source_ip, 0)) - for source_ip in settings['source_ips']) + for source_ip in settings['outgoing']['source_ips']) https_adapters = cycle(HTTPAdapterWithConnParams(pool_connections=100, source_address=(source_ip, 0)) - for source_ip in settings['source_ips']) + for source_ip in settings['outgoing']['source_ips']) else: http_adapters = cycle((HTTPAdapterWithConnParams(pool_connections=100), )) https_adapters = cycle((HTTPAdapterWithConnParams(pool_connections=100), )) @@ -69,7 +69,7 @@ def request(method, url, **kwargs): """same as requests/requests/api.py request(...) except it use SessionSinglePool and force proxies""" global settings session = SessionSinglePool() - kwargs['proxies'] = settings.get('outgoing_proxies', None) + kwargs['proxies'] = settings['outgoing'].get('proxies', None) response = session.request(method=method, url=url, **kwargs) session.close() return response diff --git a/searx/settings.yml b/searx/settings.yml index 31bde02af..de018dcb7 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,28 +1,32 @@ +general: + debug : False # Debug mode, only for development + server: port : 8888 bind_address : "127.0.0.1" # address to listen on secret_key : "ultrasecretkey" # change this! - debug : False # Debug mode, only for development - request_timeout : 2.0 # seconds base_url : False # Set custom base_url. Possible values: False or "https://your.custom.host/location/" + image_proxy : False # Proxying image results through searx + +ui: themes_path : "" # Custom ui themes path - leave it blank if you didn't change default_theme : oscar # ui theme - useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator - image_proxy : False # Proxying image results through searx default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section +outgoing: # communication with search engines + request_timeout : 2.0 # seconds + useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator # 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 -#outgoing_proxies : -# http : http://127.0.0.1:8080 -# https: http://127.0.0.1:8080 - +# proxies : +# http : http://127.0.0.1:8080 +# https: http://127.0.0.1:8080 # uncomment below section only if you have more than one network interface # which can be the source of outgoing search requests -#source_ips: -# - 1.1.1.1 -# - 1.1.1.2 +# source_ips: +# - 1.1.1.1 +# - 1.1.1.2 engines: - name : wikipedia diff --git a/searx/settings_robot.yml b/searx/settings_robot.yml index 36907e6eb..3ca474d6f 100644 --- a/searx/settings_robot.yml +++ b/searx/settings_robot.yml @@ -1,14 +1,21 @@ +general: + debug : False + server: port : 11111 bind_address : 127.0.0.1 secret_key : "ultrasecretkey" # change this! - debug : False - request_timeout : 3.0 # seconds - base_url: False + base_url : False + image_proxy : False + +ui: themes_path : "" default_theme : default - https_rewrite : True - image_proxy : False + default_locale : "" + +outgoing: + request_timeout : 1.0 # seconds + useragent_suffix : "" engines: - name : general_dummy diff --git a/searx/utils.py b/searx/utils.py index c9784159c..cc31726b6 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -26,6 +26,7 @@ ua_versions = ('33.0', ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64', 'X11; Linux x86') + ua = "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}" blocked_tags = ('script', @@ -40,7 +41,7 @@ def gen_useragent(): def searx_useragent(): return 'searx/{searx_version} {suffix}'.format( searx_version=VERSION_STRING, - suffix=settings['server'].get('useragent_suffix', '')) + suffix=settings['outgoing'].get('useragent_suffix', '')) def highlight_content(content, query): diff --git a/searx/webapp.py b/searx/webapp.py index d45d01ecc..778956cce 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -77,11 +77,11 @@ except ImportError: static_path, templates_path, themes =\ - get_themes(settings['themes_path'] - if settings.get('themes_path') + get_themes(settings['ui']['themes_path'] + if settings['ui']['themes_path'] else searx_dir) -default_theme = settings['server'].get('default_theme', 'default') +default_theme = settings['ui']['default_theme'] static_files = get_static_files(searx_dir) @@ -121,15 +121,15 @@ _category_names = (gettext('files'), gettext('news'), gettext('map')) -outgoing_proxies = settings.get('outgoing_proxies', None) +outgoing_proxies = settings['outgoing'].get('proxies', None) @babel.localeselector def get_locale(): locale = request.accept_languages.best_match(settings['locales'].keys()) - if settings['server'].get('default_locale'): - locale = settings['server']['default_locale'] + if settings['ui'].get('default_locale'): + locale = settings['ui']['default_locale'] if request.cookies.get('locale', '') in settings['locales']: locale = request.cookies.get('locale', '') @@ -640,12 +640,12 @@ def preferences(): stats[e.name] = {'time': None, 'warn_timeout': False, 'warn_time': False} - if e.timeout > settings['server']['request_timeout']: + if e.timeout > settings['outgoing']['request_timeout']: stats[e.name]['warn_timeout'] = True for engine_stat in get_engines_stats()[0][1]: stats[engine_stat.get('name')]['time'] = round(engine_stat.get('avg'), 3) - if engine_stat.get('avg') > settings['server']['request_timeout']: + if engine_stat.get('avg') > settings['outgoing']['request_timeout']: stats[engine_stat.get('name')]['warn_time'] = True # end of stats @@ -683,7 +683,7 @@ def image_proxy(): resp = requests.get(url, stream=True, - timeout=settings['server'].get('request_timeout', 2), + timeout=settings['outgoing']['request_timeout'], headers=headers, proxies=outgoing_proxies) @@ -775,8 +775,8 @@ def clear_cookies(): def run(): app.run( - debug=settings['server']['debug'], - use_debugger=settings['server']['debug'], + debug=settings['general']['debug'], + use_debugger=settings['general']['debug'], port=settings['server']['port'], host=settings['server']['bind_address'] ) From c1d9cfd9ae0cc78b91ee5cc339266c26c09e0e4c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 2 Aug 2015 19:59:54 +0200 Subject: [PATCH 04/53] [enh] default settings option to autocomplete backend - #396 --- searx/settings.yml | 4 ++++ searx/settings_robot.yml | 4 ++++ searx/webapp.py | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/searx/settings.yml b/searx/settings.yml index de018dcb7..ffc3044a5 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,6 +1,10 @@ general: debug : False # Debug mode, only for development +search: + safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict + autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default + server: port : 8888 bind_address : "127.0.0.1" # address to listen on diff --git a/searx/settings_robot.yml b/searx/settings_robot.yml index 3ca474d6f..f14443cf5 100644 --- a/searx/settings_robot.yml +++ b/searx/settings_robot.yml @@ -1,6 +1,10 @@ general: debug : False +search: + safe_search : 0 + autocomplete : 0 + server: port : 11111 bind_address : 127.0.0.1 diff --git a/searx/webapp.py b/searx/webapp.py index 778956cce..4292b32d7 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -263,7 +263,7 @@ def image_proxify(url): def render(template_name, override_theme=None, **kwargs): blocked_engines = get_blocked_engines(engines, request.cookies) - autocomplete = request.cookies.get('autocomplete') + autocomplete = request.cookies.get('autocomplete', settings['search']['autocomplete']) if autocomplete not in autocomplete_backends: autocomplete = None @@ -491,7 +491,7 @@ def autocompleter(): return '', 400 # run autocompleter - completer = autocomplete_backends.get(request.cookies.get('autocomplete')) + completer = autocomplete_backends.get(request.cookies.get('autocomplete', settings['search']['autocomplete'])) # parse searx specific autocompleter results like !bang raw_results = searx_bang(query) From 43cd8e0c4129571a263429173c7a9fe7092e1dec Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 2 Aug 2015 20:29:19 +0200 Subject: [PATCH 05/53] [enh] default settings option to safe_search - #396 --- searx/search.py | 5 +++-- searx/webapp.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/searx/search.py b/searx/search.py index bb440352b..5054ce798 100644 --- a/searx/search.py +++ b/searx/search.py @@ -23,6 +23,7 @@ from operator import itemgetter from Queue import Queue from time import time from urlparse import urlparse, unquote +from searx import settings from searx.engines import ( categories, engines ) @@ -480,9 +481,9 @@ class Search(object): try: # 0 = None, 1 = Moderate, 2 = Strict - request_params['safesearch'] = int(request.cookies.get('safesearch', 1)) + request_params['safesearch'] = int(request.cookies.get('safesearch')) except ValueError: - request_params['safesearch'] = 1 + request_params['safesearch'] = settings['search']['safe_search'] # update request parameters dependent on # search-engine (contained in engines folder) diff --git a/searx/webapp.py b/searx/webapp.py index 4292b32d7..06f246620 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -312,7 +312,7 @@ def render(template_name, override_theme=None, **kwargs): kwargs['method'] = request.cookies.get('method', 'POST') - kwargs['safesearch'] = request.cookies.get('safesearch', '1') + kwargs['safesearch'] = request.cookies.get('safesearch', str(settings['search']['safe_search'])) # override url_for function in templates kwargs['url_for'] = url_for_theme @@ -542,7 +542,7 @@ def preferences(): locale = None autocomplete = '' method = 'POST' - safesearch = '1' + safesearch = settings['search']['safe_search'] for pd_name, pd in request.form.items(): if pd_name.startswith('category_'): category = pd_name[9:] From 7c9f931baff35e8a8986810971fa1949f18c19ad Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 2 Aug 2015 20:41:44 +0200 Subject: [PATCH 06/53] [fix] type error --- searx/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/search.py b/searx/search.py index 5054ce798..6288a46eb 100644 --- a/searx/search.py +++ b/searx/search.py @@ -482,7 +482,7 @@ class Search(object): try: # 0 = None, 1 = Moderate, 2 = Strict request_params['safesearch'] = int(request.cookies.get('safesearch')) - except ValueError: + except Exception: request_params['safesearch'] = settings['search']['safe_search'] # update request parameters dependent on From 3a8eafcc6b19b4b47b10534fbc683e4e3fbc064d Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 12 Aug 2015 15:49:48 +0200 Subject: [PATCH 07/53] [fix] cookie parameter type --- searx/webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/webapp.py b/searx/webapp.py index 06f246620..7f1621a6a 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -624,7 +624,7 @@ def preferences(): resp.set_cookie('method', method, max_age=cookie_max_age) - resp.set_cookie('safesearch', safesearch, max_age=cookie_max_age) + resp.set_cookie('safesearch', str(safesearch), max_age=cookie_max_age) resp.set_cookie('image_proxy', image_proxy, max_age=cookie_max_age) From 9cec9770be27cf4fc47d1caa2bccc59d911c20c2 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 24 Aug 2015 11:03:06 +0200 Subject: [PATCH 08/53] [fix] show debug output when enabled --- searx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/__init__.py b/searx/__init__.py index 2d545a809..ea21e8f13 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -40,7 +40,7 @@ else: with open(settings_path) as settings_yaml: settings = load(settings_yaml) -if settings.get('server', {}).get('debug'): +if settings.get('general', {}).get('debug'): logging.basicConfig(level=logging.DEBUG) else: logging.basicConfig(level=logging.WARNING) From 5bffa9ca33f8ec98baebca13ee9b16262bfe4e8d Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 24 Aug 2015 11:18:58 +0200 Subject: [PATCH 09/53] [fix] rewrite scheme to http if there is no one, FIX #390 --- searx/search.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/searx/search.py b/searx/search.py index 6288a46eb..1bf05f7f9 100644 --- a/searx/search.py +++ b/searx/search.py @@ -206,6 +206,10 @@ def score_results(results): # if there is no duplicate found, append result else: res['score'] = score + # if the result has no scheme, use http as default + if res['parsed_url'].scheme == '': + res['parsed_url'] = res['parsed_url']._replace(scheme="http") + results.append(res) results = sorted(results, key=itemgetter('score'), reverse=True) From 23b9095cbf2d31a1495ee3d63a55bd81548cd367 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 24 Aug 2015 11:28:55 +0200 Subject: [PATCH 10/53] [fix] improve result handling of startpage engine --- searx/engines/startpage.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 9d5b4befe..08e4f7a5b 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -66,7 +66,11 @@ def response(resp): url = link.attrib.get('href') # block google-ad url's - if re.match("^http(s|)://www.google.[a-z]+/aclk.*$", url): + if re.match("^http(s|)://(www\.)?google\.[a-z]+/aclk.*$", url): + continue + + # block startpage search url's + if re.match("^http(s|)://(www\.)?startpage\.com/do/search\?.*$", url): continue title = escape(extract_text(link)) From 996c96fffff328497c2ba305c61e064256c84188 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 24 Aug 2015 11:31:30 +0200 Subject: [PATCH 11/53] [fix] block ixquick search url's --- searx/engines/startpage.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 08e4f7a5b..7d58f7f01 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -73,6 +73,10 @@ def response(resp): if re.match("^http(s|)://(www\.)?startpage\.com/do/search\?.*$", url): continue + # block ixquick search url's + if re.match("^http(s|)://(www\.)?ixquick\.com/do/search\?.*$", url): + continue + title = escape(extract_text(link)) if result.xpath('./p[@class="desc"]'): From 28493d41a327128762c6286a625d219e4b0b4e2e Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 25 Aug 2015 13:12:51 +0200 Subject: [PATCH 12/53] [fix] handle missing url in twitter results --- searx/engines/twitter.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/searx/engines/twitter.py b/searx/engines/twitter.py index a0ee18a47..36efac186 100644 --- a/searx/engines/twitter.py +++ b/searx/engines/twitter.py @@ -55,10 +55,14 @@ def response(resp): # parse results for tweet in dom.xpath(results_xpath): - link = tweet.xpath(link_xpath)[0] + try: + link = tweet.xpath(link_xpath)[0] + content = extract_text(tweet.xpath(content_xpath)[0]) + except Exception: + continue + url = urljoin(base_url, link.attrib.get('href')) title = extract_text(tweet.xpath(title_xpath)) - content = extract_text(tweet.xpath(content_xpath)[0]) pubdate = tweet.xpath(timestamp_xpath) if len(pubdate) > 0: From 42ac2c5b56607a8d061063e77d39b2d467ad9f9c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 25 Aug 2015 22:02:18 +0200 Subject: [PATCH 13/53] [fix] check empty engine language attribute - fixes subtitleseeker --- searx/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/search.py b/searx/search.py index 1bf05f7f9..ca24581ac 100644 --- a/searx/search.py +++ b/searx/search.py @@ -478,7 +478,7 @@ class Search(object): request_params['started'] = time() request_params['pageno'] = self.pageno - if hasattr(engine, 'language'): + if hasattr(engine, 'language') and engine.language: request_params['language'] = engine.language else: request_params['language'] = self.lang From 3f31e1ce6bcaea595a6e773c4ff729cf7a9e31e1 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 25 Aug 2015 22:56:40 +0200 Subject: [PATCH 14/53] [fix] piratebay tld according to wikipedia --- searx/engines/piratebay.py | 2 +- searx/tests/engines/test_piratebay.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/searx/engines/piratebay.py b/searx/engines/piratebay.py index ab0dfd44c..55446b410 100644 --- a/searx/engines/piratebay.py +++ b/searx/engines/piratebay.py @@ -20,7 +20,7 @@ categories = ['videos', 'music', 'files'] paging = True # search-url -url = 'https://thepiratebay.am/' +url = 'https://thepiratebay.se/' search_url = url + 'search/{search_term}/{pageno}/99/{search_type}' # piratebay specific type-definitions diff --git a/searx/tests/engines/test_piratebay.py b/searx/tests/engines/test_piratebay.py index 6ebbcf713..5699380be 100644 --- a/searx/tests/engines/test_piratebay.py +++ b/searx/tests/engines/test_piratebay.py @@ -15,7 +15,7 @@ class TestPiratebayEngine(SearxTestCase): params = piratebay.request(query, dicto) self.assertIn('url', params) self.assertIn(query, params['url']) - self.assertIn('piratebay.am', params['url']) + self.assertIn('piratebay.se', params['url']) self.assertIn('0', params['url']) dicto['category'] = 'music' @@ -99,7 +99,7 @@ class TestPiratebayEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 2) self.assertEqual(results[0]['title'], 'This is the title') - self.assertEqual(results[0]['url'], 'https://thepiratebay.am/this.is.the.link') + self.assertEqual(results[0]['url'], 'https://thepiratebay.se/this.is.the.link') self.assertEqual(results[0]['content'], 'This is the content and should be OK') self.assertEqual(results[0]['seed'], 13) self.assertEqual(results[0]['leech'], 334) @@ -149,7 +149,7 @@ class TestPiratebayEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 1) self.assertEqual(results[0]['title'], 'This is the title') - self.assertEqual(results[0]['url'], 'https://thepiratebay.am/this.is.the.link') + self.assertEqual(results[0]['url'], 'https://thepiratebay.se/this.is.the.link') self.assertEqual(results[0]['content'], 'This is the content and should be OK') self.assertEqual(results[0]['seed'], 0) self.assertEqual(results[0]['leech'], 0) From b9c8039d743376ab134adb3da146519c5353c36c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 25 Aug 2015 22:56:45 +0200 Subject: [PATCH 15/53] [mod] disable searchcode SSL verification (unable to get local issuer) --- searx/engines/searchcode_code.py | 5 +++++ searx/engines/searchcode_doc.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/searx/engines/searchcode_code.py b/searx/engines/searchcode_code.py index 21d9c4ac2..bd5eb71d2 100644 --- a/searx/engines/searchcode_code.py +++ b/searx/engines/searchcode_code.py @@ -34,6 +34,11 @@ def request(query, params): params['url'] = search_url.format(query=urlencode({'q': query}), pageno=params['pageno']-1) + # Disable SSL verification + # error: (60) SSL certificate problem: unable to get local issuer + # certificate + params['verify'] = False + return params diff --git a/searx/engines/searchcode_doc.py b/searx/engines/searchcode_doc.py index 582b98d79..9453f31a4 100644 --- a/searx/engines/searchcode_doc.py +++ b/searx/engines/searchcode_doc.py @@ -27,6 +27,11 @@ def request(query, params): params['url'] = search_url.format(query=urlencode({'q': query}), pageno=params['pageno']-1) + # Disable SSL verification + # error: (60) SSL certificate problem: unable to get local issuer + # certificate + params['verify'] = False + return params From 604f32f67276a34a3ead265ff89d3bb807902b26 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 28 Aug 2015 14:51:32 +0200 Subject: [PATCH 16/53] [fix] bing unicode encode error - fixes #408 --- searx/engines/bing.py | 2 +- searx/engines/bing_images.py | 2 +- searx/engines/bing_news.py | 2 +- searx/tests/engines/test_bing.py | 8 ++++---- searx/tests/engines/test_bing_images.py | 10 +++++----- searx/tests/engines/test_bing_news.py | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/searx/engines/bing.py b/searx/engines/bing.py index c72e6aeff..171606cf6 100644 --- a/searx/engines/bing.py +++ b/searx/engines/bing.py @@ -52,7 +52,7 @@ def request(query, params): def response(resp): results = [] - dom = html.fromstring(resp.content) + dom = html.fromstring(resp.text) # parse results for result in dom.xpath('//div[@class="sa_cc"]'): diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py index 839b8e5be..06850dfe1 100644 --- a/searx/engines/bing_images.py +++ b/searx/engines/bing_images.py @@ -63,7 +63,7 @@ def request(query, params): def response(resp): results = [] - dom = html.fromstring(resp.content) + dom = html.fromstring(resp.text) # init regex for yaml-parsing p = re.compile('({|,)([a-z]+):(")') diff --git a/searx/engines/bing_news.py b/searx/engines/bing_news.py index a2397c48e..943bf882e 100644 --- a/searx/engines/bing_news.py +++ b/searx/engines/bing_news.py @@ -68,7 +68,7 @@ def request(query, params): def response(resp): results = [] - rss = etree.fromstring(resp.content) + rss = etree.fromstring(resp.text) ns = rss.nsmap diff --git a/searx/tests/engines/test_bing.py b/searx/tests/engines/test_bing.py index 52a049f01..bce221440 100644 --- a/searx/tests/engines/test_bing.py +++ b/searx/tests/engines/test_bing.py @@ -29,10 +29,10 @@ class TestBingEngine(SearxTestCase): self.assertRaises(AttributeError, bing.response, '') self.assertRaises(AttributeError, bing.response, '[]') - response = mock.Mock(content='') + response = mock.Mock(text='') self.assertEqual(bing.response(response), []) - response = mock.Mock(content='') + response = mock.Mock(text='') self.assertEqual(bing.response(response), []) html = """ @@ -54,7 +54,7 @@ class TestBingEngine(SearxTestCase): """ - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) @@ -81,7 +81,7 @@ class TestBingEngine(SearxTestCase): """ - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) diff --git a/searx/tests/engines/test_bing_images.py b/searx/tests/engines/test_bing_images.py index f869da79d..f42dff7e8 100644 --- a/searx/tests/engines/test_bing_images.py +++ b/searx/tests/engines/test_bing_images.py @@ -31,10 +31,10 @@ class TestBingImagesEngine(SearxTestCase): self.assertRaises(AttributeError, bing_images.response, '') self.assertRaises(AttributeError, bing_images.response, '[]') - response = mock.Mock(content='') + response = mock.Mock(text='') self.assertEqual(bing_images.response(response), []) - response = mock.Mock(content='') + response = mock.Mock(text='') self.assertEqual(bing_images.response(response), []) html = """ @@ -52,7 +52,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2 """ html = html.replace('\r\n', '').replace('\n', '').replace('\r', '') - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing_images.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) @@ -75,7 +75,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2 style="height:144px;" width="178" height="144"/> """ - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing_images.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 0) @@ -263,7 +263,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2 """ html = html.replace('\r\n', '').replace('\n', '').replace('\r', '') - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing_images.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 10) diff --git a/searx/tests/engines/test_bing_news.py b/searx/tests/engines/test_bing_news.py index a64d59b7b..c6c402650 100644 --- a/searx/tests/engines/test_bing_news.py +++ b/searx/tests/engines/test_bing_news.py @@ -28,10 +28,10 @@ class TestBingNewsEngine(SearxTestCase): self.assertRaises(AttributeError, bing_news.response, '') self.assertRaises(AttributeError, bing_news.response, '[]') - response = mock.Mock(content='') + response = mock.Mock(text='') self.assertEqual(bing_news.response(response), []) - response = mock.Mock(content='') + response = mock.Mock(text='') self.assertEqual(bing_news.response(response), []) html = """ @@ -66,7 +66,7 @@ class TestBingNewsEngine(SearxTestCase): """ # noqa - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing_news.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 2) @@ -105,7 +105,7 @@ class TestBingNewsEngine(SearxTestCase): """ # noqa - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing_news.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) @@ -128,11 +128,11 @@ class TestBingNewsEngine(SearxTestCase): """ # noqa - response = mock.Mock(content=html) + response = mock.Mock(text=html) results = bing_news.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 0) html = """gabarge""" - response = mock.Mock(content=html) + response = mock.Mock(text=html) self.assertRaises(lxml.etree.XMLSyntaxError, bing_news.response, response) From 8c4d9b79d5727aa803b88e8181f7edabe46b40c4 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 1 Sep 2015 15:14:02 +0200 Subject: [PATCH 17/53] [fix] engine selection from url --- searx/search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/searx/search.py b/searx/search.py index ca24581ac..f36552a4a 100644 --- a/searx/search.py +++ b/searx/search.py @@ -391,11 +391,11 @@ class Search(object): load_default_categories = True for pd_name, pd in self.request_data.items(): if pd_name == 'categories': - self.categories.extend(categ.strip() for categ in pd.split(',') if categ in categories) + self.categories.extend(categ for categ in map(unicode.strip, pd.split(',')) if categ in categories) elif pd_name == 'engines': pd_engines = [{'category': engines[engine].categories[0], 'name': engine} - for engine in map(str.strip, pd.split(',')) if engine in engines] + for engine in map(unicode.strip, pd.split(',')) if engine in engines] if pd_engines: self.engines.extend(pd_engines) load_default_categories = False From f094188780c41d665d08c7aa159968a81ca135ed Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 1 Sep 2015 15:21:17 +0200 Subject: [PATCH 18/53] [fix] display categories of the selected engines --- searx/search.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/searx/search.py b/searx/search.py index f36552a4a..899171242 100644 --- a/searx/search.py +++ b/searx/search.py @@ -414,6 +414,9 @@ class Search(object): self.categories.remove(category) if not load_default_categories: + if not self.categories: + self.categories = list(set(engine['category'] + for engine in self.engines)) return # if no category is specified for this search, From 78a69e4c982d08a0fb49f1347d7f9db3b15d464f Mon Sep 17 00:00:00 2001 From: Emmanuel Benazera Date: Tue, 1 Sep 2015 16:47:56 +0200 Subject: [PATCH 19/53] ddg encoding of URLs appears to be broken, revealed when trying to pickled the results to disk --- searx/engines/duckduckgo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py index 4ac2099ae..f18f3b446 100644 --- a/searx/engines/duckduckgo.py +++ b/searx/engines/duckduckgo.py @@ -72,7 +72,7 @@ def response(resp): # append result results.append({'title': title, 'content': content, - 'url': res_url}) + 'url': res_url.encode('utf8')}) # return results return results From ae5bf6e49f621b835dfc3bf89b876e7281d25217 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Tue, 1 Sep 2015 19:43:32 +0200 Subject: [PATCH 20/53] [enh] Migrating Travis CI from legacy to container-based infrastructure This patch should speedup testing with Travis CI using caching and container-based infrastructure. source: - http://docs.travis-ci.com/user/migrating-from-legacy/ - http://docs.travis-ci.com/user/caching/ --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 44340600d..7e0d80f83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +sudo: false +cache: + - pip + - npm language: python python: - "2.7" From e9c33572e90c9e7017ea47ae4ccc26aec869f19b Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Tue, 1 Sep 2015 20:02:08 +0200 Subject: [PATCH 21/53] [fix] also cache "/.cache/pip" --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7e0d80f83..0edd71c1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ sudo: false cache: - pip - npm + directories: + - $HOME/.cache/pip language: python python: - "2.7" From cf932ee6a0c86575ac78ee3c4206c4f39bfa8305 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Tue, 1 Sep 2015 20:03:32 +0200 Subject: [PATCH 22/53] [fix] yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0edd71c1c..be6683510 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false cache: - pip - npm - directories: + - directories: - $HOME/.cache/pip language: python python: From d5931874ac8a7762c3a961f866e65a19671f9d54 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 2 Sep 2015 22:57:10 +0200 Subject: [PATCH 23/53] [fix] escape format string.. --- searx/translations/es/LC_MESSAGES/messages.mo | Bin 7137 -> 7138 bytes searx/translations/es/LC_MESSAGES/messages.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo index e07d5195dd5fe95d5228d35693e1f36e1c7e31be..3a4a788d21f15a5e8e5a9cdcfc6f18b8a24fdc75 100644 GIT binary patch delta 580 zcmXZY&npCB9LMpeX2)1RcUSFL9B2)3m{@5TX;I^6k z1!_xsaa%{LTpTwC2M6zuozv@?Z_j+5&-2uSkDz>Dhs(y8AZv_+$JmBv*n#IbjyIUV z3XWhEeQaO~hur4=0`~E}fXZ3JByM0Q?%^<=U<=;4Cj4JKFi>zA2e5_;{zetCdyUCp z23yg?cJ$H4S@dubOSp-<_=FbbbH?=GD5}^T>cYib*c_A?sNpK=##=ar7pNOlP>o;X z?;5H|9ToJ2D%?O7ws-~=PN8!1sQ)KXc{8YDOJTey;vj<+)Kl-Eg7;Ae9bpXqwZ6M5C$XLWGcXFfg+jkdR=JG(>V@H!vYFNDMaQ z`~{LG(#2M5iN)9$EC%n7yXp1ZH_v^Z&+~kE@7}|{?JpQ(Jja*>9%2WcU>Ba^7+#@; zH7sBqi`c?m%w@v;B^=~?7L~J#NnFQn+(j3UFpf7Fg7;WBRE4nAQF^I2p1v4AQzjk<6p>xY9S25Pv1y74BK@eFl?8mjSY z^xZ%eX`+I@P=#Bl!fiZ*3a3!HdDQ Date: Mon, 7 Sep 2015 19:22:01 +0200 Subject: [PATCH 24/53] [enh] test utils.prettify_url --- searx/tests/test_utils.py | 10 ++++++++++ searx/utils.py | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/searx/tests/test_utils.py b/searx/tests/test_utils.py index abe411c2b..04480791d 100644 --- a/searx/tests/test_utils.py +++ b/searx/tests/test_utils.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import mock from searx.testing import SearxTestCase from searx import utils @@ -51,6 +52,15 @@ class TestUtils(SearxTestCase): self.assertIsNotNone(utils.html_to_text(html)) self.assertEqual(utils.html_to_text(html), "Test text") + def test_prettify_url(self): + data = (('https://searx.me/', 'https://searx.me/'), + (u'https://searx.me/ű', u'https://searx.me/ű'), + ('https://searx.me/' + (100 * 'a'), 'https://searx.me/[...]aaaaaaaaaaaaaaaaa'), + (u'https://searx.me/' + (100 * u'ű'), u'https://searx.me/[...]űűűűűűűűűűűűűűűűű')) + + for test_url, expected in data: + self.assertEqual(utils.prettify_url(test_url, max_length=32), expected) + class TestHTMLTextExtractor(SearxTestCase): diff --git a/searx/utils.py b/searx/utils.py index cc31726b6..3651cc389 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -222,9 +222,10 @@ def dict_subset(d, properties): return result -def prettify_url(url): - if len(url) > 74: - return u'{0}[...]{1}'.format(url[:35], url[-35:]) +def prettify_url(url, max_length=74): + if len(url) > max_length: + chunk_len = max_length / 2 + 1 + return u'{0}[...]{1}'.format(url[:chunk_len], url[-chunk_len:]) else: return url From 362c849797e2e6f0e232642c23744c47a75cdfd4 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 7 Sep 2015 22:39:33 +0200 Subject: [PATCH 25/53] [fix][mod] wikidata date handling refactor - fixes #387 --- searx/engines/wikidata.py | 34 ++++++++++++++++++++++++++-------- searx/utils.py | 26 +++++++++----------------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py index 43f72761e..fc840d47c 100644 --- a/searx/engines/wikidata.py +++ b/searx/engines/wikidata.py @@ -1,8 +1,15 @@ import json -from urllib import urlencode + +from searx import logger from searx.poolrequests import get from searx.utils import format_date_by_locale +from datetime import datetime +from dateutil.parser import parse as dateutil_parse +from urllib import urlencode + + +logger = logger.getChild('wikidata') result_count = 1 wikidata_host = 'https://www.wikidata.org' wikidata_api = wikidata_host + '/w/api.php' @@ -164,14 +171,12 @@ def getDetail(jsonresponse, wikidata_id, language, locale): if postal_code is not None: attributes.append({'label': 'Postal code(s)', 'value': postal_code}) - date_of_birth = get_time(claims, 'P569', None) + date_of_birth = get_time(claims, 'P569', locale, None) if date_of_birth is not None: - date_of_birth = format_date_by_locale(date_of_birth[8:], locale) attributes.append({'label': 'Date of birth', 'value': date_of_birth}) - date_of_death = get_time(claims, 'P570', None) + date_of_death = get_time(claims, 'P570', locale, None) if date_of_death is not None: - date_of_death = format_date_by_locale(date_of_death[8:], locale) attributes.append({'label': 'Date of death', 'value': date_of_death}) if len(attributes) == 0 and len(urls) == 2 and len(description) == 0: @@ -229,7 +234,7 @@ def get_string(claims, propertyName, defaultValue=None): return result[0] -def get_time(claims, propertyName, defaultValue=None): +def get_time(claims, propertyName, locale, defaultValue=None): propValue = claims.get(propertyName, {}) if len(propValue) == 0: return defaultValue @@ -244,9 +249,22 @@ def get_time(claims, propertyName, defaultValue=None): result.append(value.get('time', '')) if len(result) == 0: - return defaultValue + date_string = defaultValue else: - return ', '.join(result) + date_string = ', '.join(result) + + try: + parsed_date = datetime.strptime(date_string, "+%Y-%m-%dT%H:%M:%SZ") + except: + if date_string.startswith('-'): + return date_string.split('T')[0] + try: + parsed_date = dateutil_parse(date_string, fuzzy=False, default=False) + except: + logger.debug('could not parse date %s', date_string) + return date_string.split('T')[0] + + return format_date_by_locale(parsed_date, locale) def get_geolink(claims, propertyName, defaultValue=''): diff --git a/searx/utils.py b/searx/utils.py index 3651cc389..b8561b84b 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -1,11 +1,10 @@ # import htmlentitydefs -import locale -import dateutil.parser import cStringIO import csv import os import re +from babel.dates import format_date from codecs import getincrementalencoder from HTMLParser import HTMLParser from random import choice @@ -195,23 +194,16 @@ def get_result_templates(base_path): return result_templates -def format_date_by_locale(date_string, locale_string): +def format_date_by_locale(date, locale_string): # strftime works only on dates after 1900 - parsed_date = dateutil.parser.parse(date_string) - if parsed_date.year <= 1900: - return parsed_date.isoformat().split('T')[0] - orig_locale = locale.getlocale()[0] - try: - locale.setlocale(locale.LC_ALL, locale_string) - except: - logger.warning('cannot set locale: {0}'.format(locale_string)) - formatted_date = parsed_date.strftime(locale.nl_langinfo(locale.D_FMT)) - try: - locale.setlocale(locale.LC_ALL, orig_locale) - except: - logger.warning('cannot set original locale: {0}'.format(orig_locale)) - return formatted_date + if date.year <= 1900: + return date.isoformat().split('T')[0] + + if locale_string == 'all': + locale_string = settings['ui']['default_locale'] or 'en_US' + + return format_date(date, locale=locale_string) def dict_subset(d, properties): From 4184cece4a0b2d04b45105e755492bfee5fa1a12 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 7 Sep 2015 23:13:04 +0200 Subject: [PATCH 26/53] [fix] duckduckgo unicode url - #419 --- searx/engines/duckduckgo.py | 2 +- searx/tests/engines/test_duckduckgo.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py index f18f3b446..4ac2099ae 100644 --- a/searx/engines/duckduckgo.py +++ b/searx/engines/duckduckgo.py @@ -72,7 +72,7 @@ def response(resp): # append result results.append({'title': title, 'content': content, - 'url': res_url.encode('utf8')}) + 'url': res_url}) # return results return results diff --git a/searx/tests/engines/test_duckduckgo.py b/searx/tests/engines/test_duckduckgo.py index 6f085cbc2..14cd9cd87 100644 --- a/searx/tests/engines/test_duckduckgo.py +++ b/searx/tests/engines/test_duckduckgo.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from collections import defaultdict import mock from searx.engines import duckduckgo @@ -30,7 +31,7 @@ class TestDuckduckgoEngine(SearxTestCase): response = mock.Mock(text='') self.assertEqual(duckduckgo.response(response), []) - html = """ + html = u"""
@@ -39,7 +40,7 @@ class TestDuckduckgoEngine(SearxTestCase):
- + This is the title
This should be the content.
@@ -54,7 +55,7 @@ class TestDuckduckgoEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 1) self.assertEqual(results[0]['title'], 'This is the title') - self.assertEqual(results[0]['url'], 'http://this.should.be.the.link/') + self.assertEqual(results[0]['url'], u'http://this.should.be.the.link/ű') self.assertEqual(results[0]['content'], 'This should be the content.') html = """ From d8ef9449749ef58236e3c2f93cbd6cf57cbfca6c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 8 Sep 2015 11:12:15 +0200 Subject: [PATCH 27/53] [enh] extend user agent versions --- searx/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/searx/utils.py b/searx/utils.py index b8561b84b..506228465 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -1,4 +1,3 @@ -# import htmlentitydefs import cStringIO import csv import os @@ -20,7 +19,10 @@ ua_versions = ('33.0', '34.0', '35.0', '36.0', - '37.0') + '37.0', + '38.0', + '39.0', + '40.0') ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64', From 3213f20bc7fec020e3036b136e02af0f6f2b1dce Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 8 Sep 2015 21:13:17 +0200 Subject: [PATCH 28/53] [enh] translation sync --- searx/translations/de/LC_MESSAGES/messages.mo | Bin 7114 -> 8048 bytes searx/translations/de/LC_MESSAGES/messages.po | 170 +++-- searx/translations/en/LC_MESSAGES/messages.mo | Bin 5984 -> 5984 bytes searx/translations/es/LC_MESSAGES/messages.mo | Bin 7138 -> 8146 bytes searx/translations/es/LC_MESSAGES/messages.po | 178 +++-- searx/translations/fr/LC_MESSAGES/messages.mo | Bin 7275 -> 8281 bytes searx/translations/fr/LC_MESSAGES/messages.po | 170 +++-- searx/translations/he/LC_MESSAGES/messages.mo | Bin 7603 -> 8675 bytes searx/translations/he/LC_MESSAGES/messages.po | 174 +++-- searx/translations/hu/LC_MESSAGES/messages.mo | Bin 6911 -> 7829 bytes searx/translations/hu/LC_MESSAGES/messages.po | 170 +++-- searx/translations/it/LC_MESSAGES/messages.mo | Bin 6778 -> 7663 bytes searx/translations/it/LC_MESSAGES/messages.po | 168 +++-- searx/translations/ja/LC_MESSAGES/messages.mo | Bin 6823 -> 7753 bytes searx/translations/ja/LC_MESSAGES/messages.po | 186 +++-- searx/translations/nl/LC_MESSAGES/messages.mo | Bin 6914 -> 7868 bytes searx/translations/nl/LC_MESSAGES/messages.po | 170 +++-- searx/translations/pt/LC_MESSAGES/messages.mo | Bin 6350 -> 6350 bytes searx/translations/ro/LC_MESSAGES/messages.mo | Bin 7256 -> 8099 bytes searx/translations/ro/LC_MESSAGES/messages.po | 172 +++-- searx/translations/ru/LC_MESSAGES/messages.mo | Bin 8595 -> 9480 bytes searx/translations/ru/LC_MESSAGES/messages.po | 168 +++-- searx/translations/tr/LC_MESSAGES/messages.mo | Bin 7129 -> 8018 bytes searx/translations/tr/LC_MESSAGES/messages.po | 170 +++-- .../zh_CN/LC_MESSAGES/messages.mo | Bin 0 -> 7412 bytes .../zh_CN/LC_MESSAGES/messages.po | 682 ++++++++++++++++++ 26 files changed, 1972 insertions(+), 606 deletions(-) create mode 100644 searx/translations/zh_CN/LC_MESSAGES/messages.mo create mode 100644 searx/translations/zh_CN/LC_MESSAGES/messages.po diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo index 71202c177dbe5bdbcfbceebf9c922e5684305842..d756167cc4015d31a92317999c2e12abe6519926 100644 GIT binary patch delta 3303 zcmY+_e{5Cd9mnxgf6&sFp9L(4@K~L+ti3A@qekYm1Hw=g(-tJ{%sAZp^!BXxo>R{` zx4)Lj8ZDF_tmu&M7H{E3YW53>?dk@+* zrLXgx^E}V@$9eAMwa&kNy7<=8YmPhoJj}n<{QJ~38h!Nhxf;j0mf-_fjcKgMA)Jq6 zi3d^h4&y>RmW-c4ex2v}^Blf_4Y-HJH#$zy`2rWs+&GNd;KzwS!8*pTq5}T{Z@}}Y z9RH3>aTXPzu9hTm87{^UweApVpKqWNe>}N=0_PFm`92rgU=o%2OSl5hqBgjM#Bkoh ztMMPGL}!!x|3Ot$LlgyC%^wA7MkV-3Y{k!__A8*)e+lb}?;PSn2^__F_$^eR?=5e*?AdBC7H~Vt^muooLBMfxn03>ihtCJV$WRv^j$glG-f0W=cT#4Vsaz|0?&Z5rPIaI-aT|ocUx>;^4 z$9iUKViS^s(~^ugp)$Tb8SlVb7~h9IIEwvv7I)z~vQR;zs6@Yrit`An_0OR8dwvo9 zSHMYbD5Doql}@87|0QW7*56`sKgFoH+~&e=|#K_=W)c3RdH5O8=t1nO6Wz@r)UP1&;?XN ze?kTR0BI`yUsegY7`1Q(PNBgy_-kB?m$6mPIVjp-3o6ljQ2}~UE#HS)H;AhID@bn6 zVbr{*F~pPDsQ7D0Q-M2?qMR;l#2!?}IaCKGP%V52$=o@DE%+2_{m+x<=TNWi_oxKl zMs?;dNKEH_)IK$|ul)I6&IR3Yns762LRAu?Hkd#yIDiWDNb>w~RG_Dm@w2G;Cs7rj zMinrFO5hx-kPFBM#kqvVqg=el#dbVM*;?=#s>Q!a#&4rO&+nlE)-hOzi%|1Bu>-f^ zDjY)vDxng20+qli)ch&btC(3y|3A*f>)cRA|3WRSW0y8uib~{8REO?HgP%vef&-`x zkD}H+h1&QzR0mJvEqDg|@DKP9ZoZzcV|@8~-oGlE$JdhHO>Lq<9iC07#5SWgybD!H zH|mx2V=E5g9e5mX$MdLH)xiH)T6Y6#-N*1IOeOcbi(F`8AF5Ru)aQ5zjGsVt z;v}llDb)AG%cufg!E#GcXW;e3HOk#uzco0?L5maK2;WzO~T#s#hb~#?oUUa&0xnR`k@}p53Mow2D4oW|)ZkXRS zl1-V|%iGCUt2?Wf2EmYLjqm2Iv!#3;l`hw8-xHbfpb(lJ_Ze@%#Dms6Sg_%^@gmdY z4L2Fr&r~K9A{!bvYyJ5DC#C~Gc0HfzAI)e=mE!qlY6pTa@5Wx>-&k5-`#`ljR?epM z<=Uwgrui;+#O+Ck-f(O}`(VKfZKkEPx$baVJ{Ykk4&C$+)fhL-7V-p*%s?3A%L#@y zE`+|#nBCnwOEY!nuMOjLA)Y*5zoDu)NZ$Oaj+__8CKxd3O0nfixbKB##LX3KWFqT^ zW11bsLFoBe6Zn-<(?Nc?5Zf^2^m?ChdV_2>r^bzV*>W{bZzVa!CwJu=I(xLIQ@XHV zSI7NcJV*v^Tuz}?dz!TC8#jtKxj9|Wb}E-#3dap@_fX=V8&7;xX6twObI!)2%X0Jc?pUgv zSLwgY+~Sk3eiNNyx#h$xd*b2eEsRE*vrN(r8k!!S+~uP2P{X0;yRRZ09dojlG;IjPXOUyo-S`|r5Ni`6=PQY-O> zrl)+ps2E#uf*MN`Qjj(QuoTfn=&>e%h*I7?|G=)^5pBnWZ5~Mh*Og% ISFXM4f1i|JdH?_b delta 2355 zcmYM!e@vBC9LMoU8~}(pK*eoYmdszMgZQbI$jBzR!8M zTz$Br<78g{jfT%k{)+hP?x)uOpU#2C450Z6@-9l{q zZTKS&!L@YWfUn|MV>-+MF0{bU&MP>Qb`SQ)e4^xG80j))SdHbFi%Dc{vl=sT9V)?1 zu75jTM|&q~{$5m~ALB6Mo3FUg0_TvgxyX--(1S|ss_PGB^z9%M6=)PHvGG`n)u?rr zqUOa>iL|2q-GDCC#KWkaeuInf4Bmxzkc9$1fpnRt zQHj04&rR5g3fP6(@j<)=kD|t3!wv-)NSX?qjk;lRFpfthHWdqTHfo_d)Vvt#%(SDP z?TeU?Z@c^Zk*_)A+DDO?=7ejX&!YZg=(t430?a3BE&8a;526zL9D66C0-r~f@DeKF z9@Ng#$ZjHzLp_38)ESDP<~6wf7F6Zp+0>ud<}o_7;2P9|>z$pb1-7FW*nw%7LM6Bt zmDoqF{V6K&Vbr{@QD^EH>JgqojlYcKY_4^1p@A9HS&8JJ5-CC@a2m!?P^G$n z+UZ}YN`;2@C7O*Tw2M*mXQA%TM?Ip&sD$cJ74T7qG=@5VW(^mtX*S|Cd<%6r&Y>n= zL@oG>>(^{8oQ@iog&H>$wZkwf;WAXfX{f|!B2U}Q!N;)%@6-E#oC{4D#RE|Z%TVn~ z)N6MyD&P{=UyqY%$1sfBPyzO%5;%kk{5@)&v#63^!SVPvDv=TnNbmb!$we6*(@~XZ zL5r(UXW=!}Lc6dx5Ng3gs0tjxF?a%NFpcNA3LioxehS&6Ig1MXCu&}LA@x_LxolG< zF2qtCgLmQr)H7X=n(#7e{8rcA;qLE7?R+2h{-;Epp);=iE2^>sD3>;ni+YUIrtH7g?I{ zm-}AK)538tZs#>88~vzFw%8W0DW)59A_=dtHRgL!8;L%eT=B{4P0e0(La=K1x>QBs npipW~I2I~gNCD>lw{zyl$+0=%MT4rM+Td8xqSXA6#cBTnV_!K} diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index b2504c65c..8158c27e2 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -14,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-04-26 18:57+0200\n" -"PO-Revision-Date: 2015-04-26 19:24+0000\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-08-24 10:00+0000\n" "Last-Translator: pointhi\n" -"Language-Team: German (http://www.transifex.com/projects/p/searx/language/de/)\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" @@ -25,67 +25,67 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "Dateien" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "Allgemein" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "Musik" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "Soziale Medien" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "Bilder" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "Videos" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "IT" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "Neuigkeiten" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "Karte" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Ladezeit (sek)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Trefferanzahl" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Punkte" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Punkte pro Treffer" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Fehler" @@ -100,12 +100,22 @@ msgstr "Starte Suche wenn Kategorie angeklickt wird" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." -msgstr "Startet eine Suche sofort, wenn eine Kategorie angeklickt wird. Deaktiviere dieses Plugin um mehrere Kategorien anzuwählen." +"multiple categories. (JavaScript required)" +msgstr "Starte die Suche sofort wenn eine Kategorie ausgewählt wird. Es ist nicht mehr möglich mehrere Kategorien auszuwählen. (JavaScript benötigt)" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" -msgstr "Zeigt deine IP-Adresse an wenn die Suchanfrage \"ip\" lautet" +#: 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 "Zeigt deine IP-Adresse wenn die Suche \"ip\" lautet, und deinen User-Agent wenn deine Suche \"user agent\" beinhaltet." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Tracker-URL entferner" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Entferne Tracker Argumente von den URLs" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -133,90 +143,92 @@ msgstr "Einstellungen" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Standardkategorien" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Suchsprache" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Automatisch" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Oberflächensprache" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Autovervollständigung" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "Bilder Proxy" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "Aktiviert" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "Deaktiviert" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Methode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "Sichere Suche (SafeSearch)" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "Streng" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "Moderat" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "Keine" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Designs" @@ -257,6 +269,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Suchmaschinenname" @@ -271,6 +285,8 @@ msgstr "Kategorie" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -288,7 +304,7 @@ msgstr "Blockieren" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -297,7 +313,7 @@ msgstr "Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, dam #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -306,20 +322,20 @@ msgstr "Diese Cookies dienen einzig Ihrem Komfort. Wir verwenden sie nicht, um S #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 msgid "Reset defaults" msgstr "Zurücksetzen" #: searx/templates/courgette/preferences.html:129 #: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "Zurück" @@ -429,51 +445,89 @@ msgid "Toggle navigation" msgstr "Navigation umschalten" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "Allgemein" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "Suchmaschinen" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "Erweiterungen" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "Cookies" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "welche Sprache bevorzugst du für die Suche?" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "ändere die Sprache des Layouts" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "zeige Vorschläge während der Eingabe an" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "tunnel Bilder durch searx" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "Inhalte filtern" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "ändere das Aussehen von searx" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "Abkürzung" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "mittlere Zeit" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "max. Zeit" + +#: searx/templates/oscar/preferences.html:213 +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 +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 +msgid "Cookie name" +msgstr "Cookie Name" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "Wert" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Suchergebnisse" @@ -523,6 +577,14 @@ msgstr "Warnung!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Bitte aktiviere JavaScript, um alle Funktionen dieser Seite zu nutzen. " +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Information!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "derzeit sind keine Cookies gesetzt." + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "Es sind derzeit keine Daten vorhanden." diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo index 1871f6b77ca3bcf2abdde5efb16c27681ff77bf1..0e2010a521e7784592f62c105b3f62f2a5818a9e 100644 GIT binary patch delta 17 YcmaE$_dst0qX3JMo&ncp9rkE;05u2%!~g&Q delta 17 YcmaE$_dst0qX3Jco-x;E9rkE;05uc@#sB~S diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo index 3a4a788d21f15a5e8e5a9cdcfc6f18b8a24fdc75..a189108327b555b74a9f0e27bc2e0710b3df0fb7 100644 GIT binary patch delta 3397 zcmZA0e{2`^9mnx2Q(D>rl~SOH>{|KJ8u|qqXh)}vT8Lv2FjA1snf3gBuiu`0zjx(+ zlzz96uMzjp?2K~jmc^J@=j0!qWZ!HHxGd4);v~+ENlZpCrgIB%iCdH*S%%s3b>Az^ zMoJ&|xqj~R{&DY{={^6I^7~6}nl$+LIR97i|IVAVn)~<7I>We`T~8rD#z}tt6i;C@9^~OR!zde%aM8hy3Dg0Sign}{5IZ(7f?BV zic9bsDnLU$N#as$LLc?qanw0apc4O4djAESPkiGgE_6TzmHDr68JXV zFXLkTIo^V=r+sa51`|&6~i05!0t|to>bQG27cTjP@k81rC>b#SS>AwP2 zxS@>Bpemh4RsMVI#;dpqJL#_u_y+2g456O4u>%X~-zQNme+E^^Pf+KdLY;p)^=z37 z9rOzpWrCjY_fi%@vgWA`PN~9N+$WBxu z#tQ6<{=7kD(Gfj`!pDP?cW7P72iZ9 z@*xKJPh6_+KgY+e%uA?1kKr184t3xgsc$1i8W&IjFQXFtPx|*3+QIx8x1nC$22_HZ zP_6GlP5(f;9zxBZQRISTjAOVFV^pTos07|g*YBYM{3X5r2`bRPQ3ZUS-mfJqCAb)M z?(L}awxQ13g)4CnmVdy-2p0o*J>AgH$E#Pd83g2h^+i3^j!7 zI6WCQRG^*wQbONC4Qqg!jbkh6zgqnSH}p&qs?xhr&+WyvIEZ`k+gQZk;X&+OMgP^pCpldioL$6qB`*ws&yCA^(9mV zmrppT$nrCs7IivCM@I{xhnw8B}GTqAD|1R|7Sp4r)Uk z+<{8GJGBQ*)_tf~^dRcoAyl9dvG zXQ&R;ezCf4K|Q|~hp-FPnJ1C4GESq>UnqD-jea*cYWsoFABA50N^SFk{;_<<44tA~ zd9Aj$W{Kw=c5KtNincM3TnF*hx_b@=X32|ubN79wGi-(xx6MwhHi5%a~b;e(AnCL2cW40OkR`xK}n3kW9iUbYJVc#nz3Ho*z`L3Na z58Qume751j&3>4T!pdah=9=;ddGn(>3QiE3-msai7MoPUeaAP)tU_c5W?)kStR|=UuyTZZK;3wwoDG=>-wQprXgP&Uc4T|}Qd4)G6=WT!=y~zwrVkbkI(Bi?Guc+Ob57;Aw;ZXt zb+1=^m{fAK)Jn6tF+n}e50vR8)tF&q=6H+QtTSD4HBW(4eZUQ(LTH(EJejDHcJ^zK zk~0qkk>xwy|L@jVIksz??a9m~TchgM_KdO9RyBEQ^zHb)=Ie`JpW5vvT*_`TOKs@ht?yWvB%?t_?4wADp!_otU0hNsCJOunrlmeW(T`u22r4)PNH#8 zI@!FI=_%7H6s@f7@*R81gx-68jy1W(ZLKSBPb*=mGn0|Nk-Vj`W?x_Hq22+$4m+3) zKT5ikmIPH7c>Qw&?Ih_XpI0V+y0s-f+1l5+m+<4HP7bq)Cll@DXuOpTBNEk2WGWxD H&YSmN%&UWz delta 2389 zcmYM!du$X{6vy#d9u~GdYN520qL)W`7fOK^%NrsQ(*Qw~0DtJPJFQE%yJcpVP?0P| zCH_%RoK%wnz6cUPg}6c#O_WxiO$-ne69s_;h!BVpBP8&L-(MNyX1kxccjlgR=G>W{ zn{~A+b1A=Di^XRheWhbKRa?Pt2@J;$k*D%PcPh$J@G5l`8Mo>Cxh_??7{dV z?#Aob51W}Bf*;~2%gR`794Nr8z`t-X<9pZ*3&@g>#mJOZhBL7e^DvFXwl-rfZbcQ? z8qDv(#~2?#tv`$^^gA3te(OgL6yO^2wQlpHCfq|6_8^!Kg&*BPE-KNJsKUnLIGl-! zQ;%Bbp$ch26|fl_{*^j!JwQweAe+nfeK}g}mO9yR@$k!yHEvWKIcFceT%x_Bx(=Oq7vOeEx3&x zcpr=K2OfRBrWbKMK0p;Rh6h3GCZe{a3Uz}o;vkHo@@+(3^SK|UFBe|^U$R*YyR6&v8{HsV)t=Caogde3P*FGiBeR6Dfkl3Ky~7Mq>I+6LH>#!qq5CCDntIyJ)f>JP06%tJbogMS+LmH z(WvWqo{80()XR=plXl!Dtl{V3s>qH_kE#v0Am~rAJ)xOtlh$WIH>X=pS zM?CH^Y8%HhZTn-5ZQo=g1HvJHLt(9dw=ffm`(9B^dE7Rh6aO!g7i&nzQ|%um99uEg z+HTDDOvFw(bxF7VGus>QKP+nT&kTGkJU8t{sO0%2HNIQyWp5SNg#4`~MgHlMWd-Sk cX>d~ZDqRvyy5?m&Qt$W;gR8S=2Zy@+3zQE^`Tzg` diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index 995ad6cf6..63136323d 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -3,16 +3,18 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Adam Tauber , 2015 # Alejandro León Aznar, 2014 # Alejandro León Aznar, 2014-2015 +# Oscar Carrero , 2015 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-04-26 18:57+0200\n" -"PO-Revision-Date: 2015-04-27 23:48+0000\n" -"Last-Translator: Alejandro León Aznar\n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/searx/language/es/)\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-09-05 20:46+0000\n" +"Last-Translator: Oscar Carrero \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" @@ -20,67 +22,67 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "Archivos" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "General" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "Música" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "Medios sociales" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "Imágenes" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "Vídeos" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "TIC" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "noticias" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "mapa" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "hace {hours} hora(s) y {minutes} minuto(s)" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Tiempo de carga (segundos)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Puntuaciones" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Puntuaciones por resultado" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Errores" @@ -95,12 +97,22 @@ msgstr "Buscar en la categoría seleccionada" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." -msgstr "Realizar la búsqueda inmediatamente si se ha seleccionado una categoría. Desactivar la selección simultánea de varias categorías." +"multiple categories. (JavaScript required)" +msgstr "Realizar una búsqueda inmediatamente si se ha seleccionado una categoría. Desactivar para seleccionar varias categorías. (Se requiere JavaScript)" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" -msgstr "Mostrar tu dirección IP si el término de búsqueda es «ip»" +#: 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 "Muestra tu dirección IP si la consulta es \"ip\" y tu Agente de Usuario si la consulta contiene \"agente de usuario\"." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Eliminador de URL rastreadora" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Eliminar los argumentos de los rastreadores en la URL devuelta" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -128,90 +140,92 @@ msgstr "Preferencias" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Categorías predeterminadas" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Buscar idioma" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Automático" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Idioma de la interfaz" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Autocompletar" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "Imagen proxy" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "Activado" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "Desactivado" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Método" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "Búsqueda segura" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "Riguroso" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "Moderado" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "Ninguno" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Temas" @@ -252,6 +266,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nombre del motor de búsqueda" @@ -266,6 +282,8 @@ msgstr "Categoría" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -283,7 +301,7 @@ msgstr "Bloquear" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -292,7 +310,7 @@ msgstr "Esta configuración se guarda en sus cookies, lo que nos permite no alma #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -301,20 +319,20 @@ msgstr "Estas cookies son para su propia comodidad, no las utilizamos para rastr #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 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:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "Atrás" @@ -323,7 +341,7 @@ msgstr "Atrás" #: searx/templates/default/results.html:13 #: searx/templates/oscar/results.html:110 msgid "Search URL" -msgstr "Buscar URL" +msgstr "URL de la búsqueda" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 @@ -413,7 +431,7 @@ msgstr "Creado por" #: searx/templates/oscar/base.html:78 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "un metabuscador hackeable que respeta la privacidad" +msgstr "un metabuscador hackable que respeta la privacidad" #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" @@ -424,51 +442,89 @@ msgid "Toggle navigation" msgstr "Cambiar navegación" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "General" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "Motores" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "Plugins" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "Cookies" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "¿Qué idioma prefieres para la búsqueda?" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "Cambiar idioma de la interfaz" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "Buscar mientras escribes" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "Filtrando resultados de imágenes en searx" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "Modifica cómo se envian los formularios más información sobre métodos de peticiones" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "Filtro de contenido" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "Cambiar aspecto de searx" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "Atajo" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "Tiempo promedio" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "Tiempo máximo" + +#: searx/templates/oscar/preferences.html:213 +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 +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 +msgid "Cookie name" +msgstr "Nombre de la cookie" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "Valor" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Buscar" @@ -518,6 +574,14 @@ msgstr "¡Cuidado!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Por favor, activa JavaScript para poder usar esta página al 100%%." +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "¡Información!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "No existen cookies definidas actualmente." + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "Actualmente no hay datos disponibles." diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo index 4d2be4e38c15392b59335dc4cc300482726497c2..3f518fdf88e0a25629e63aab360217513f65aae2 100644 GIT binary patch delta 3236 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\n" -"Language-Team: French (http://www.transifex.com/projects/p/searx/language/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" @@ -24,67 +24,67 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "fichiers" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "général" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "musique" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "réseaux sociaux" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "images" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "vidéos" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "informatique" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "actus" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "carte" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "il y a {hours} heure(s), {minutes} minute(s)" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Chargement de la page (sec)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Nombre de résultats" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Score" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Score par résultat" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Erreurs" @@ -99,12 +99,22 @@ msgstr "Lancer la recherche lors du choix d'une catégorie" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." -msgstr "Exécute la recherche immédiatement si une catégorie est sélectionnée. Désactiver pour sélectionner plusieurs catégories." +"multiple categories. (JavaScript required)" +msgstr "Exécute la recherche immédiatement si une catégorie est sélectionnée. Désactiver pour sélectionner plusieurs catégories (nécessite JavaScript)." -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" -msgstr "Afficher votre adresse IP si la requête contient \"ip\"." +#: 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 "Affiche votre adresse IP si la requête est \"ip\", et affiche votre user-agent si la requete contient \"user agent\"." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Nettoyeur d'URL de suivis" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Retire les arguments utilisés pour vous pister des URL retournées" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -132,90 +142,92 @@ msgstr "Préférences" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Catégories par défaut" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Langue de recherche" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Automatique" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Langue de l'interface" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Complétion automatique" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "Proxy d'images" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "Activé" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "Désactivé" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Méthode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "Recherche sécurisée" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "Stricte" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "Moyen" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "Pas du tout" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Thème" @@ -256,6 +268,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nom du moteur" @@ -270,6 +284,8 @@ msgstr "Catégorie" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -287,7 +303,7 @@ msgstr "Bloquer" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -296,7 +312,7 @@ msgstr "Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -305,20 +321,20 @@ msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utili #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 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:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "retour" @@ -428,51 +444,89 @@ msgid "Toggle navigation" msgstr "Afficher/Masquer la navigation" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "Général" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "Moteurs" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "Plugins" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "Cookies" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "Dans quelle langue préférez-vous effectuer la recherche ?" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "Changer la langue d'affichage" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "Chercher au fil de la saisie" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "Proxifier les images de résultats à travers searx" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "Filtrer le contenu" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "Modifier l'affichage de searx" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "Raccourcis" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "Temps moy." + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "Temps max" + +#: searx/templates/oscar/preferences.html:213 +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 +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 +msgid "Cookie name" +msgstr "Nom du cookie" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "Valeur" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Résultats de recherche" @@ -522,6 +576,14 @@ msgstr "Attention !" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce site." +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +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." + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "Aucune donnée disponible pour l'instant. " diff --git a/searx/translations/he/LC_MESSAGES/messages.mo b/searx/translations/he/LC_MESSAGES/messages.mo index a01d55ac28f1d75658c9c2e803161ebc3a9e3fe6..84502da3195f1eb20aba3a7df3d1c5477e34abae 100644 GIT binary patch delta 3443 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 diff --git a/searx/translations/he/LC_MESSAGES/messages.po b/searx/translations/he/LC_MESSAGES/messages.po index 2d91b5a3b..85537a54e 100644 --- a/searx/translations/he/LC_MESSAGES/messages.po +++ b/searx/translations/he/LC_MESSAGES/messages.po @@ -12,10 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-04-26 18:57+0200\n" -"PO-Revision-Date: 2015-04-27 06:42+0000\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-08-24 11:19+0000\n" "Last-Translator: GenghisKhan \n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/searx/language/he/)\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" @@ -23,67 +23,67 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "קבצים" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "כללי" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "מוזיקה" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "מדיה חברתית" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "תמונות" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "סרטונים" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "IT" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "חדשות" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "מפה" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "לפני {minutes} דקות" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "לפני {hours} שעות, {minutes} דקות" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "עומס עמוד (שניות)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "מספר תוצאות" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "דירוג" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "דירוג לכל תוצאה" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "שגיאות" @@ -98,12 +98,22 @@ msgstr "חפש בעת בחירת קטגוריה" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." -msgstr "בצע חיפוש מיד לאחר שקטגוריה נבחרת. נטרל כדי לבחור מספר קטגוריות." +"multiple categories. (JavaScript required)" +msgstr "בצע חיפוש לאלתר כאשר קטגוריה נבחרת. נטרל כדי לבחור קטגוריות מרובות. (מצריך JavaScript)" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" -msgstr "הצג מקור כתובת IP כאשר מילת שאילתא היא \"ip\"" +#: 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\"." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "מסיר URL גשש" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "הסר ארגומנטים מאתרים מתוך URL מוחזר" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -131,90 +141,92 @@ msgstr "העדפות" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "קטגוריות ברירת מחדל" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "שפת חיפוש" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "אוטומטי" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "שפת ממשק" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "השלמה אוטומטית" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "proxy תמונה" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "מאופשר" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "מנוטרל" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "שיטה" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "חיפוש בטוח" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "מחמיר" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "מתון" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "בלי" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "מוטיבים" @@ -251,10 +263,12 @@ msgstr "אדום" #: searx/templates/default/preferences.html:84 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" -msgstr "מנועי חיפוש שבשימוש עתה" +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/pix-art/preferences.html:53 msgid "Engine name" msgstr "שם מנוע" @@ -269,6 +283,8 @@ msgstr "קטגוריה" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -286,7 +302,7 @@ msgstr "חסום" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -295,7 +311,7 @@ msgstr "הגדרות אלו מאוחסנות בתוך העוגיות שלך, א #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -304,20 +320,20 @@ msgstr "עוגיות אלו משרתות את נוחותך הבלעדית, אנ #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 msgid "Reset defaults" msgstr "אפס ברירות מחדל" #: searx/templates/courgette/preferences.html:129 #: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "חזור" @@ -412,7 +428,7 @@ msgstr "מוטמן" #: searx/templates/oscar/base.html:78 msgid "Powered by" -msgstr "ממונע באמצעות" +msgstr "מופעל באמצעות" #: searx/templates/oscar/base.html:78 msgid "a privacy-respecting, hackable metasearch engine" @@ -427,51 +443,89 @@ msgid "Toggle navigation" msgstr "Toggle ניווט" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "כללי" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "מנועים" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "תוספים" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "עוגיות" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "איזו שפה אתם מעדיפים לצורך חיפוש?" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "שינוי שפת הממשק" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "מציאת דברים בזמן הקלדה" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "Proxying תוצאות תמונה מבעד searx" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "שינוי האופן בו טפסים נשלחים, למדו עוד אודות שיטות בקשה (request methods)" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "סנן תוכן" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "שינוי ממשק searx" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "קיצור דרך" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "זמן ממוצע" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "זמן מירבי" + +#: searx/templates/oscar/preferences.html:213 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "זוהי רשימה של עוגיות וערכיהן אשר searx מאחסנת על המחשב שלך." + +#: searx/templates/oscar/preferences.html:214 +msgid "With that list, you can assess searx transparency." +msgstr "בעזרת רשימה זו, באפשרותך לגשת אל searx transparency." + +#: searx/templates/oscar/preferences.html:219 +msgid "Cookie name" +msgstr "שם עוגייה" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "ערך" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "תוצאות חיפוש" @@ -521,6 +575,14 @@ msgstr "אזהרה!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "אנא אפשרו JavaScript כדי לנצל תפקודיות מלאה של אתר זה." +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "מידע!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "ברגע זה, אין עוגיות מוגדרות." + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "אין כעת מידע זמין. " diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo index aff173a160a8fac7359d175ec0068a38b7a10b5b..f540b41c85e1b1df9313b9e2692394324f6d780d 100644 GIT binary patch delta 3175 zcmY+^e~c969mnyx3fytOt;~<{0No!Pm}SZxPbW9Z)s?QDk}3cxD?N!Hn@buu-?V% z@B>t$SCa9MQ7394iUQrln*t4>65NPG_*K+?1=RZQVmtAz85&C9FfPC+P=S7)j2}gv z_yk^$&tez8n0$U7weBs{$^VW%UdFGWLpBQhD~pe*k4cw{$~gESLv=Wumszg zt%?0e4%T4O--OC|B63)XJ)chZ!o`s(zR#25JS83>OUPNX5CsYaFKyCCl z)WY{rclI$V!Oj(pb^VF!Q0u>p2Dc(ptqf}2BWR80a{hj6)C>1JL1>K@B0v6J^Wuf0 z#Z1aXZr-V$ZN9Ck+xN4sV>~nTlX~E2kP0x zkF=gzY6iC1MSDj&aHk>@I1d%vz!@Kmzu0zYP2Mj$CJO9ymeUwJ$Q1Gf4b4R0=j#au zPE-gyXWZO3_Ow%6tdQMwRSXWQ2|l_$xYm(G!M!^rp(Cfzt}{UnULfhpR#f)kq1 zv4aDe9Y%iOdKu$;jiaXh{8S-wf|Rw>z0=z1XEHezuIOg!r?GZ6l2d$gSH6L@OM6=J zn;qMSce~Lf8Q4)hg(2-}(za*pFm%FC!g4?_oU#MQOHZfb!OqPC=|Vs+%1sX`{lMYq zMD_ol|F|>Za_Uqy*LkU_^$Tl;H<OSHT{rLh z@#RG)t{YCRi;s2P*;f00l(RF&9iKZAzuonpt{t^Ak!!r#@uF34X5+th@40KpT)jt= zcQX5&oa5C_M785wMydW#3|({ACM~zl zYZb1f5&mM&%QvPP&p_CC2EtP9Og5|?&p6>=d~C_d?OUDPq#c$#R@JH|TRT;Bl*6P` zGM|h`CbDyU&aKq%f^ypV+Hr2q$r>jY)hb0lr_?Kt|`MXji}0 HTWR_qJ}pGG delta 2244 zcmYM!4NO&K9LMqJDk9!1LcmpdF^;B%3cd?Q<;-l8HXGAkhPJgE9^eWB-U|+Njaubm z!vl(oeFFDdoTYZ1@Y_ZGzoaZ^``Tzgtf1Yz& z@A_wX(@;uWtKqMK|1AE09Iw&;f9(^EnZR%_@-eURH5uQ+N!X1#e-x+SXLkH8CNTa9 z_v0|8VhfWqaUbRw(`1fvpaAErzvB$XS1}HQWJ$pcWXj~>O3cS(tVd#-T^PXUPzAQx z`3{U{d>FO93svY5oJxN41qTZ73-U4N`BD?Eq6)ii=Y9VF?jV3ll#MEEKIY;|RGdoG zx+toUMpOa2P;qyo3fY5k_Qdx zp&fsUN_+yf?n~63I*EFOr%~5mLTWZQnmEvfe)_CJl2C!X^dmb>-uIS zrfJ0mxF1!>AgaJqn2BdlH}p5^wT@?_DBf%=)ce1XgQ-kxK?Qyi)rsAx&D4fU)QL*a zW6vK$YBGbU0)|oRgK5U_F*EtnBg#h=REWCsRj5MlL%-ht3J#PYin;g{suP{4gx#2p zN9_1CD)2BW@UPZOs1{#A6*htDb=@>nyiBAC<`%5Md|adV{{RPS(K(!sqo_cMv_-o) z3zcXc&c+Qm3mZ_+@FmopccEH-6t%gA?EG)28~hXJVFDY26lN)oz5hjaq8Jsp3{^lg zD)5U)cg^dlLb_4U@MC-aIO=!cB$nZ2T!SUtjXLl$s?b+ai9bSh_Uq~NU(e(RJ8{-t zcnD~gTv8F!aMENRpouXnVw0U#HjYgetnNwHc zI@{{qNTcI6)M_$ZQ|*MK&a80lEN`3t1Fs;k(Q6C5=WU+c;yH<5#jYpj`O?Cx%>y;% ziXV@x=v`vSV2x@ zeN|~Rx}z@^2|1N6\n" -"Language-Team: Hungarian (http://www.transifex.com/projects/p/searx/language/hu/)\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" @@ -20,67 +20,67 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "fájlok" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "általános" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "zene" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "közösségi média" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "képek" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "videók" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "it" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "hírek" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "térkép" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "{minutes} perce" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} óra, {minutes} perce" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Válaszidők (sec)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Találatok száma" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Pontszámok" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Pontszámok találatonként" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Hibák" @@ -95,12 +95,22 @@ msgstr "Azonnal keresés kategória választással" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." -msgstr "Keresés megkezdése kategória kiválasztáskor. Több kategória kiválasztásához deaktiválás szükséges" +"multiple categories. (JavaScript required)" +msgstr "Keresés megkezdése kategória kiválasztáskor. Több kategória kiválasztásához deaktiválás szükséges. (Javascript szükséges)" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" -msgstr "Saját IP cím megjelenítése az \"ip\" kulcsszóra keresve" +#: 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 "Saját IP cím, user agent megjelenítés az \"ip\", \"user agent\" szavakra keresve." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Tracker URL eltávolítás" + +#: searx/plugins/tracker_url_remover.py:27 +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/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -128,90 +138,92 @@ msgstr "Beállítások" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Alapértelmezett kategóriák" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Keresés nyelve" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Automatikus" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Felület nyelve" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Automatikus kiegészítés" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "Kép proxy" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "Engedélyez" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "Inaktivál" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Method" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "Felnőtt tartalom szűrés" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "Erős" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "Enyhe" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "Nincs" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Megjelenés" @@ -252,6 +264,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Kereső neve" @@ -266,6 +280,8 @@ msgstr "Kategória" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -283,7 +299,7 @@ msgstr "Tiltás" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -292,7 +308,7 @@ 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:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -301,20 +317,20 @@ msgstr "Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 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:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "vissza" @@ -424,51 +440,89 @@ msgid "Toggle navigation" msgstr "Navigáció megjelenítés" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "Általános" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "Kereső motorok" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "Pluginek" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "Sütik" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "Preferált keresési nyelv" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "Felület nyelve" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "Autómatikus kereső kifejezés kiegészítés" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "Kép találatok betöltése searx-ön keresztül" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "Keresés metódusa (bővebben)" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "Tartalom szűrés" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "Megjelenés" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "Rövidítés" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "Átlag idő" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "Maximális idő" + +#: searx/templates/oscar/preferences.html:213 +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 +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 +msgid "Cookie name" +msgstr "Süti név" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "Érték" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Keresési eredmények" @@ -518,6 +572,14 @@ msgstr "Figyelem!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Engedélyezze a javascript-et a teljes funkcionalitás használathoz" +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Figyelem!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "jelenleg nincs süti definiálva" + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "Nincs megjeleníthető adat." diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo index cc54857dfe4450272ba2e75351e5a00312d8346e..b9dcf955b9666dfc1a9c1b54a41e7f0837df6001 100644 GIT binary patch delta 3190 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 Ty2>5R8~abGjq#0zZ+ZR!?Tsij diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index a6693a061..9fd1a3094 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-04-26 18:57+0200\n" -"PO-Revision-Date: 2015-04-26 17:02+0000\n" -"Last-Translator: Adam Tauber \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/searx/language/it/)\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-08-24 09:45+0000\n" +"Last-Translator: pointhi\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" @@ -20,67 +20,67 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "documenti" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "generale" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "musica" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "social media" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "immagini" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "video" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "it" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "notizie" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "mappe" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "di {minutes} minuti fa" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "di {ore} h e {minutes} minuti fa" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr " Caricamento della pagina (secondi)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Risultati ottenuti" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Punteggio" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Punteggio per risultato" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Errori" @@ -95,11 +95,21 @@ msgstr "" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." +"multiple categories. (JavaScript required)" msgstr "" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" +#: 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 "" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" msgstr "" #: searx/templates/courgette/index.html:9 @@ -128,90 +138,92 @@ msgstr "Preferenze" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Categorie predefinite" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Lingua di ricerca" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Automatico" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Linguaggio dell'interfaccia" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Completamento automatico" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Metodo" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Grafica" @@ -252,6 +264,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nome del motore" @@ -266,6 +280,8 @@ msgstr "Categoria" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -283,7 +299,7 @@ msgstr "Blocca" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -292,7 +308,7 @@ msgstr "Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non c #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -301,20 +317,20 @@ msgstr "I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie pe #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 msgid "Reset defaults" msgstr "" #: searx/templates/courgette/preferences.html:129 #: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "indietro" @@ -424,51 +440,89 @@ msgid "Toggle navigation" msgstr "" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "" + +#: searx/templates/oscar/preferences.html:213 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "" + +#: searx/templates/oscar/preferences.html:214 +msgid "With that list, you can assess searx transparency." +msgstr "" + +#: searx/templates/oscar/preferences.html:219 +msgid "Cookie name" +msgstr "" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "" @@ -518,6 +572,14 @@ msgstr "" msgid "Please enable JavaScript to use full functionality of this site." msgstr "" +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "" + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "" diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo index 47e153c867e48f541aafecaaf8e424638eb6c724..1ab4f82607f7cbb0cbd6b3f246e853b146dc4800 100644 GIT binary patch literal 7753 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 delta 2435 zcmbW$TWl0n9LMpqP;T4O*47pZtqcv8A_WQ+icl(-V1Qt`KS+65whLWoyJfcxZH#V9 zBVGaq91+u0YeGs1qL3^QA;wx1kV}jRga;6m4XtP(ULt(}jo%+ViSKT9_cQ0rod5rS z{xfr~q;q=oW?I4?!>55?HoqGKHTv(h^_%RN{&rs)2VKRPW$JcNu z;~%gCdoUe$FgX@K!hB<*<`f4C@T>KA%wgPz37A2aG#rIYnMqiRGcXnFk=SNCCgR(u z0$c5TCk|$O7`6U5s?aXXB)|EV0|mH)e9b-n)Pz1%VGr%R$J@VyL{y?NsKO><0hXfT zY(}k%pbBY36|fx@cPFZl-Izdr)5<{#w&N3c*j~_$T6i9{(@Xdg-p09DLKRB*3NmG0 zLlw4*zj4@xO4yCs@o5~7S5VhK!l)7qp-d%CMxAhQI8HKXE()@`u!)u_%zlIcIW&C5(E;2WrbyRB`g0G+4+hj0MKPz4@G z6?W2&&!7^YN3Ht~^-Ntw-NIX_>wiOPHjknl=t3`jRv{^WoM6AyTdd4P)FPCK>pL#T1|CKNUHny-)V9AB(zf0;-TARELV~d?~WTEW$*+|LZu=4lA($8|=6P73dhM zkSSbt?f9DYCMwPy)b)R%3LQW@6(s=z}S)xil4^d6rZ!)+Lz7cm=M)2GnbO5!I=Df~c?p)U7Q=tzR;d{;NeRm{7%QQ9BEu z-s7F9#9yFVcmcKWs-3@Ky=#4diZ_sLDqfOx1ZqRMsP!{Zai7nk|Eh2)6RK>vy`0FB5 zYF$tI{((~`7r6)1Cl8um74mP6-A^ymM(4PR-qiB{xlt2uX^L;#A8(1pTRw@md>(Ik zGv54Z@3CDyAGVo=HNN##feLp@W`P^?E_9D%7P-G<`sW1dDnk|K#o&B%=g97O^Ij8g zJ}AoStF@cZ2IqxfRUl&SHnsM)cMz{<&k?h%(uvggYR9_oj;N=lZ_&=_ZgSQET3X>Q dPQLZHqs^n!-IFOLbakp*oc&bn)$9wNe*r=JT^0ZU diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index 6cec31581..0b433bd72 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -12,10 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-04-26 18:57+0200\n" -"PO-Revision-Date: 2015-04-26 17:02+0000\n" -"Last-Translator: Adam Tauber \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/searx/language/ja/)\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-09-03 07:37+0000\n" +"Last-Translator: pointhi\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" @@ -23,67 +23,67 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "ファイル" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "一般的な" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "音楽" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "社会的ネットワーク" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "画像" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "動画" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "情報技術" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "お知らせ" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "地図" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "{minutes}分前" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours}時間と{minutes}分前" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "通知の数" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "エラー" @@ -98,11 +98,21 @@ msgstr "" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." +"multiple categories. (JavaScript required)" msgstr "" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" +#: 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 "" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" msgstr "" #: searx/templates/courgette/index.html:9 @@ -131,93 +141,95 @@ msgstr "設定" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "検索の言語" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "界面の言語" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" -msgstr "" +msgstr "活性化する" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" -msgstr "" +msgstr "使用不可能にする" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "安全な検索" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "たくさん。" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "少し" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "なし" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: 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" @@ -255,6 +267,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "" @@ -269,6 +283,8 @@ msgstr "カテゴリー" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -282,11 +298,11 @@ msgstr "許可する" #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" -msgstr "" +msgstr "封鎖する" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -295,7 +311,7 @@ msgstr "" #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -304,20 +320,20 @@ msgstr "" #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 msgid "Reset defaults" msgstr "" #: searx/templates/courgette/preferences.html:129 #: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "バック" @@ -427,51 +443,89 @@ msgid "Toggle navigation" msgstr "" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "レイアウトのsearxの変更" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "" + +#: searx/templates/oscar/preferences.html:213 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "" + +#: searx/templates/oscar/preferences.html:214 +msgid "With that list, you can assess searx transparency." +msgstr "" + +#: searx/templates/oscar/preferences.html:219 +msgid "Cookie name" +msgstr "" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "検索結果" @@ -515,12 +569,20 @@ msgstr "" #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "意見" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." msgstr "" +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "異見" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "" + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "" @@ -537,7 +599,7 @@ msgstr "" #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "あっぱれ。" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." @@ -545,7 +607,7 @@ msgstr "" #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "ちぇっ" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." @@ -585,7 +647,7 @@ msgstr "" #: searx/templates/oscar/result_templates/torrent.html:7 msgid "Filesize" -msgstr "" +msgstr "ファイル･サイズ" #: searx/templates/oscar/result_templates/torrent.html:9 msgid "Bytes" @@ -609,7 +671,7 @@ msgstr "" #: searx/templates/oscar/result_templates/torrent.html:15 msgid "Number of Files" -msgstr "" +msgstr "ファイル数" #: searx/templates/oscar/result_templates/videos.html:7 msgid "show video" diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo index 659b4c343672d5755264f40c9c8fa02056e1dbf8..ea2052f97c236de72e34fc6a505388c36d2ca068 100644 GIT binary patch delta 3257 zcmZwIeT*D+9mnzCO1bBj>s_DD)@E9Z+?l)e?mVcVjh>Vgl%}=UmPRZx-TmF(-0jY6 zXJ&7EHDsYhNTe$1vPN_>BI=Rgvh z?Y`#WH^1-0e78Mt-E$ji7rGYA8vfkN-&Oqm+yb3_@aJnS#$3tiZfwRJcHk7Y;=a@a zsC9>M5gty@A3;9malRhIHu!n!v)Io0^Qge*@MHK2D#yQL z7hXaIXm2A)T!Nh#qMkd5+UEgO;z!c!k75(?%}+Sc26L#)pTlK%7PY}eB!+nlufTtx z61|jOe-Bkr3sDqk6<-R}i%RfX?8lo?`&CfS--R8-HwQUT0uN#nK8y#uw82FQcA&9aZ_87~ntg3uwtkfsZ1&nx7)K%n7Wme9XOkDZ#_ogFnK0M^Vq6Ma|fGRKb5)NdMKkOI%or9jw;E zwMY)8FFn5wmGOr3{1*HK=UZ_Mt9Uz}#VvRZS*V~YD$#GC;(Qy``bSXvJ$@DaSHL+g zD5GakmHrY{`HMJ=@8Tf#(O+%wRn#lF6ZO2sUM!~fXHhNxKB|x(qxL_J+W$oA=^6*x z=q1!fFXKn>HB>{!xR(1pi2UxnN<=TJlQ240Qtp<26+fzfmQsDQ($>l@I)o6`H^$j21< zQb!J886U(R{r)rj*wvbqs2293D!V?t{uNXQ?m))CSk$@-@-g@ErOJPRx_=b)>YhR+ z_zbG@Q>cQ@Ak8utuwB3ZzjC0=F5~ssPIOgr6KaFasQY86jokG96e>`ZUaz9w^*yKr z??Y971l6Hqs6u{$O5h~czQ@6N4mP2;q7nFKs0U7@o<_a%m#{u`ILP^BbTG@0eLZeL zJ$FAU&|zeWc^K89Cs8x;YR04OSI`{zgV}km>;S}D1t5+IxE8ew|{;P#&xS&?Oh|2g)RDjE<>0Q7C>bw(` z&~jAZt5E@lQ62a?UW-RiojQklh38Qncont&4OF3vYW$a`8!J%5vj!DlDE0HHn^7Cx zjtcCe{+;kq1?)v7T0yP52bJ*ssoz2EKa2eA%wwod)t=@+0bfA1?ANFOucizBnEFoY zf71I+s~ds3QSY<|^?WaG!$H(5Jc#P-Q8c5)Vo)`sepIz#WJW7-kUY`c-8wp5$U3oC zvUATjug`P^!IWnm-z`~lWBoWv-fh{mGje8vO6c6O)$zuic)~h+D>j^QyvSMWmDf71 zpKmOvL^gEXg7xDMFU$pg?0P=SKUlFgo5Zar+Qx&hs;?T`aQH|qsKs-x&du@j6txkj<|O1SQY&a_*s*vN^j8}8HU zC=No;FF1kUC^Z+9%9YrLS+m{yqS+o43Pm+;+AGwnG20u-DL%O?-_Y#To+f#1;g;ds zym*2P+_;`XzxH%;uJ5=}WTW}86zE4~H?)3kCY$sv+Sr?`gq+32nSP}oT1qEs@P7Vz zJMK|+cCNVSVy5jg1H&WE(9jJdBgwAL)#>TT4I@Lz-JLsH+$iUHr65Rt-+Anc;p|}Y z-Ni$#n`|lT4ye~##`QUUvhHk?BGrtR=vr*4deOgnV%hYpQitmP*4nJ zSg&qwY*|xg;h1lWR8_V`CSY#Y@(r2VMvoD%S6uWanISzpKSVq_QSqIs>xN1?&o8Pm zMnPG9n4cUcC`UzC6>5UEl%m{(J7tSJF+WCjeu@S(MHJG=oqe0kZQ4CKwqp1C%{C_O z{TgOvGDRjtp^%_#eP%gdPp*-{9vcKCMUZUL+VkapUfh0f(sxRMem~Y0sh$MpD=FCe PKzY1iW@@bGiOhciahyo9 delta 2248 zcmYMze@vBC9LMo<1rjem13^I0C;Slv7?fPpjFiU8vUFyDD9gIR6)zeW?*)~bBP(5h zP>Y_?4+g8|jHa2ji)PU#(#&AXSy8(AD{aLe{uupOtVyf)N6!|!Jg;-k^PKbjp6_{{ zFYbN8*LFTFw$t#pjsIN!&&H_t|6liHW8&!cAV0I4OCs*WDR>xle-M-LYui7C@$}E( z9{d&4v7N!&@Leo0rp*k}&;pmOzhNHzag4*>6_vm))Vi;r66wHL;+rlSDfkZFiU;fiM^O`pQ9Jz>*We{wf{V#Q0kj}(1I_c7VNNgqZa5zE$|^u!YC@iL#V_) zxBahBfrnA^PNLqaA5cel0rmVClCzm;qoD`A)LDt7pc2VNB{IiaYVY5J3hCt*6pC2TDJ=cZQAzGP)2>IOb3vk8RnuuXYKeU{Fwd~)LHlN z>g()3!8v#WRnk9E^Cr;2Nj$9nEY!PEh}!vmSg!B?5gK~AUPM)(2UV)Qs2%j%@$XSP z{R!EO8AUxej+q!g_2v#|qV5-JuxV%&#M;AvckKC)4zI*~n^w^8rf0o1zvS=3*pA7nrQPNEh% zhvn$y#n8@|ppK#%wX=s&iLbW(b*MA1N3FNjy3^{S=D&xE(~J6y`?9IOGW?VQW!7&W zJdVon8|w%vz!~HNFqcsk_y-j*KIdj7GEo6$pzar0eb%M+{&G}8YYJ)TjGjc5vJqF| z7Sxdpp-Oip$6Xs=5N(h5dE6hTR985yp_Z@{;ZhrLmaTOBb#>uDB;o|uJIxyc&gPat zxYY@4Ytmpa)aV2wPJXZ{-`(u}%&kaR>vkpdxpj%{u9Ng#^mXKJv@tPa)JZwfe# z{w=|Je>1b(_fuB7g{k*PJ5w)uyz@)$@;PM-7L`}H&!^2$x56o{STw)f{UGgeZ&Ntb z5U6dA+}Y&DrSFd^n|HT+Fug1~mR{v?t20)VIStCQ#IH1+t${$;+3Ig>lyw2;*-&6( zsHraOuiemmBTw>uJ@XIu-^^Nf)3i}{Lsn;WUUr-(x-@68#~q%Ylearn more about request methods" msgstr "Bepaal hoe de formulieren worden ingestuurd, lees meer over request methodes" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "Filteren content" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "Wijzig searx layout" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "Snelkoppeling" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "Gem. duur" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "Max. duur" + +#: searx/templates/oscar/preferences.html:213 +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 +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 +msgid "Cookie name" +msgstr "Cookienaam" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "Waarde" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Zoekresultaten" @@ -518,6 +572,14 @@ msgstr "Waarschuwing!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Activeer JavaScript om alle functionaliteit van deze site te gebruiken." +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Informatie!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "er zijn momenteel geen cookies gedefinieerd." + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "Er zijn momenteel geen gegevens beschikbaar." diff --git a/searx/translations/pt/LC_MESSAGES/messages.mo b/searx/translations/pt/LC_MESSAGES/messages.mo index 4a9302b6085d6e37b1ebcde88aa8cc8794ea9706..34430905f3b3df5392624658d5c91081735876b1 100644 GIT binary patch delta 16 XcmX?Sc+PMGqX4s!p221ofm0j+FXII4 delta 16 XcmX?Sc+PMGqX4s^p7CZDfm0j+FYN^G diff --git a/searx/translations/ro/LC_MESSAGES/messages.mo b/searx/translations/ro/LC_MESSAGES/messages.mo index 595ff5ad891109fa801644095097e263b1779a6f..13731ff929f75ccc6e962dd1f21f94c51b29fdf9 100644 GIT binary patch delta 3219 zcmcK5Yitx%7{>8a3bgcsIW2K0#S^y#)!8xY78In4k*F+e|C>tK4{d0X1l*RXU;kA z`<^+|elmN@CAlv~4&H3|*}(5ae&-HW>-f)&<;D!5*@k79z$)y-VYtS6J8Ik}9F7mz z_LIoRJj>V9xD7|)GA5s8OwQcGMLivxPz$_beH|-l??eTD56{4URE|I6NIZ-RP+38e zI2vm(M9o`|TIX(5;t$#WtvHnU=6No(KrbruH*hTOK`k(V#4!7@6n{Y_df4{=fvTvS zC<-)@F9oVcC3rqg#rdf9vZ(pDVHNSsdM=c}eK-^!K?Qok_HRX1`~sea+i?WGW$%B4 zn)f-X@~<(#U-44($VP#mL2@-OBDc&A%uVLv9WE4bKTg8~sGXQpZOjyGL`}RF73d~Z z0!iE7gM7>ezLektI3AzE!j7Wm?LnQf4^ahwU(Nn&>kiW~2CEpYfptg@ropynqB6e7 zwin0-vQB)yYQ0s3)t-r&%E60Tv+KXD~BOHYLP!)WE z%5=cC51Tn)KKBkOvHGUkjsb(^2Tnj3ZS*S$jp%TemV=tE50SQ!qF5B)# zCAJhHu?g?^s@#k}lV zXfbLFuSdQAowomW)Q;SR6lv~5K4uGF3e<<1{}pQfcc@4A8*1KBROO{?mkO#zjcdTd z`#*;ZcGFye({Kf9!HuYi_akeVM^Tk;xA$L11$x`I-$e!7i)^0hM~XE2QD?x6EAGG$ z)N5FSxqypCE>_@Us4Y8$IxK&nwziV}pNh4p0P|3ZUWxjXycV1BVdO=gDv*yH$-Q|EWpIc{cUaX>cmLdQ*dnfT;^ zi69fZeum-4N7Oat<6%20+Ji9d#(t1FD}Qc9TbaA2kWK!MidV-v^;f#x?vh04cg0TV zt;+hLx3VFBVdbXAbkOZNap)#Gsm5``WHwFE$Y~FQbRogei?doqyOiuC1UHOJ)nbtJ1>J!8giUKVywWSnFkr6?;Z7D5x5Kuuuu|Yr$)Q}AAbRFI9mf78g7Ile@ zgeVwsL_?vdAxaPk>ME(m1SuB*jTZuF08xp;2Le$)SR-KkKlFInOy@V}%$)PS@0>H; zI^)|(>9YmhH(2~u@K?&;nJl&b`)%%FSvSyZLk?>zr{1^&dtp23eh22^VblHwd(!?6 z-^BA+h->M*1z*SEmX)?TxX=U_jlbd`+MU=Pi-=NyB}kVQ#_2c#^D%|YZLP)}d;yhU ztLfi{H`3mX8ovjX=w9qceCrD?G{MivVO`>+m(Yny?273RWp`DOg9DxF8)|}`*bOtN z1oxm4`^dBpp#mR8jr$6qC)VNw4hEY_4FCmAuk(1)=!YY0L?dC=g($T_QP?e z|9({E3z68?Vsk%=3eyE)9)I_sU z10Fyn@`&k=p(buL?PgSfXOO9^HOOJLanjOeP!+eMzLx#ifIr}3eg6+KyI#=_)E;;b zwMKh!G=7E(@CWKY<6k%yOIcu+)v7`zycCr{o#|g`d>&QcCe**)UC0#Hmw5gAKhMQb zIxb-e7WD7RG>i&xA8PHEpc0Lt);fi%@M+YhYe64(ViOK#gXm3dL?zIMTDsk+c{&F0 z{#EG_({Tc|mS=Dpb|V`-I0IGTJ$SuhR02y)f5i01QJ+=XxX!o=MeUU_$QNx*MlIzW<3q+}r~=}sJ&_(^ zI-WyS)QTQ%MSWJe>= z%UTqVM53-8a~i#flVnuzR-gI7i2S=V8}fe)WseJ2Ot8mJnlgT3u&UtZS>way6?R3% zl#0qx<@~beIf-O=k?+J3Q70Mqr;w8GIkB=jFX`CR{@0ipsdv0+SxvltdT^+qGP}W# zKkn8f6Jr{JP~pj}v1OIPslv)kabGVKyj(P|>drdv@J82ZKG32m-GpN|#);+Artn0{ zPjFT1)Nt-9*mGdA6HKy7swMTfByItJ;D)`dtg|Esh2s7cWmQaGj{v z+%-4jQ%T2n8C>tydQQ^JnFu>}!i|z4U2(g{NxG4^@4036EVtRINqUXW;Z2_1;Kq`E z%KrCRn!N9= diff --git a/searx/translations/ro/LC_MESSAGES/messages.po b/searx/translations/ro/LC_MESSAGES/messages.po index 2a14e35c6..58041d5bd 100644 --- a/searx/translations/ro/LC_MESSAGES/messages.po +++ b/searx/translations/ro/LC_MESSAGES/messages.po @@ -8,10 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-04-26 18:57+0200\n" -"PO-Revision-Date: 2015-05-02 22:23+0000\n" -"Last-Translator: adrian.fita \n" -"Language-Team: Romanian (http://www.transifex.com/projects/p/searx/language/ro/)\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-08-24 09:45+0000\n" +"Last-Translator: pointhi\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" @@ -19,67 +19,67 @@ msgstr "" "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:104 +#: searx/webapp.py:114 msgid "files" msgstr "fișiere" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "general" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "muzică" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "rețele sociale" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "imagini" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "videouri" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "el(ea)" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "știri" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "hartă" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "{minutes} minut(e) în urmă" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} oră(e), {minutes} minut(e) în urmă" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Încărcarea paginilor (sec)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Numărul de rezultate" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Scoruri" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Scoruri per rezultat" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Erori" @@ -94,12 +94,22 @@ msgstr "Căutare în categoria selectată" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." -msgstr "Realizează căutarea imediat dacă s-a selectat o categorie. Dezactivați pentru a selecta mai multe categorii." +"multiple categories. (JavaScript required)" +msgstr "" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" -msgstr "Afișează adresa voastră IP sursă dacă expresia interogării este „ip”" +#: 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 "" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -127,90 +137,92 @@ msgstr "Preferințe" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Categorii implicite" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Limba de căutare" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Automat" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Limba interfeței" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Completare automată" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "Proxy de imagini" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "Activat" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "Dezactivat" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Metodă" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "CăutareSigură" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "Strict" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "Moderat" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "Nimic" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Teme" @@ -251,6 +263,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Numele motorului" @@ -265,6 +279,8 @@ msgstr "Categorie" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -282,7 +298,7 @@ msgstr "Blochează" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -291,7 +307,7 @@ msgstr "Aceste setări sunt stocate în cookie-urile d-voastră, aceasta ne perm #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -300,20 +316,20 @@ msgstr "Aceste cookie-uri servesc doar pentru confortul d-voastră, noi nu stoc #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 msgid "Reset defaults" msgstr "Resetează valorile implicite" #: searx/templates/courgette/preferences.html:129 #: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "înapoi" @@ -423,51 +439,89 @@ msgid "Toggle navigation" msgstr "Comută navigarea" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "General" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "Motoare" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "Module" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "Ce limbă preferați pentru căutare?" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "Schimbă limba aspectului" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "Găsește lucruri în timp ce tastezi" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "Transferă rezultatele cu imagini prin searx" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "Modificați cum sunt trimise formularele, învățați mai multe despre metodele de transfer" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "Filtrează conținutul" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "Schimbă aspectul lui searx" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "" + +#: searx/templates/oscar/preferences.html:213 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "" + +#: searx/templates/oscar/preferences.html:214 +msgid "With that list, you can assess searx transparency." +msgstr "" + +#: searx/templates/oscar/preferences.html:219 +msgid "Cookie name" +msgstr "" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Rezultatele căutării" @@ -517,6 +571,14 @@ msgstr "Avertizare!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Vă rog activați JavaScript pentru a utiliza funcționalitatea completă a acestui site." +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "" + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "Deocamdată nu există date disponibile." diff --git a/searx/translations/ru/LC_MESSAGES/messages.mo b/searx/translations/ru/LC_MESSAGES/messages.mo index c4808f2b0d6929d16c390f40d4f9be9f8841c8a5..ebaa142acb30fe8117785cab0e8d51136c8437d5 100644 GIT binary patch delta 3215 zcmcK4d2AGA7{~EdfYFnTIiwe;SDi{GHE#A?|cG`~Y?$p`YmPXAQ z!QcUrFrx7W1uwVF2@b=hkvF0Gt;CVICaSMT z9zgMjXo4In@|ST8?m$hjA6dg3z#=?^3iL?S{u3&rQdZGI zInaS~A|p?*}L*P+%~h1&Y{sQES>&Hih_91V)-MO3D*qcVR7TktSW z!3OqM6I_NmlB-eU9jwPh^!-}Ymfwd;_bJm zKdOI;3g8>mxFe{``6Kd}64F)wamc2ciKu=ps6bj#fy_Y#lARwFE{QtCQ491&^*&T! z%kUz+4VCF$9E-(V@fsqoMIJMAbYY=|cpUXB@DyB%3UmYN?Rpv~>ivI{f+9MAn&2Sr z#bPc59n2?@!x(ig^=9OlO$Ie?IV$5-s4c$-XW)9&e0%U@`~tN@m&!D{?XJIF5D<8%a@u{f(K5E{5s2%+RwQ~niiH+wK z$-nUR|? z03Wj+g}W*AV+jYQEzBZ8niZ%(*5PIN1S+FqUgF7Eg{q%}dRy9Y0$z_==zi4JZ$=)o zhYwyP^BwASFR5Yw3EI?mVEgL6@@-!rI$UPbkP3+r)D)LxXWD|8r%%B&id(X7ah$Ruj3Z$_Qvoj3$Hq84}z zwUfE1z7utKK17ZC6gfR}2(|SUET(bUlPKtHrlQVl0qQJm)PP$fH%4wpO}H1eBcG!J zj&Y+jVKs(05hvpds5|i)nzls3>o;wwbid=LO*GnBAo?LciiM=!*O?Y$J^JA>~^X)!+ zQQUWX1Iu@=&A7hP*$|#Fd}UM8>vOEYx8qC5#u9$Gr}K+KX8;E#4|x|ZTZw#wujhxluN=*2bR}m#S01Nv!UJftv)-Eane@WvHhj$ zoen(TO?6vds*rBnOZH|0$8R?6?%Af@>+Viy^ZMNGd`70d5TIfpe#PvY#hTNEAB|Yp zaNbf4CrbRel^BRk#&@z9E^>tN*7PlABreQmlMl>JOLX z@R;SL^P^jm8yGt__7~SAw|d+$v43_?at~H7j#Vw{@$&b?3_djY%HWHGTL!ldZV8_m qQ?401yh8mq>U~TQKLdaMWRL#F)DAGD1RvU5<^XB)bEd*#Q(kQ?Pq3oXXcq_ zc6ZzD?t=LFoRpo0-$wpp`JYWz?Z4mdVa5!h`XX|e9!{C~I;P>IFx!Hs{dhBpdVm9^PA5oXn-G)!(8U1Bn+SeyJp*c>4_C&pe8Ct1y+HRupTwe zT2#LnDv(Z809#SxK8XsX8&jCy?4mFd_h2^m*&B|cI-W$W^b5Qnf55ponh~Mxp{4iwb0dwaQ+fg_>ZI ztuI9dwi55cRak~^VF8}UnM8aQ^{`IiqwURp@PC%%*W@j6njyDe2E<9ET?n$ zE9&~EY`FXbZ^MGz#Ix}Ls$Upq;(Ap7KAechP?@-lyvA|!HwEq89G)DKVS=cKsU2^` zZK#M3T92Ss){nFBJkG(mF3bda)SKpeDGAN^#og#A`Vn*>-a$k|g6tZZR8B0d`|t6L}PB z@O_+wf1*-f!V{v`Zy^%Axepac1WA_JjN0p+I1gXKy?7D#;A4CoG=2%`Eyqcyt+^N3 zb+f66{A+@48Wd>{EiV;iz46Gx@;1=M|SpuT|bp|;=~)Yklhx~fvq zr@U*!D}A}4`KBS#)YKAmTK(%oP5yRzx%)>hbIY?9cssMc_oYv-te)Xaomp2?>pq$@ zZeF5VTUS+GQN=HPi9gm}*%0-&##;RCk!YPWuhAcN8vGrrf>CF-KNbju!jZ__rm#QM zGC2?l*Sq~W)#+`~$eLiFJvOE7%~7?!\n" -"Language-Team: Russian (http://www.transifex.com/projects/p/searx/language/ru/)\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-08-24 09:45+0000\n" +"Last-Translator: pointhi\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" @@ -20,67 +20,67 @@ msgstr "" "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:104 +#: searx/webapp.py:114 msgid "files" msgstr "файлы" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "общие" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "музыка" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "соцсети" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "картинки" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "видео" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "IT" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "новости" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "карты" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "{minutes} минут назад" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} час, {minutes} минут назад" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Время загрузки (сек)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Число результатов" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Попаданий" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Попаданий за результат" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Ошибок" @@ -95,11 +95,21 @@ msgstr "" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." +"multiple categories. (JavaScript required)" msgstr "" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" +#: 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 "" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" msgstr "" #: searx/templates/courgette/index.html:9 @@ -128,90 +138,92 @@ msgstr "Опции" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Категории по-умолчанию" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Язык поиска" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Выбирать автоматически" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Язык интерфейса" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Авто-подсказки" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "Прокси для картинок" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "Включен" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "Выключен" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Метод" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "Безопасный поиск" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "Строгий" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "Умеренный" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "Выключен" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Темы" @@ -252,6 +264,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Имя движка" @@ -266,6 +280,8 @@ msgstr "Категория" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -283,7 +299,7 @@ msgstr "Блокировать" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -292,7 +308,7 @@ msgstr "Настройки хранятся в ваших cookies-файлах, #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -301,20 +317,20 @@ msgstr "Данные cookies применяются для вашего удоб #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 msgid "Reset defaults" msgstr "" #: searx/templates/courgette/preferences.html:129 #: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "назад" @@ -424,51 +440,89 @@ msgid "Toggle navigation" msgstr "Переключить навигацию" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "Общие" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "Движки" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "На каком языке вы предпочитаете искать?" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "Изменить язык сайта" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "Поисковые предложения при наборе" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "Проксировать найденные изображения с помощью searx" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "Изменяет способ отправки запросов (подробней о методах запросов)" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "Использовать ли фильтр контента" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "Изменить тему сайта" +#: searx/templates/oscar/preferences.html:143 +#: searx/templates/oscar/preferences.html:151 +msgid "Shortcut" +msgstr "" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "" + +#: searx/templates/oscar/preferences.html:213 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "" + +#: searx/templates/oscar/preferences.html:214 +msgid "With that list, you can assess searx transparency." +msgstr "" + +#: searx/templates/oscar/preferences.html:219 +msgid "Cookie name" +msgstr "" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Результаты поиска" @@ -518,6 +572,14 @@ msgstr "Внимание!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Пожалуйста включите JavaScript, чтобы использовать все функции сайта." +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "" + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "На данный момент данные недоступны." diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.mo index be6382054e00ca4130cca162e7e30a3fee5d2656..deacd6c8df15f2e4212b4f1a3bb6272bf7204776 100644 GIT binary patch delta 3235 zcmc)LeQXp(7{~D`AT6boLd#15aYfYD&{9fy^(CM+iZ6ix79tv0uiNX&^|tKpwN!&g zL=#j@3>P%U#AtoN_yW{M4PZ1vjWG>scrj@JUr?j+2fkyY0sa2&R?$C9)Wp~v{mjhH z&htDobER+A{>#!Ij2yJZ@N*acCh+f)LF%3Pxv9XIv*_N8`540@T#Z9;ZRDM(d7H2p zH%I-)k&oHRucvSamSO`hpKDCo+)AT@fla6dUW(j}L+QVP3cL@`#zUwazr&H(j|wof zkR-7TOVCHXw*j@zeW=7AipHPB!NfPu)6fFlsLWr*(b$Vx;209a9LIt9Ju1=uX#6y) zq5`5Q&;))dPz5T%88`*6My;1Zy}u5Nh;KH~Py!F&V0;)A=&@-0NmRuz;Bb5qN8q05 z`9aisM^Tl3iXQ%e^Uxt11%4XI)oeo^nVp!POyf-&3V0l+;tAAFOdMv+g;<4p@di|& zRj35w(Rc^)F?aDx32w%6?8NMjqTcI8-Ld_sg1;KZ{%h;{85o5{%+|z7NDihl>d!=F zd}-8QfEUnTgiEj;S70wL#0$wn1+}9Ry&V`Kj#_W)aQ0sTyBSbMyHJ(xMOFR| z*5XO5!Aka53*3l0l2xep9jw4a^n43y%O61%@&s!A9jNtpM)ss>XrXse3mwD(coFcA$@@PT~6`(ch zx1kc-fQ#{7RHa983=ZasZ_eYcpc3g~pH=y8WXSAA1$-a%{KM$^m$~O@^9>DUIH)Wa zXbA41UxJhI0P5@5j|x1Ti=qT)qu#p=Rq++5zzgwwTo#S5!?E=5LG4H<>hHu39H;Mp zF{^9AO4OE2#ql^7m3aed;gzT@j3f8Vgg6m5px*C{#-BkQ-7Bb_+l^Xx501lqNG;|I z%zpn*slh-Y`#BxQp!(OMGG31QIyIpZT94U^P=Pv8JMnbXe-4%4cI4ig*H8((gDRvC zmB7cC_Gp}>p|fpbRZZN9n$Uwfvp%fHPon1)WHXiibW}w#tiwA{fxA(a??JAKc^f%p za~PG-SEx9@l(YY|O(Cmj;$+lW&ct)@a#Y2)p#E^IMxE_O)Vyt|TfYkxuoso^epIDL zkYhHV;sX2$U99JP7vi?@oWHj4Gy_Ut08x}_8R|?cP~+98%I0DAl0_~+H5wNy9-|)ZB<-jx7kZ# zzS|mFzOyFf`c7kI=Hj87s#?4@#|nKrwwh`z+mEMO2pU*TzSojX(09U=pL80n8x~)e z=^1+HEI*8;!tO0a)AG{IhpRN~n zEiaiXHRiRnrb5TBHcQ>h%~CHOPiW)X+<3Mcvox2S;*-1b^-Y7;G?~N07S=9v!)7wD z!)yvuw5Aoala?I>PVie;3QPvAw(lfk9o3o2;`)kM%BL45I;JRn-=TD(dcWu2=rp-h zUEQ51K9*NFyQ;R%nl^22U0r5*$;4c@X3pHY8JYDZWAa-)HyJj&nb%8d3+y1~x-FiU z`MKozfwk2&nP*4T{NZl&jaZRan!6Bxz8up_?f>d>^p<{Iv>^G1>#?h>z2N%a?nlk2 zxBlvW{5a~ptN+pc;9UH`?&#@C*vW+L_jFl7Pghe1as Xo)P6Y{+ru#YkBbZZ_knPQ+dAv=`l#e delta 2312 zcmbW$TWnNC9LMols6e+DdcT(*k!ovg>CF}^HpoRS8Z@Aw?Ms(-3v20x-4>~aEIvRa z7Gpg@O;g3hXcMjJ!$O0QC^WPp8UhF!FU3d#gdhYTv}l{)_eUr3-OcWP&dfP8|Nnnx z&e_@@tHT$PqV^d++xg}2`(?IT|9uAL8gm!T_mHpokiS^`6r=GF>i#Ik;|bgT0q4=4 zz>n}UCSxz1cjE_GU`*JIa-j*XS^vOX+LIWCsYFS_ETqd6V=Y!;0(K*Fo81_LZ=e$F zxBY`ShxRaP{0J)1FENey<`fs2;1cpR*ZI>TOrjE-vi%`6nI2eaTsKg$^Osqpq)Px!rM4g!))ZV_0 zsrZS#e-!zeuWb7q64U%_+gD;)|9k1ULB~2wC29i(P??XR68jqO3`7OKf?C2GsDvj` zmCYi%QoJ9v1r4Y(JMQOYQxKQ30N??KP;x z8gMOc!~#5s>39JTdW`uCmBgC>HsLQLe#j$n2(jHit8~0TTqpUk=HnE_HvO$$G4~nuAnNvj@ft%m0(KBOy;?$ zmC8pJ&y?c=d=xdl(e}5Xwx}CbKo4r(ov3)PV~XDYkGare< zjkYLnX2bHU2qNA&sc#UdFKYrk9I6d>8dTA42Wj zdDQ(W)aji|`F8@L63jzYR*2MK%CHU}#{l-BR%!|r@U}IPEL6xnnXJDiD5pc#pbpb= zd>&g-fsUh=`jl;dhdL7zs6D@oTDjj*6?@oVC7x)_MLl1LT8VPoek6<^ z#u6;RcaT*xN3-4fc?FT)c~u_w`{-5GPESX7&3QXX!>?NEand>R-00%@^2G($vvb>y9Utdpm<2FZ!FhLW?`!N*(CznR9Cf9r14XKU)ySlivo31x~o4Y4{-1TRijt%*{oMwNEuX{^Z$lZ~7Dbkv? Ta;DUhoO<_2PB5}QciQtWM}#N1 diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po index ef9d62541..62678c095 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.po +++ b/searx/translations/tr/LC_MESSAGES/messages.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-04-26 18:57+0200\n" -"PO-Revision-Date: 2015-04-28 17:33+0000\n" -"Last-Translator: Caner Başaran \n" -"Language-Team: Turkish (http://www.transifex.com/projects/p/searx/language/tr/)\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-08-24 09:45+0000\n" +"Last-Translator: pointhi\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" @@ -20,67 +20,67 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:104 +#: searx/webapp.py:114 msgid "files" msgstr "dosyalar" -#: searx/webapp.py:105 +#: searx/webapp.py:115 msgid "general" msgstr "genel" -#: searx/webapp.py:106 +#: searx/webapp.py:116 msgid "music" msgstr "müzik" -#: searx/webapp.py:107 +#: searx/webapp.py:117 msgid "social media" msgstr "sosyal medya" -#: searx/webapp.py:108 +#: searx/webapp.py:118 msgid "images" msgstr "görseller" -#: searx/webapp.py:109 +#: searx/webapp.py:119 msgid "videos" msgstr "videolar" -#: searx/webapp.py:110 +#: searx/webapp.py:120 msgid "it" msgstr "bilişim" -#: searx/webapp.py:111 +#: searx/webapp.py:121 msgid "news" msgstr "haberler" -#: searx/webapp.py:112 +#: searx/webapp.py:122 msgid "map" msgstr "harita" -#: searx/webapp.py:396 +#: searx/webapp.py:414 msgid "{minutes} minute(s) ago" msgstr "{minutes} dakika() önce" -#: searx/webapp.py:398 +#: searx/webapp.py:416 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} saat(), {minutes} dakika() önce" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Yüklenen sayfa (sn)" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Sonuç sayısı" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:194 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:198 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Hatalar" @@ -95,11 +95,21 @@ msgstr "" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " -"multiple categories." +"multiple categories. (JavaScript required)" msgstr "" -#: searx/plugins/self_ip.py:19 -msgid "Display your source IP address if the query expression is \"ip\"" +#: 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 "" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" msgstr "" #: searx/templates/courgette/index.html:9 @@ -128,90 +138,92 @@ msgstr "Tercihler" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:35 -#: searx/templates/oscar/preferences.html:37 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 msgid "Default categories" msgstr "Öntanımlı kategoriler" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 -#: searx/templates/oscar/preferences.html:43 +#: searx/templates/oscar/preferences.html:44 #: searx/templates/pix-art/preferences.html:9 msgid "Search language" msgstr "Arama dili" #: searx/templates/courgette/preferences.html:16 #: searx/templates/default/preferences.html:17 -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:48 #: searx/templates/pix-art/preferences.html:12 msgid "Automatic" msgstr "Otomatik" #: searx/templates/courgette/preferences.html:24 #: searx/templates/default/preferences.html:25 -#: searx/templates/oscar/preferences.html:54 +#: searx/templates/oscar/preferences.html:55 #: searx/templates/pix-art/preferences.html:20 msgid "Interface language" msgstr "Arayüz dili" #: searx/templates/courgette/preferences.html:34 #: searx/templates/default/preferences.html:35 -#: searx/templates/oscar/preferences.html:64 +#: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" msgstr "Otomatik tamamlama" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 -#: searx/templates/oscar/preferences.html:75 +#: searx/templates/oscar/preferences.html:76 msgid "Image proxy" msgstr "Görsel vekil sunucu" #: searx/templates/courgette/preferences.html:48 #: searx/templates/default/preferences.html:49 -#: searx/templates/oscar/preferences.html:79 +#: searx/templates/oscar/preferences.html:80 msgid "Enabled" msgstr "Etkin" #: searx/templates/courgette/preferences.html:49 #: searx/templates/default/preferences.html:50 -#: searx/templates/oscar/preferences.html:80 +#: searx/templates/oscar/preferences.html:81 msgid "Disabled" msgstr "Devre dışı" #: searx/templates/courgette/preferences.html:54 #: searx/templates/default/preferences.html:55 -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" msgstr "Sorgu gönderim yöntemi" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 -#: searx/templates/oscar/preferences.html:93 +#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:144 +#: searx/templates/oscar/preferences.html:150 msgid "SafeSearch" msgstr "Güvenli Arama" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 -#: searx/templates/oscar/preferences.html:97 +#: searx/templates/oscar/preferences.html:98 msgid "Strict" msgstr "Sıkı" #: searx/templates/courgette/preferences.html:67 #: searx/templates/default/preferences.html:68 -#: searx/templates/oscar/preferences.html:98 +#: searx/templates/oscar/preferences.html:99 msgid "Moderate" msgstr "Orta" #: searx/templates/courgette/preferences.html:68 #: searx/templates/default/preferences.html:69 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:100 msgid "None" msgstr "Yok" #: searx/templates/courgette/preferences.html:73 #: searx/templates/default/preferences.html:74 -#: searx/templates/oscar/preferences.html:103 +#: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" msgstr "Temalar" @@ -252,6 +264,8 @@ 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/pix-art/preferences.html:53 msgid "Engine name" msgstr "Motor adı" @@ -266,6 +280,8 @@ msgstr "Türü" #: searx/templates/default/preferences.html:90 #: searx/templates/default/preferences.html:101 #: searx/templates/oscar/macros.html:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -283,7 +299,7 @@ msgstr "Engelle" #: searx/templates/courgette/preferences.html:122 #: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:180 +#: searx/templates/oscar/preferences.html:235 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -292,7 +308,7 @@ msgstr "Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınız #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:182 +#: searx/templates/oscar/preferences.html:237 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -301,20 +317,20 @@ 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:185 +#: searx/templates/oscar/preferences.html:240 #: 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:187 +#: searx/templates/oscar/preferences.html:242 msgid "Reset defaults" -msgstr "" +msgstr "Varsayılanları sıfırla" #: searx/templates/courgette/preferences.html:129 #: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:186 +#: searx/templates/oscar/preferences.html:241 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "geri" @@ -424,51 +440,89 @@ msgid "Toggle navigation" msgstr "" #: searx/templates/oscar/preferences.html:17 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:25 msgid "General" msgstr "Genel" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:125 +#: searx/templates/oscar/preferences.html:126 msgid "Engines" msgstr "Motorlar" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:187 msgid "Plugins" msgstr "Eklentiler" -#: searx/templates/oscar/preferences.html:44 +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "" + +#: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" msgstr "Tercih ettiğiniz arama sonuçları dili" -#: searx/templates/oscar/preferences.html:55 +#: searx/templates/oscar/preferences.html:56 msgid "Change the language of the layout" msgstr "Site dilini değiştir" -#: searx/templates/oscar/preferences.html:65 +#: searx/templates/oscar/preferences.html:66 msgid "Find stuff as you type" msgstr "Leb demeden leblebiyi anlasın" -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" msgstr "Görsel arama sonuçlarını, searx vekil sunucusu üzerinden geçir" -#: searx/templates/oscar/preferences.html:85 +#: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" msgstr "Aramaların nasıl gönderildiğini değiştir, istek yöntemleri hakkında daha fazla bilgi" -#: searx/templates/oscar/preferences.html:94 +#: searx/templates/oscar/preferences.html:95 msgid "Filter content" msgstr "İçeriyi süz" -#: searx/templates/oscar/preferences.html:104 +#: searx/templates/oscar/preferences.html:105 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 +msgid "Shortcut" +msgstr "" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "" + +#: searx/templates/oscar/preferences.html:213 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "" + +#: searx/templates/oscar/preferences.html:214 +msgid "With that list, you can assess searx transparency." +msgstr "" + +#: searx/templates/oscar/preferences.html:219 +msgid "Cookie name" +msgstr "" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "" + #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Arama sonuçları" @@ -518,6 +572,14 @@ msgstr "Uyarı!" msgid "Please enable JavaScript to use full functionality of this site." msgstr "Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i etkinleştirin." +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "" + #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " msgstr "Şuan uygun veri yok." diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.mo b/searx/translations/zh_CN/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..64101a5a6869a6a717fbdf958b4661b778d5e0cf GIT binary patch literal 7412 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 MuJn!X+IwdI7e|ww3;+NC literal 0 HcmV?d00001 diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.po b/searx/translations/zh_CN/LC_MESSAGES/messages.po new file mode 100644 index 000000000..666b781da --- /dev/null +++ b/searx/translations/zh_CN/LC_MESSAGES/messages.po @@ -0,0 +1,682 @@ +# Translations template for PROJECT. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# 文科, 2015 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2015-08-24 11:44+0200\n" +"PO-Revision-Date: 2015-08-29 07:35+0000\n" +"Last-Translator: 文科\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 1.3\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: searx/webapp.py:114 +msgid "files" +msgstr "文件" + +#: searx/webapp.py:115 +msgid "general" +msgstr "一般" + +#: searx/webapp.py:116 +msgid "music" +msgstr "音乐" + +#: searx/webapp.py:117 +msgid "social media" +msgstr "社交媒体" + +#: searx/webapp.py:118 +msgid "images" +msgstr "图片" + +#: searx/webapp.py:119 +msgid "videos" +msgstr "视频" + +#: searx/webapp.py:120 +msgid "it" +msgstr "it" + +#: searx/webapp.py:121 +msgid "news" +msgstr "新闻" + +#: searx/webapp.py:122 +msgid "map" +msgstr "地图" + +#: searx/webapp.py:414 +msgid "{minutes} minute(s) ago" +msgstr "{minutes}分钟之前" + +#: searx/webapp.py:416 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours}小时{minutes}分钟之前" + +#: searx/engines/__init__.py:185 +msgid "Page loads (sec)" +msgstr "页面加载 （秒）" + +#: searx/engines/__init__.py:189 +msgid "Number of results" +msgstr "结果数" + +#: searx/engines/__init__.py:193 +msgid "Scores" +msgstr "得分" + +#: searx/engines/__init__.py:197 +msgid "Scores per result" +msgstr "每个结果等分" + +#: searx/engines/__init__.py:201 +msgid "Errors" +msgstr "错误" + +#: searx/plugins/https_rewrite.py:29 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "如果可能的话重定向HTTP链接到HTTPS" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +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 启用）" + +#: 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。" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "移除跟踪链接" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "从返回的链接中移除跟踪参数" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "首选项" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +#: searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "关于" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/default/preferences.html:5 +#: searx/templates/oscar/preferences.html:12 +#: searx/templates/pix-art/preferences.html:5 +msgid "Preferences" +msgstr "首选项" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/default/preferences.html:9 +#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:38 +msgid "Default categories" +msgstr "默认类别" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:44 +#: searx/templates/pix-art/preferences.html:9 +msgid "Search language" +msgstr "搜索语言" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/pix-art/preferences.html:12 +msgid "Automatic" +msgstr "自动" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:55 +#: searx/templates/pix-art/preferences.html:20 +msgid "Interface language" +msgstr "界面语言" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:65 +msgid "Autocomplete" +msgstr "自动完成" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:76 +msgid "Image proxy" +msgstr "代理图片" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:80 +msgid "Enabled" +msgstr "启用" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:81 +msgid "Disabled" +msgstr "禁用" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:85 +#: searx/templates/pix-art/preferences.html:30 +msgid "Method" +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 +msgid "SafeSearch" +msgstr "安全搜索" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:98 +msgid "Strict" +msgstr "严格模式" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:99 +msgid "Moderate" +msgstr "中等" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:100 +msgid "None" +msgstr "不过滤" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:104 +#: searx/templates/pix-art/preferences.html:39 +msgid "Themes" +msgstr "主题" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "颜色" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "蓝色（默认）" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "紫色" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "绿色" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "青色" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "橙色" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "红色" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 +#: 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/pix-art/preferences.html:53 +msgid "Engine name" +msgstr "搜索引擎名字" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 +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:67 +#: searx/templates/oscar/preferences.html:141 +#: searx/templates/oscar/preferences.html:153 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +msgid "Allow" +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:66 +#: 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/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，这代表我们不能储存你的数据。" + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:237 +#: 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跟踪你。" + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:240 +#: 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 +msgid "Reset defaults" +msgstr "恢复默认" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/default/preferences.html:117 +#: searx/templates/oscar/preferences.html:241 +#: 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 +msgid "Search URL" +msgstr "搜索链接" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 +msgid "Download results" +msgstr "下载结果" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "回答" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 +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 +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 +msgid "next page" +msgstr "下一页" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 +msgid "Search for..." +msgstr "搜索..." + +#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +msgid "Engine stats" +msgstr "搜索引擎统计" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "原始上下文" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +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 +msgid "torrent file" +msgstr "种子文件" + +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +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 +msgid "cached" +msgstr "缓存" + +#: searx/templates/oscar/base.html:78 +msgid "Powered by" +msgstr "Powered by" + +#: searx/templates/oscar/base.html:78 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "一个尊重隐私，可再开发的元搜索引擎" + +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 +msgid "home" +msgstr "主页" + +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "切换导航" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:25 +msgid "General" +msgstr "常规" + +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:126 +msgid "Engines" +msgstr "搜索引擎" + +#: searx/templates/oscar/preferences.html:19 +#: searx/templates/oscar/preferences.html:187 +msgid "Plugins" +msgstr "插件" + +#: searx/templates/oscar/preferences.html:20 +#: searx/templates/oscar/preferences.html:210 +msgid "Cookies" +msgstr "Cookie" + +#: searx/templates/oscar/preferences.html:45 +msgid "What language do you prefer for search?" +msgstr "你更喜欢搜索什么语言？" + +#: searx/templates/oscar/preferences.html:56 +msgid "Change the language of the layout" +msgstr "改变界面语言" + +#: searx/templates/oscar/preferences.html:66 +msgid "Find stuff as you type" +msgstr "找到你的搜索的东西" + +#: searx/templates/oscar/preferences.html:77 +msgid "Proxying image results through searx" +msgstr "通过searx代理图片" + +#: searx/templates/oscar/preferences.html:86 +msgid "" +"Change how forms are submited, learn more about request methods" +msgstr "更改请求方法，关于请求方法了解更多" + +#: searx/templates/oscar/preferences.html:95 +msgid "Filter content" +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 +msgid "Shortcut" +msgstr "快捷键" + +#: searx/templates/oscar/preferences.html:145 +#: searx/templates/oscar/preferences.html:149 +msgid "Avg. time" +msgstr "平均时间" + +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/oscar/preferences.html:148 +msgid "Max time" +msgstr "最大时间" + +#: searx/templates/oscar/preferences.html:213 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "这是searx保存在你的电脑上的cookie列表。" + +#: searx/templates/oscar/preferences.html:214 +msgid "With that list, you can assess searx transparency." +msgstr "有了这个列表，你可以评价searx透明度。" + +#: searx/templates/oscar/preferences.html:219 +msgid "Cookie name" +msgstr "cookie名称" + +#: searx/templates/oscar/preferences.html:220 +msgid "Value" +msgstr "值" + +#: searx/templates/oscar/results.html:7 +msgid "Search results" +msgstr "搜索结果" + +#: searx/templates/oscar/results.html:105 +msgid "Links" +msgstr "链接" + +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:11 +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/messages/first_time.html:4 +#: searx/templates/oscar/messages/no_results.html:5 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "关闭" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "小心！" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "看起来你是第一次使用searx。" + +#: searx/templates/oscar/messages/js_disabled.html:2 +msgid "Warning!" +msgstr "警告！" + +#: searx/templates/oscar/messages/js_disabled.html:3 +msgid "Please enable JavaScript to use full functionality of this site." +msgstr "请启用JavaScript来使用本网站全部功能。" + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "信息！" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "目前还未保存cookie。" + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "目前没有数据可用。" + +#: searx/templates/oscar/messages/no_results.html:7 +msgid "Sorry!" +msgstr "抱歉！" + +#: searx/templates/oscar/messages/no_results.html:8 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "我们没有找到任何结果。请换用其他词语或在更多类别中搜索。" + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "做得好！" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "设置保存成功。" + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "哦，糟糕！" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "出了些问题。" + +#: searx/templates/oscar/result_templates/default.html:7 +msgid "show media" +msgstr "显示媒体" + +#: searx/templates/oscar/result_templates/default.html:7 +msgid "hide media" +msgstr "隐藏媒体" + +#: searx/templates/oscar/result_templates/images.html:23 +msgid "Get image" +msgstr "获取图片" + +#: searx/templates/oscar/result_templates/images.html:24 +msgid "View source" +msgstr "查看来源" + +#: searx/templates/oscar/result_templates/map.html:7 +msgid "show map" +msgstr "显示地图" + +#: searx/templates/oscar/result_templates/map.html:7 +msgid "hide map" +msgstr "隐藏地图" + +#: searx/templates/oscar/result_templates/map.html:11 +msgid "show details" +msgstr "显示详细信息" + +#: searx/templates/oscar/result_templates/map.html:11 +msgid "hide details" +msgstr "隐藏详细信息" + +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" +msgstr "文件大小" + +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" +msgstr "B" + +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "KB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "MB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "GB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "TB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "文件数" + +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "显示视频" + +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "隐藏视频" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "载入更多..." From 601389b673b1f5c75960570c5ff3322dd41d433c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 8 Sep 2015 21:15:40 +0200 Subject: [PATCH 29/53] [enh] add chinese locale --- searx/settings.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/searx/settings.yml b/searx/settings.yml index ffc3044a5..ffc3502ee 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -319,6 +319,7 @@ locales: nl : Nederlands ja : 日本語 (Japanese) tr : Türkçe - pt: Português + pt : Português ru : Russian ro : Romanian + zh : 中文 (Chinese) From 6bcbd633a591f06d4b60969cec699519f299a4de Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 8 Sep 2015 22:10:41 +0200 Subject: [PATCH 30/53] [fix] remove obsolete youtube engine --- searx/engines/youtube.py | 93 ------------- searx/tests/engines/test_youtube.py | 204 ---------------------------- searx/tests/test_engines.py | 1 - 3 files changed, 298 deletions(-) delete mode 100644 searx/engines/youtube.py delete mode 100644 searx/tests/engines/test_youtube.py diff --git a/searx/engines/youtube.py b/searx/engines/youtube.py deleted file mode 100644 index c77cd2d0e..000000000 --- a/searx/engines/youtube.py +++ /dev/null @@ -1,93 +0,0 @@ -# Youtube (Videos) -# -# @website https://www.youtube.com/ -# @provide-api yes (http://gdata-samples-youtube-search-py.appspot.com/) -# -# @using-api yes -# @results JSON -# @stable yes -# @parse url, title, content, publishedDate, thumbnail, embedded - -from json import loads -from urllib import urlencode -from dateutil import parser - -# engine dependent config -categories = ['videos', 'music'] -paging = True -language_support = True - -# search-url -base_url = 'https://gdata.youtube.com/feeds/api/videos' -search_url = base_url + '?alt=json&{query}&start-index={index}&max-results=5' - -embedded_url = '' - - -# do search-request -def request(query, params): - index = (params['pageno'] - 1) * 5 + 1 - - params['url'] = search_url.format(query=urlencode({'q': query}), - index=index) - - # add language tag if specified - if params['language'] != 'all': - params['url'] += '&lr=' + params['language'].split('_')[0] - - return params - - -# get response from search-request -def response(resp): - results = [] - - search_results = loads(resp.text) - - # return empty array if there are no results - if 'feed' not in search_results: - return [] - - feed = search_results['feed'] - - # parse results - for result in feed['entry']: - url = [x['href'] for x in result['link'] if x['type'] == 'text/html'] - - if not url: - continue - - # remove tracking - url = url[0].replace('feature=youtube_gdata', '') - if url.endswith('&'): - url = url[:-1] - - videoid = url[32:] - - title = result['title']['$t'] - content = '' - thumbnail = '' - - pubdate = result['published']['$t'] - publishedDate = parser.parse(pubdate) - - if 'media$thumbnail' in result['media$group']: - thumbnail = result['media$group']['media$thumbnail'][0]['url'] - - content = result['content']['$t'] - - embedded = embedded_url.format(videoid=videoid) - - # append result - results.append({'url': url, - 'title': title, - 'content': content, - 'template': 'videos.html', - 'publishedDate': publishedDate, - 'embedded': embedded, - 'thumbnail': thumbnail}) - - # return results - return results diff --git a/searx/tests/engines/test_youtube.py b/searx/tests/engines/test_youtube.py deleted file mode 100644 index 434305228..000000000 --- a/searx/tests/engines/test_youtube.py +++ /dev/null @@ -1,204 +0,0 @@ -from collections import defaultdict -import mock -from searx.engines import youtube -from searx.testing import SearxTestCase - - -class TestYoutubeEngine(SearxTestCase): - - def test_request(self): - query = 'test_query' - dicto = defaultdict(dict) - dicto['pageno'] = 0 - dicto['language'] = 'fr_FR' - params = youtube.request(query, dicto) - self.assertTrue('url' in params) - self.assertTrue(query in params['url']) - self.assertTrue('youtube.com' in params['url']) - self.assertTrue('fr' in params['url']) - - dicto['language'] = 'all' - params = youtube.request(query, dicto) - self.assertFalse('fr' in params['url']) - - def test_response(self): - self.assertRaises(AttributeError, youtube.response, None) - self.assertRaises(AttributeError, youtube.response, []) - self.assertRaises(AttributeError, youtube.response, '') - self.assertRaises(AttributeError, youtube.response, '[]') - - response = mock.Mock(text='{}') - self.assertEqual(youtube.response(response), []) - - response = mock.Mock(text='{"data": []}') - self.assertEqual(youtube.response(response), []) - - json = """ - {"feed":{"entry":[{ - "id":{"$t":"http://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM"}, - "published":{"$t":"2015-01-23T21:25:00.000Z"}, - "updated":{"$t":"2015-01-26T14:38:15.000Z"}, - "title":{"$t":"Title", - "type":"text"},"content":{"$t":"Description","type":"text"}, - "link":[{"rel":"alternate","type":"text/html", - "href":"https://www.youtube.com/watch?v=DIVZCPfAOeM&feature=youtube_gdata"}, - {"rel":"http://gdata.youtube.com/schemas/2007#video.related", - "type":"application/atom+xml", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM/related"}, - {"rel":"http://gdata.youtube.com/schemas/2007#mobile","type":"text/html", - "href":"https://m.youtube.com/details?v=DIVZCPfAOeM"}, - {"rel":"self","type":"application/atom+xml", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM"}], - "author":[{"name":{"$t":"Cauet"}, - "uri":{"$t":"https://gdata.youtube.com/feeds/api/users/cauetofficiel"} }], - "gd$comments":{"gd$feedLink":{"rel":"http://gdata.youtube.com/schemas/2007#comments", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM/comments", - "countHint":8} }, - "media$group":{"media$category":[{"$t":"Comedy","label":"Comedy", - "scheme":"http://gdata.youtube.com/schemas/2007/categories.cat"}], - "media$content":[{"url":"https://www.youtube.com/v/DIVZCPfAOeM?version=3&f=videos&app=youtube_gdata", - "type":"application/x-shockwave-flash","medium":"video", - "isDefault":"true","expression":"full","duration":354,"yt$format":5}, - {"url":"rtsp://r1---sn-cg07luel.c.youtube.com/CiILENy73wIaGQnjOcD3CFmFDBMYDSANFEgGUgZ2aWRlb3MM/0/0/0/video.3gp", - "type":"video/3gpp","medium":"video","expression":"full","duration":354, - "yt$format":1}, - {"url":"rtsp://r1---sn-cg07luel.c.youtube.com/CiILENy73wIaGQnjOcD3CFmFDBMYESARFEgGUgZ2aWRlb3MM/0/0/0/video.3gp", - "type":"video/3gpp","medium":"video","expression":"full","duration":354,"yt$format":6}], - "media$description":{"$t":"Desc","type":"plain"}, - "media$keywords":{}, - "media$player":[{"url":"https://www.youtube.com/watch?v=DIVZCPfAOeM&feature=youtube_gdata_player"}], - "media$thumbnail":[{"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/0.jpg", - "height":360,"width":480,"time":"00:02:57"}, - {"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/1.jpg","height":90,"width":120,"time":"00:01:28.500"}, - {"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/2.jpg","height":90,"width":120,"time":"00:02:57"}, - {"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/3.jpg","height":90,"width":120,"time":"00:04:25.500"}], - "media$title":{"$t":"Title","type":"plain"}, - "yt$duration":{"seconds":"354"} }, - "gd$rating":{"average":4.932159,"max":5,"min":1,"numRaters":1533, - "rel":"http://schemas.google.com/g/2005#overall"}, - "yt$statistics":{"favoriteCount":"0","viewCount":"92464"} } - ] - } - } - """ - response = mock.Mock(text=json) - results = youtube.response(response) - self.assertEqual(type(results), list) - self.assertEqual(len(results), 1) - self.assertEqual(results[0]['title'], 'Title') - self.assertEqual(results[0]['url'], 'https://www.youtube.com/watch?v=DIVZCPfAOeM') - self.assertEqual(results[0]['content'], 'Description') - self.assertEqual(results[0]['thumbnail'], 'https://i.ytimg.com/vi/DIVZCPfAOeM/0.jpg') - self.assertTrue('DIVZCPfAOeM' in results[0]['embedded']) - - json = """ - {"feed":{"entry":[{ - "id":{"$t":"http://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM"}, - "published":{"$t":"2015-01-23T21:25:00.000Z"}, - "updated":{"$t":"2015-01-26T14:38:15.000Z"}, - "title":{"$t":"Title", - "type":"text"},"content":{"$t":"Description","type":"text"}, - "link":[{"rel":"http://gdata.youtube.com/schemas/2007#video.related", - "type":"application/atom+xml", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM/related"}, - {"rel":"self","type":"application/atom+xml", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM"}], - "author":[{"name":{"$t":"Cauet"}, - "uri":{"$t":"https://gdata.youtube.com/feeds/api/users/cauetofficiel"} }], - "gd$comments":{"gd$feedLink":{"rel":"http://gdata.youtube.com/schemas/2007#comments", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM/comments", - "countHint":8} }, - "media$group":{"media$category":[{"$t":"Comedy","label":"Comedy", - "scheme":"http://gdata.youtube.com/schemas/2007/categories.cat"}], - "media$content":[{"url":"https://www.youtube.com/v/DIVZCPfAOeM?version=3&f=videos&app=youtube_gdata", - "type":"application/x-shockwave-flash","medium":"video", - "isDefault":"true","expression":"full","duration":354,"yt$format":5}, - {"url":"rtsp://r1---sn-cg07luel.c.youtube.com/CiILENy73wIaGQnjOcD3CFmFDBMYDSANFEgGUgZ2aWRlb3MM/0/0/0/video.3gp", - "type":"video/3gpp","medium":"video","expression":"full","duration":354, - "yt$format":1}, - {"url":"rtsp://r1---sn-cg07luel.c.youtube.com/CiILENy73wIaGQnjOcD3CFmFDBMYESARFEgGUgZ2aWRlb3MM/0/0/0/video.3gp", - "type":"video/3gpp","medium":"video","expression":"full","duration":354,"yt$format":6}], - "media$description":{"$t":"Desc","type":"plain"}, - "media$keywords":{}, - "media$player":[{"url":"https://www.youtube.com/watch?v=DIVZCPfAOeM&feature=youtube_gdata_player"}], - "media$thumbnail":[{"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/0.jpg", - "height":360,"width":480,"time":"00:02:57"}, - {"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/1.jpg","height":90,"width":120,"time":"00:01:28.500"}, - {"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/2.jpg","height":90,"width":120,"time":"00:02:57"}, - {"url":"https://i.ytimg.com/vi/DIVZCPfAOeM/3.jpg","height":90,"width":120,"time":"00:04:25.500"}], - "media$title":{"$t":"Title","type":"plain"}, - "yt$duration":{"seconds":"354"} }, - "gd$rating":{"average":4.932159,"max":5,"min":1,"numRaters":1533, - "rel":"http://schemas.google.com/g/2005#overall"}, - "yt$statistics":{"favoriteCount":"0","viewCount":"92464"} } - ] - } - } - """ - response = mock.Mock(text=json) - results = youtube.response(response) - self.assertEqual(type(results), list) - self.assertEqual(len(results), 0) - - json = """ - {"feed":{"entry":[{ - "id":{"$t":"http://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM"}, - "published":{"$t":"2015-01-23T21:25:00.000Z"}, - "updated":{"$t":"2015-01-26T14:38:15.000Z"}, - "title":{"$t":"Title", - "type":"text"},"content":{"$t":"Description","type":"text"}, - "link":[{"rel":"alternate","type":"text/html", - "href":"https://www.youtube.com/watch?v=DIVZCPfAOeM"}, - {"rel":"http://gdata.youtube.com/schemas/2007#video.related", - "type":"application/atom+xml", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM/related"}, - {"rel":"http://gdata.youtube.com/schemas/2007#mobile","type":"text/html", - "href":"https://m.youtube.com/details?v=DIVZCPfAOeM"}, - {"rel":"self","type":"application/atom+xml", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM"}], - "author":[{"name":{"$t":"Cauet"}, - "uri":{"$t":"https://gdata.youtube.com/feeds/api/users/cauetofficiel"} }], - "gd$comments":{"gd$feedLink":{"rel":"http://gdata.youtube.com/schemas/2007#comments", - "href":"https://gdata.youtube.com/feeds/api/videos/DIVZCPfAOeM/comments", - "countHint":8} }, - "media$group":{"media$category":[{"$t":"Comedy","label":"Comedy", - "scheme":"http://gdata.youtube.com/schemas/2007/categories.cat"}], - "media$content":[{"url":"https://www.youtube.com/v/DIVZCPfAOeM?version=3&f=videos&app=youtube_gdata", - "type":"application/x-shockwave-flash","medium":"video", - "isDefault":"true","expression":"full","duration":354,"yt$format":5}, - {"url":"rtsp://r1---sn-cg07luel.c.youtube.com/CiILENy73wIaGQnjOcD3CFmFDBMYDSANFEgGUgZ2aWRlb3MM/0/0/0/video.3gp", - "type":"video/3gpp","medium":"video","expression":"full","duration":354, - "yt$format":1}, - {"url":"rtsp://r1---sn-cg07luel.c.youtube.com/CiILENy73wIaGQnjOcD3CFmFDBMYESARFEgGUgZ2aWRlb3MM/0/0/0/video.3gp", - "type":"video/3gpp","medium":"video","expression":"full","duration":354,"yt$format":6}], - "media$description":{"$t":"Desc","type":"plain"}, - "media$keywords":{}, - "media$player":[{"url":"https://www.youtube.com/watch?v=DIVZCPfAOeM&feature=youtube_gdata_player"}], - "media$title":{"$t":"Title","type":"plain"}, - "yt$duration":{"seconds":"354"} }, - "gd$rating":{"average":4.932159,"max":5,"min":1,"numRaters":1533, - "rel":"http://schemas.google.com/g/2005#overall"}, - "yt$statistics":{"favoriteCount":"0","viewCount":"92464"} } - ] - } - } - """ - response = mock.Mock(text=json) - results = youtube.response(response) - self.assertEqual(type(results), list) - self.assertEqual(len(results), 1) - self.assertEqual(results[0]['title'], 'Title') - self.assertEqual(results[0]['url'], 'https://www.youtube.com/watch?v=DIVZCPfAOeM') - self.assertEqual(results[0]['content'], 'Description') - self.assertEqual(results[0]['thumbnail'], '') - self.assertTrue('DIVZCPfAOeM' in results[0]['embedded']) - - json = """ - {"toto":{"entry":[] - } - } - """ - response = mock.Mock(text=json) - results = youtube.response(response) - self.assertEqual(type(results), list) - self.assertEqual(len(results), 0) diff --git a/searx/tests/test_engines.py b/searx/tests/test_engines.py index dc062e95f..793b77460 100644 --- a/searx/tests/test_engines.py +++ b/searx/tests/test_engines.py @@ -40,7 +40,6 @@ from searx.tests.engines.test_www1x import * # noqa from searx.tests.engines.test_www500px import * # noqa from searx.tests.engines.test_yacy import * # noqa from searx.tests.engines.test_yahoo import * # noqa -from searx.tests.engines.test_youtube import * # noqa from searx.tests.engines.test_youtube_api import * # noqa from searx.tests.engines.test_youtube_noapi import * # noqa from searx.tests.engines.test_yahoo_news import * # noqa From d45e6022f602b284bee46a03718478255d07803d Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 8 Sep 2015 22:11:22 +0200 Subject: [PATCH 31/53] [doc] @ldidry, @haasn, @underr, @beniz added --- AUTHORS.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index ea9a5eaa7..3e719feea 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -34,3 +34,7 @@ generally made searx better: - @opi - @dimqua - Giorgos Logiotatidis +- Luc Didry +- Niklas Haas +- @underr +- Emmanuel Benazera From 23dab175b2b0742de30129a45488b5c8162ff5c6 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 8 Sep 2015 22:13:09 +0200 Subject: [PATCH 32/53] [enh] v0.8.0 --- CHANGELOG.rst | 46 ++++++++++++++++++++++++++++++++++++++++++++++ searx/version.py | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f9ab188b2..f2c192d25 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,49 @@ +0.8.0 2015.09.08 +================ + +- New engines + + - Blekko (image) + - Gigablast (general) + - Spotify (music) + - Swisscows (general, images) + - Qwant (general, images, news, social media) +- Plugin system +- New plugins + + - HTTPS rewrite + - Search on cagetory select + - User information + - Tracker url part remover +- Multiple outgoing IP and HTTP/HTTPS proxy support +- New autocompleter: startpage +- New theme: pix-art +- Settings file structure change +- Fabfile, docker deployment +- Optional safesearch result filter +- Force HTTPS in engines if possible +- Disabled HTTP referrer on outgoing links +- Display cookie information +- Prettier search URLs +- Right-to-left text handling in themes +- Translation updates (New locales: Chinese, Hebrew, Portuguese, Romanian) + + +New dependencies +~~~~~~~~~~~~~~~~ + +- pyopenssl +- ndg-httpsclient +- pyasn1 +- pyasn1-modules +- certifi + + +News +~~~~ + +@dalf joined the maintainer "team" + 0.7.0 2015.02.03 ================ diff --git a/searx/version.py b/searx/version.py index 27c85e206..ccf73ba19 100644 --- 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 = 7 +VERSION_MINOR = 8 VERSION_BUILD = 0 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR, From e3df22b1401742ae0ade324ce4403f2b2b45dfe1 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 11 Sep 2015 17:57:09 +0200 Subject: [PATCH 33/53] [fix] handle missing url scheme - fixes #428 --- searx/engines/gigablast.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/searx/engines/gigablast.py b/searx/engines/gigablast.py index b852de9ba..04513cc98 100644 --- a/searx/engines/gigablast.py +++ b/searx/engines/gigablast.py @@ -53,6 +53,8 @@ def response(resp): # parse results for result in dom.xpath(results_xpath): url = result.xpath(url_xpath)[0].text + if not url.startswith('http://') and not url.startswith('https://'): + url = 'http://' + url title = result.xpath(title_xpath)[0].text content = escape(result.xpath(content_xpath)[0].text) From 37c3ace3096d9568f8dbdc3728659f4c77377b33 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 11 Sep 2015 18:33:06 +0200 Subject: [PATCH 34/53] [fix] add missing scheme to duplicated results too ++ revert gigablasts handling --- searx/engines/gigablast.py | 2 -- searx/search.py | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/searx/engines/gigablast.py b/searx/engines/gigablast.py index 04513cc98..b852de9ba 100644 --- a/searx/engines/gigablast.py +++ b/searx/engines/gigablast.py @@ -53,8 +53,6 @@ def response(resp): # parse results for result in dom.xpath(results_xpath): url = result.xpath(url_xpath)[0].text - if not url.startswith('http://') and not url.startswith('https://'): - url = 'http://' + url title = result.xpath(title_xpath)[0].text content = escape(result.xpath(content_xpath)[0].text) diff --git a/searx/search.py b/searx/search.py index 899171242..f2b5235b8 100644 --- a/searx/search.py +++ b/searx/search.py @@ -143,6 +143,10 @@ def score_results(results): res['parsed_url'] = urlparse(res['url']) + # if the result has no scheme, use http as default + if not res['parsed_url'].scheme: + res['parsed_url'] = res['parsed_url']._replace(scheme="http") + res['host'] = res['parsed_url'].netloc if res['host'].startswith('www.'): @@ -206,9 +210,6 @@ def score_results(results): # if there is no duplicate found, append result else: res['score'] = score - # if the result has no scheme, use http as default - if res['parsed_url'].scheme == '': - res['parsed_url'] = res['parsed_url']._replace(scheme="http") results.append(res) From a75d10206e588ccc1bae85ac579809e8a377d4ec Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Thu, 17 Sep 2015 18:18:48 +0200 Subject: [PATCH 35/53] Correct the loop through search engines Fix #432 --- searx/templates/pix-art/preferences.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/searx/templates/pix-art/preferences.html b/searx/templates/pix-art/preferences.html index 0caf31b46..f59497ec8 100644 --- a/searx/templates/pix-art/preferences.html +++ b/searx/templates/pix-art/preferences.html @@ -53,8 +53,8 @@ {{ _('Engine name') }} {{ _('Allow') }} / {{ _('Block') }} - {% for (categ,search_engines) in categs %} - {% for search_engine in search_engines %} + {% for categ in all_categories %} + {% for search_engine in engines_by_category[categ] %} {% if not search_engine.private %} From 0ad272c5cb81a9c69008aa86a1f29cd642ddf4ff Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 30 Sep 2015 16:42:03 +0200 Subject: [PATCH 36/53] [fix] content escaping - closes #441 TODO check other engines too --- searx/engines/google.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/searx/engines/google.py b/searx/engines/google.py index 0e78a9e2c..c8299d04b 100644 --- a/searx/engines/google.py +++ b/searx/engines/google.py @@ -9,6 +9,7 @@ # @parse url, title, content, suggestion import re +from cgi import escape from urllib import urlencode from urlparse import urlparse, parse_qsl from lxml import html @@ -167,7 +168,7 @@ def parse_url(url_string, google_hostname): def extract_text_from_dom(result, xpath): r = result.xpath(xpath) if len(r) > 0: - return extract_text(r[0]) + return escape(extract_text(r[0])) return None @@ -273,7 +274,7 @@ def response(resp): # parse suggestion for suggestion in dom.xpath(suggestion_xpath): # append suggestion - results.append({'suggestion': extract_text(suggestion)}) + results.append({'suggestion': escape(extract_text(suggestion))}) # return results return results From b6c3cb0bdd020a459d0ef5c21d1303ed0148cc0c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sat, 3 Oct 2015 17:26:07 +0200 Subject: [PATCH 37/53] [enh][mod] result handling refactor Several changes has been made: - Parallel result merge - Scoring algorithm slightly changed (see result_score()) - Proper Thread locking on global data manipulation --- searx/results.py | 239 +++++++++++++++++++++++++++++++ searx/search.py | 273 +++--------------------------------- searx/tests/test_results.py | 41 ++++++ searx/tests/test_search.py | 23 +-- searx/tests/test_webapp.py | 8 +- searx/webapp.py | 29 ++-- 6 files changed, 321 insertions(+), 292 deletions(-) create mode 100644 searx/results.py create mode 100644 searx/tests/test_results.py diff --git a/searx/results.py b/searx/results.py new file mode 100644 index 000000000..2837f6998 --- /dev/null +++ b/searx/results.py @@ -0,0 +1,239 @@ +import re +from collections import defaultdict +from operator import itemgetter +from threading import RLock +from urlparse import urlparse, unquote +from searx.engines import engines + +CONTENT_LEN_IGNORED_CHARS_REGEX = re.compile('[,;:!?\./\\\\ ()-_]', re.M | re.U) +WHITESPACE_REGEX = re.compile('( |\t|\n)+', re.M | re.U) + + +# return the meaningful length of the content for a result +def result_content_len(content): + if isinstance(content, basestring): + return len(CONTENT_LEN_IGNORED_CHARS_REGEX.sub('', content)) + else: + return 0 + + +def compare_urls(url_a, url_b): + if url_a.netloc != url_b.netloc or url_a.query != url_b.query: + return False + + # remove / from the end of the url if required + path_a = url_a.path[:-1]\ + if url_a.path.endswith('/')\ + else url_a.path + path_b = url_b.path[:-1]\ + if url_b.path.endswith('/')\ + else url_b.path + + return unquote(path_a) == unquote(path_b) + + +def merge_two_infoboxes(infobox1, infobox2): + if 'urls' in infobox2: + urls1 = infobox1.get('urls', None) + if urls1 is None: + urls1 = [] + infobox1.set('urls', urls1) + + urlSet = set() + for url in infobox1.get('urls', []): + urlSet.add(url.get('url', None)) + + for url in infobox2.get('urls', []): + if url.get('url', None) not in urlSet: + urls1.append(url) + + if 'attributes' in infobox2: + attributes1 = infobox1.get('attributes', None) + if attributes1 is None: + attributes1 = [] + infobox1.set('attributes', attributes1) + + attributeSet = set() + for attribute in infobox1.get('attributes', []): + if attribute.get('label', None) not in attributeSet: + attributeSet.add(attribute.get('label', None)) + + for attribute in infobox2.get('attributes', []): + attributes1.append(attribute) + + if 'content' in infobox2: + content1 = infobox1.get('content', None) + content2 = infobox2.get('content', '') + if content1 is not None: + if result_content_len(content2) > result_content_len(content1): + infobox1['content'] = content2 + else: + infobox1.set('content', content2) + + +def result_score(result): + weight = 1.0 + + for result_engine in result['engines']: + if hasattr(engines[result_engine], 'weight'): + weight *= float(engines[result_engine].weight) + + occurences = len(result['positions']) + + return sum((occurences * weight) / position for position in result['positions']) + + +class ResultContainer(object): + """docstring for ResultContainer""" + def __init__(self): + super(ResultContainer, self).__init__() + self.results = defaultdict(list) + self._merged_results = [] + self.infoboxes = [] + self._infobox_ids = {} + self.suggestions = set() + self.answers = set() + + def extend(self, engine_name, results): + for result in list(results): + if 'suggestion' in result: + self.suggestions.add(result['suggestion']) + results.remove(result) + elif 'answer' in result: + self.answers.add(result['suggestion']) + results.remve(result) + elif 'infobox' in result: + self._merge_infobox(result) + results.remove(result) + + with RLock(): + engines[engine_name].stats['search_count'] += 1 + engines[engine_name].stats['result_count'] += len(results) + + if not results: + return + + self.results[engine_name].extend(results) + + for i, result in enumerate(results): + position = i + 1 + self._merge_result(result, position) + + def _merge_infobox(self, infobox): + add_infobox = True + infobox_id = infobox.get('id', None) + if infobox_id is not None: + existingIndex = self._infobox_ids.get(infobox_id, None) + if existingIndex is not None: + merge_two_infoboxes(self.infoboxes[existingIndex], infobox) + add_infobox = False + + if add_infobox: + self.infoboxes.append(infobox) + self._infobox_ids[infobox_id] = len(self.infoboxes) - 1 + + def _merge_result(self, result, position): + result['parsed_url'] = urlparse(result['url']) + + # if the result has no scheme, use http as default + if not result['parsed_url'].scheme: + result['parsed_url'] = result['parsed_url']._replace(scheme="http") + + result['host'] = result['parsed_url'].netloc + + if result['host'].startswith('www.'): + result['host'] = result['host'].replace('www.', '', 1) + + result['engines'] = [result['engine']] + + # strip multiple spaces and cariage returns from content + if result.get('content'): + result['content'] = WHITESPACE_REGEX.sub(' ', result['content']) + + # check for duplicates + duplicated = False + for merged_result in self._merged_results: + if compare_urls(result['parsed_url'], merged_result['parsed_url'])\ + and result.get('template') == merged_result.get('template'): + duplicated = merged_result + break + + # merge duplicates together + if duplicated: + # using content with more text + if result_content_len(result.get('content', '')) >\ + result_content_len(duplicated.get('content', '')): + duplicated['content'] = result['content'] + + # add the new position + duplicated['positions'].append(position) + + # add engine to list of result-engines + duplicated['engines'].append(result['engine']) + + # using https if possible + if duplicated['parsed_url'].scheme != 'https' and result['parsed_url'].scheme == 'https': + duplicated['url'] = result['parsed_url'].geturl() + duplicated['parsed_url'] = result['parsed_url'] + + # if there is no duplicate found, append result + else: + result['positions'] = [position] + with RLock(): + self._merged_results.append(result) + + def get_ordered_results(self): + for result in self._merged_results: + score = result_score(result) + result['score'] = score + with RLock(): + for result_engine in result['engines']: + engines[result_engine].stats['score_count'] += score + + results = sorted(self._merged_results, key=itemgetter('score'), reverse=True) + + # pass 2 : group results by category and template + gresults = [] + categoryPositions = {} + + for i, res in enumerate(results): + # FIXME : handle more than one category per engine + category = engines[res['engine']].categories[0] + ':' + ''\ + if 'template' not in res\ + else res['template'] + + current = None if category not in categoryPositions\ + else categoryPositions[category] + + # group with previous results using the same category + # if the group can accept more result and is not too far + # from the current position + if current is not None and (current['count'] > 0)\ + and (len(gresults) - current['index'] < 20): + # group with the previous results using + # the same category with this one + index = current['index'] + gresults.insert(index, res) + + # update every index after the current one + # (including the current one) + for k in categoryPositions: + v = categoryPositions[k]['index'] + if v >= index: + categoryPositions[k]['index'] = v + 1 + + # update this category + current['count'] -= 1 + + else: + # same category + gresults.append(res) + + # update categoryIndex + categoryPositions[category] = {'index': len(gresults), 'count': 8} + + # return gresults + return gresults + + def results_length(self): + return len(self._merged_results) diff --git a/searx/search.py b/searx/search.py index f2b5235b8..02676a149 100644 --- a/searx/search.py +++ b/searx/search.py @@ -16,13 +16,8 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. ''' import threading -import re import searx.poolrequests as requests_lib -from itertools import izip_longest, chain -from operator import itemgetter -from Queue import Queue from time import time -from urlparse import urlparse, unquote from searx import settings from searx.engines import ( categories, engines @@ -30,6 +25,7 @@ from searx.engines import ( from searx.languages import language_codes from searx.utils import gen_useragent, get_blocked_engines from searx.query import Query +from searx.results import ResultContainer from searx import logger logger = logger.getChild('search') @@ -42,7 +38,8 @@ def search_request_wrapper(fn, url, engine_name, **kwargs): return fn(url, **kwargs) except: # increase errors stats - engines[engine_name].stats['errors'] += 1 + with threading.RLock(): + engines[engine_name].stats['errors'] += 1 # print engine name and specific error message logger.exception('engine crash: {0}'.format(engine_name)) @@ -84,7 +81,7 @@ def default_request_params(): # create a callback wrapper for the search engine results -def make_callback(engine_name, results_queue, callback, params): +def make_callback(engine_name, callback, params, result_container): # creating a callback wrapper for the search engine results def process_callback(response, **kwargs): @@ -96,12 +93,17 @@ def make_callback(engine_name, results_queue, callback, params): response.search_params = params - timeout_overhead = 0.2 # seconds search_duration = time() - params['started'] + # update stats with current page-load-time + with threading.RLock(): + engines[engine_name].stats['page_load_time'] += search_duration + + timeout_overhead = 0.2 # seconds timeout_limit = engines[engine_name].timeout + timeout_overhead + if search_duration > timeout_limit: - engines[engine_name].stats['page_load_time'] += timeout_limit - engines[engine_name].stats['errors'] += 1 + with threading.RLock(): + engines[engine_name].stats['errors'] += 1 return # callback @@ -111,212 +113,11 @@ def make_callback(engine_name, results_queue, callback, params): for result in search_results: result['engine'] = engine_name - results_queue.put_nowait((engine_name, search_results)) - - # update stats with current page-load-time - engines[engine_name].stats['page_load_time'] += search_duration + result_container.extend(engine_name, search_results) return process_callback -# return the meaningful length of the content for a result -def content_result_len(content): - if isinstance(content, basestring): - content = re.sub('[,;:!?\./\\\\ ()-_]', '', content) - return len(content) - else: - return 0 - - -# score results and remove duplications -def score_results(results): - # calculate scoring parameters - flat_res = filter( - None, chain.from_iterable(izip_longest(*results.values()))) - flat_len = len(flat_res) - engines_len = len(results) - - results = [] - - # pass 1: deduplication + scoring - for i, res in enumerate(flat_res): - - res['parsed_url'] = urlparse(res['url']) - - # if the result has no scheme, use http as default - if not res['parsed_url'].scheme: - res['parsed_url'] = res['parsed_url']._replace(scheme="http") - - res['host'] = res['parsed_url'].netloc - - if res['host'].startswith('www.'): - res['host'] = res['host'].replace('www.', '', 1) - - res['engines'] = [res['engine']] - - weight = 1.0 - - # strip multiple spaces and cariage returns from content - if res.get('content'): - res['content'] = re.sub(' +', ' ', - res['content'].strip().replace('\n', '')) - - # get weight of this engine if possible - if hasattr(engines[res['engine']], 'weight'): - weight = float(engines[res['engine']].weight) - - # calculate score for that engine - score = int((flat_len - i) / engines_len) * weight + 1 - - # check for duplicates - duplicated = False - for new_res in results: - # remove / from the end of the url if required - p1 = res['parsed_url'].path[:-1]\ - if res['parsed_url'].path.endswith('/')\ - else res['parsed_url'].path - p2 = new_res['parsed_url'].path[:-1]\ - if new_res['parsed_url'].path.endswith('/')\ - else new_res['parsed_url'].path - - # check if that result is a duplicate - if res['host'] == new_res['host'] and\ - unquote(p1) == unquote(p2) and\ - res['parsed_url'].query == new_res['parsed_url'].query and\ - res.get('template') == new_res.get('template'): - duplicated = new_res - break - - # merge duplicates together - if duplicated: - # using content with more text - if content_result_len(res.get('content', '')) >\ - content_result_len(duplicated.get('content', '')): - duplicated['content'] = res['content'] - - # increase result-score - duplicated['score'] += score - - # add engine to list of result-engines - duplicated['engines'].append(res['engine']) - - # using https if possible - if duplicated['parsed_url'].scheme == 'https': - continue - elif res['parsed_url'].scheme == 'https': - duplicated['url'] = res['parsed_url'].geturl() - duplicated['parsed_url'] = res['parsed_url'] - - # if there is no duplicate found, append result - else: - res['score'] = score - - results.append(res) - - results = sorted(results, key=itemgetter('score'), reverse=True) - - # pass 2 : group results by category and template - gresults = [] - categoryPositions = {} - - for i, res in enumerate(results): - # FIXME : handle more than one category per engine - category = engines[res['engine']].categories[0] + ':' + ''\ - if 'template' not in res\ - else res['template'] - - current = None if category not in categoryPositions\ - else categoryPositions[category] - - # group with previous results using the same category - # if the group can accept more result and is not too far - # from the current position - if current is not None and (current['count'] > 0)\ - and (len(gresults) - current['index'] < 20): - # group with the previous results using - # the same category with this one - index = current['index'] - gresults.insert(index, res) - - # update every index after the current one - # (including the current one) - for k in categoryPositions: - v = categoryPositions[k]['index'] - if v >= index: - categoryPositions[k]['index'] = v + 1 - - # update this category - current['count'] -= 1 - - else: - # same category - gresults.append(res) - - # update categoryIndex - categoryPositions[category] = {'index': len(gresults), 'count': 8} - - # return gresults - return gresults - - -def merge_two_infoboxes(infobox1, infobox2): - if 'urls' in infobox2: - urls1 = infobox1.get('urls', None) - if urls1 is None: - urls1 = [] - infobox1.set('urls', urls1) - - urlSet = set() - for url in infobox1.get('urls', []): - urlSet.add(url.get('url', None)) - - for url in infobox2.get('urls', []): - if url.get('url', None) not in urlSet: - urls1.append(url) - - if 'attributes' in infobox2: - attributes1 = infobox1.get('attributes', None) - if attributes1 is None: - attributes1 = [] - infobox1.set('attributes', attributes1) - - attributeSet = set() - for attribute in infobox1.get('attributes', []): - if attribute.get('label', None) not in attributeSet: - attributeSet.add(attribute.get('label', None)) - - for attribute in infobox2.get('attributes', []): - attributes1.append(attribute) - - if 'content' in infobox2: - content1 = infobox1.get('content', None) - content2 = infobox2.get('content', '') - if content1 is not None: - if content_result_len(content2) > content_result_len(content1): - infobox1['content'] = content2 - else: - infobox1.set('content', content2) - - -def merge_infoboxes(infoboxes): - results = [] - infoboxes_id = {} - for infobox in infoboxes: - add_infobox = True - infobox_id = infobox.get('id', None) - if infobox_id is not None: - existingIndex = infoboxes_id.get(infobox_id, None) - if existingIndex is not None: - merge_two_infoboxes(results[existingIndex], infobox) - add_infobox = False - - if add_infobox: - results.append(infobox) - infoboxes_id[infobox_id] = len(results) - 1 - - return results - - class Search(object): """Search information container""" @@ -334,10 +135,7 @@ class Search(object): # set blocked engines self.blocked_engines = get_blocked_engines(engines, request.cookies) - self.results = [] - self.suggestions = set() - self.answers = set() - self.infoboxes = [] + self.result_container = ResultContainer() self.request_data = {} # set specific language if set @@ -449,8 +247,6 @@ class Search(object): # init vars requests = [] - results_queue = Queue() - results = {} # increase number of searches number_of_searches += 1 @@ -504,9 +300,9 @@ class Search(object): # create a callback wrapper for the search engine results callback = make_callback( selected_engine['name'], - results_queue, engine.response, - request_params) + request_params, + self.result_container) # create dictionary which contain all # informations about the request @@ -539,42 +335,5 @@ class Search(object): # send all search-request threaded_requests(requests) - while not results_queue.empty(): - engine_name, engine_results = results_queue.get_nowait() - - # TODO type checks - [self.suggestions.add(x['suggestion']) - for x in list(engine_results) - if 'suggestion' in x - and engine_results.remove(x) is None] - - [self.answers.add(x['answer']) - for x in list(engine_results) - if 'answer' in x - and engine_results.remove(x) is None] - - self.infoboxes.extend(x for x in list(engine_results) - if 'infobox' in x - and engine_results.remove(x) is None) - - results[engine_name] = engine_results - - # update engine-specific stats - for engine_name, engine_results in results.items(): - engines[engine_name].stats['search_count'] += 1 - engines[engine_name].stats['result_count'] += len(engine_results) - - # score results and remove duplications - self.results = score_results(results) - - # merge infoboxes according to their ids - self.infoboxes = merge_infoboxes(self.infoboxes) - - # update engine stats, using calculated score - for result in self.results: - for res_engine in result['engines']: - engines[result['engine']]\ - .stats['score_count'] += result['score'] - # return results, suggestions, answers and infoboxes return self diff --git a/searx/tests/test_results.py b/searx/tests/test_results.py new file mode 100644 index 000000000..274b5b37a --- /dev/null +++ b/searx/tests/test_results.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- + +from searx.results import ResultContainer +from searx.testing import SearxTestCase + + +def fake_result(url='https://aa.bb/cc?dd=ee#ff', + title='aaa', + content='bbb', + engine='wikipedia', **kwargs): + result = {'url': url, + 'title': title, + 'content': content, + 'engine': engine} + result.update(kwargs) + return result + + +# TODO +class ResultContainerTestCase(SearxTestCase): + + def test_empty(self): + c = ResultContainer() + self.assertEqual(c.get_ordered_results(), []) + + def test_one_result(self): + c = ResultContainer() + c.extend('wikipedia', [fake_result()]) + self.assertEqual(c.results_length(), 1) + + def test_one_suggestion(self): + c = ResultContainer() + c.extend('wikipedia', [fake_result(suggestion=True)]) + self.assertEqual(len(c.suggestions), 1) + self.assertEqual(c.results_length(), 0) + + def test_result_merge(self): + c = ResultContainer() + c.extend('wikipedia', [fake_result()]) + c.extend('wikidata', [fake_result(), fake_result(url='https://example.com/')]) + self.assertEqual(c.results_length(), 2) diff --git a/searx/tests/test_search.py b/searx/tests/test_search.py index 89d0b620d..af5fffd8b 100644 --- a/searx/tests/test_search.py +++ b/searx/tests/test_search.py @@ -1,25 +1,10 @@ # -*- coding: utf-8 -*- -from searx.search import score_results from searx.testing import SearxTestCase -def fake_result(url='https://aa.bb/cc?dd=ee#ff', - title='aaa', - content='bbb', - engine='wikipedia'): - return {'url': url, - 'title': title, - 'content': content, - 'engine': engine} +# TODO +class SearchTestCase(SearxTestCase): - -class ScoreResultsTestCase(SearxTestCase): - - def test_empty(self): - self.assertEqual(score_results(dict()), []) - - def test_urlparse(self): - results = score_results(dict(a=[fake_result(url='https://aa.bb/cc?dd=ee#ff')])) - parsed_url = results[0]['parsed_url'] - self.assertEqual(parsed_url.query, 'dd=ee') + def test_(self): + pass diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py index 471ec2f2d..1d9cc649c 100644 --- a/searx/tests/test_webapp.py +++ b/searx/tests/test_webapp.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import json +from mock import Mock from urlparse import ParseResult from searx import webapp from searx.testing import SearxTestCase @@ -33,7 +34,12 @@ class ViewsTestCase(SearxTestCase): ] def search_mock(search_self, *args): - search_self.results = self.test_results + search_self.result_container = Mock(get_ordered_results=lambda: self.test_results, + answers=set(), + suggestions=set(), + infoboxes=[], + results=self.test_results, + results_length=lambda: len(self.test_results)) webapp.Search.search = search_mock diff --git a/searx/webapp.py b/searx/webapp.py index 7f1621a6a..07750456d 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -383,7 +383,7 @@ def index(): plugins.call('post_search', request, locals()) - for result in search.results: + for result in search.result_container.get_ordered_results(): plugins.call('on_result', request, locals()) if not search.paging and engines[result['engine']].paging: @@ -411,7 +411,7 @@ def index(): minutes = int((timedifference.seconds / 60) % 60) hours = int(timedifference.seconds / 60 / 60) if hours == 0: - result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes) # noqa + result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes) else: result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes) # noqa else: @@ -419,17 +419,16 @@ def index(): if search.request_data.get('format') == 'json': return Response(json.dumps({'query': search.query, - 'results': search.results}), + 'results': search.result_container.get_ordered_results()}), mimetype='application/json') elif search.request_data.get('format') == 'csv': csv = UnicodeWriter(cStringIO.StringIO()) keys = ('title', 'url', 'content', 'host', 'engine', 'score') - if search.results: - csv.writerow(keys) - for row in search.results: - row['host'] = row['parsed_url'].netloc - csv.writerow([row.get(key, '') for key in keys]) - csv.stream.seek(0) + csv.writerow(keys) + for row in search.result_container.get_ordered_results(): + row['host'] = row['parsed_url'].netloc + csv.writerow([row.get(key, '') for key in keys]) + csv.stream.seek(0) response = Response(csv.stream.read(), mimetype='application/csv') cont_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search.query) response.headers.add('Content-Disposition', cont_disp) @@ -437,24 +436,24 @@ def index(): elif search.request_data.get('format') == 'rss': response_rss = render( 'opensearch_response_rss.xml', - results=search.results, + results=search.result_container.get_ordered_results(), q=search.request_data['q'], - number_of_results=len(search.results), + number_of_results=search.result_container.results_length(), base_url=get_base_url() ) return Response(response_rss, mimetype='text/xml') return render( 'results.html', - results=search.results, + results=search.result_container.get_ordered_results(), q=search.request_data['q'], selected_categories=search.categories, paging=search.paging, pageno=search.pageno, base_url=get_base_url(), - suggestions=search.suggestions, - answers=search.answers, - infoboxes=search.infoboxes, + suggestions=search.result_container.suggestions, + answers=search.result_container.answers, + infoboxes=search.result_container.infoboxes, theme=get_current_theme_name(), favicons=global_favicons[themes.index(get_current_theme_name())] ) From 5eabba2da17c7cf1b6c0704d3ecd7476bdd989b7 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sat, 3 Oct 2015 17:46:12 +0200 Subject: [PATCH 38/53] [mod] list all engines of a result --- searx/static/themes/oscar/css/oscar.min.css | 89 ++++++++++++++++++- .../themes/oscar/less/oscar/results.less | 5 ++ searx/templates/oscar/macros.html | 6 +- 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/searx/static/themes/oscar/css/oscar.min.css b/searx/static/themes/oscar/css/oscar.min.css index 63f8b7638..f7aba2bbc 100644 --- a/searx/static/themes/oscar/css/oscar.min.css +++ b/searx/static/themes/oscar/css/oscar.min.css @@ -1 +1,88 @@ -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}.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:bold}.result-content{margin-top:5px;word-wrap:break-word}.result-content .highlight{font-weight:bold}.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}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories{margin:10px 0;text-transform:capitalize}.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 #f00}.highlight .k{color:#008000;font-weight:bold}.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:#f00}.highlight .gh{color:#000080;font-weight:bold}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:#000080;font-weight:bold}.highlight .gs{font-weight:bold}.highlight .gu{color:#800080;font-weight:bold}.highlight .gt{color:#04d}.highlight .kc{color:#008000;font-weight:bold}.highlight .kd{color:#008000;font-weight:bold}.highlight .kn{color:#008000;font-weight:bold}.highlight .kp{color:#008000}.highlight .kr{color:#008000;font-weight:bold}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:#008000}.highlight .nc{color:#00f;font-weight:bold}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:bold}.highlight .ne{color:#d2413a;font-weight:bold}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00f;font-weight:bold}.highlight .nt{color:#008000;font-weight:bold}.highlight .nv{color:#19177c}.highlight .ow{color:#a2f;font-weight:bold}.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:bold}.highlight .sh{color:#ba2121}.highlight .si{color:#b68;font-weight:bold}.highlight .sx{color:#008000}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:#008000}.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:transparent}.highlight .lineno::-moz-selection{background:transparent} \ 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} +.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:bold} +.result-content{margin-top:5px;word-wrap:break-word}.result-content .highlight{font-weight:bold} +.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} +.infobox .infobox_part:last-child{margin-bottom:0} +.search_categories{margin:10px 0;text-transform:capitalize} +.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 #f00} +.highlight .k{color:#008000;font-weight:bold} +.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:#f00} +.highlight .gh{color:#000080;font-weight:bold} +.highlight .gi{color:#00a000} +.highlight .go{color:#888} +.highlight .gp{color:#000080;font-weight:bold} +.highlight .gs{font-weight:bold} +.highlight .gu{color:#800080;font-weight:bold} +.highlight .gt{color:#04d} +.highlight .kc{color:#008000;font-weight:bold} +.highlight .kd{color:#008000;font-weight:bold} +.highlight .kn{color:#008000;font-weight:bold} +.highlight .kp{color:#008000} +.highlight .kr{color:#008000;font-weight:bold} +.highlight .kt{color:#b00040} +.highlight .m{color:#666} +.highlight .s{color:#ba2121} +.highlight .na{color:#7d9029} +.highlight .nb{color:#008000} +.highlight .nc{color:#00f;font-weight:bold} +.highlight .no{color:#800} +.highlight .nd{color:#a2f} +.highlight .ni{color:#999;font-weight:bold} +.highlight .ne{color:#d2413a;font-weight:bold} +.highlight .nf{color:#00f} +.highlight .nl{color:#a0a000} +.highlight .nn{color:#00f;font-weight:bold} +.highlight .nt{color:#008000;font-weight:bold} +.highlight .nv{color:#19177c} +.highlight .ow{color:#a2f;font-weight:bold} +.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:bold} +.highlight .sh{color:#ba2121} +.highlight .si{color:#b68;font-weight:bold} +.highlight .sx{color:#008000} +.highlight .sr{color:#b68} +.highlight .s1{color:#ba2121} +.highlight .ss{color:#19177c} +.highlight .bp{color:#008000} +.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:transparent;} +.highlight .lineno::-moz-selection{background:transparent;} diff --git a/searx/static/themes/oscar/less/oscar/results.less b/searx/static/themes/oscar/less/oscar/results.less index 6ca4b4f8b..b3d87001c 100644 --- a/searx/static/themes/oscar/less/oscar/results.less +++ b/searx/static/themes/oscar/less/oscar/results.less @@ -76,3 +76,8 @@ margin-top: 30px; padding-bottom: 50px; } + +.label-default { + color: #AAA; + background: #FFF; +} diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 5866c132c..cf49ce81a 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -25,7 +25,11 @@ {% macro result_footer(result) -%}
- {{ result.engine }} +
+ {% for engine in result.engines %} + {{ engine }} + {% endfor %} +

{{ result.pretty_url }}

{%- endmacro %} From 66a70c6ae4ebddc5b1d9b4e4414d66239781617c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sat, 3 Oct 2015 19:16:26 +0200 Subject: [PATCH 39/53] [fix] typo --- searx/results.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/results.py b/searx/results.py index 2837f6998..2fbb6d6c7 100644 --- a/searx/results.py +++ b/searx/results.py @@ -101,7 +101,7 @@ class ResultContainer(object): results.remove(result) elif 'answer' in result: self.answers.add(result['suggestion']) - results.remve(result) + results.remove(result) elif 'infobox' in result: self._merge_infobox(result) results.remove(result) From 7aa9f4885a3ecb6d65af6375188c4a7ea8f7714d Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 16 Oct 2015 11:53:52 +0200 Subject: [PATCH 40/53] [fix] unicode decoding --- searx/engines/bing_news.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/engines/bing_news.py b/searx/engines/bing_news.py index 943bf882e..a2397c48e 100644 --- a/searx/engines/bing_news.py +++ b/searx/engines/bing_news.py @@ -68,7 +68,7 @@ def request(query, params): def response(resp): results = [] - rss = etree.fromstring(resp.text) + rss = etree.fromstring(resp.content) ns = rss.nsmap From 5da78f7b37b60a6e100e245de99a0ba45be49f01 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 16 Oct 2015 12:01:35 +0200 Subject: [PATCH 41/53] [fix] bing news test mock --- searx/tests/engines/test_bing_news.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/searx/tests/engines/test_bing_news.py b/searx/tests/engines/test_bing_news.py index c6c402650..a64d59b7b 100644 --- a/searx/tests/engines/test_bing_news.py +++ b/searx/tests/engines/test_bing_news.py @@ -28,10 +28,10 @@ class TestBingNewsEngine(SearxTestCase): self.assertRaises(AttributeError, bing_news.response, '') self.assertRaises(AttributeError, bing_news.response, '[]') - response = mock.Mock(text='') + response = mock.Mock(content='') self.assertEqual(bing_news.response(response), []) - response = mock.Mock(text='') + response = mock.Mock(content='') self.assertEqual(bing_news.response(response), []) html = """ @@ -66,7 +66,7 @@ class TestBingNewsEngine(SearxTestCase): """ # noqa - response = mock.Mock(text=html) + response = mock.Mock(content=html) results = bing_news.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 2) @@ -105,7 +105,7 @@ class TestBingNewsEngine(SearxTestCase): """ # noqa - response = mock.Mock(text=html) + response = mock.Mock(content=html) results = bing_news.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) @@ -128,11 +128,11 @@ class TestBingNewsEngine(SearxTestCase): """ # noqa - response = mock.Mock(text=html) + response = mock.Mock(content=html) results = bing_news.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 0) html = """gabarge""" - response = mock.Mock(text=html) + response = mock.Mock(content=html) self.assertRaises(lxml.etree.XMLSyntaxError, bing_news.response, response) From f1ac794a0737c76516cf6c324027f2dd718a67a1 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 16 Oct 2015 12:05:50 +0200 Subject: [PATCH 42/53] [fix] gigablast url params --- searx/engines/gigablast.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/searx/engines/gigablast.py b/searx/engines/gigablast.py index b852de9ba..cfc8e7159 100644 --- a/searx/engines/gigablast.py +++ b/searx/engines/gigablast.py @@ -13,6 +13,8 @@ from urllib import urlencode from cgi import escape from lxml import etree +from random import randint +from time import time # engine dependent config categories = ['general'] @@ -21,7 +23,7 @@ number_of_results = 5 # search-url, invalid HTTPS certificate base_url = 'http://gigablast.com/' -search_string = 'search?{query}&n={number_of_results}&s={offset}&xml=1&qh=0' +search_string = 'search?{query}&n={number_of_results}&s={offset}&xml=1&qh=0&uxid={uxid}&rand={rand}' # specific xpath variables results_xpath = '//response//result' @@ -37,7 +39,9 @@ def request(query, params): search_path = search_string.format( query=urlencode({'q': query}), offset=offset, - number_of_results=number_of_results) + number_of_results=number_of_results, + uxid=randint(10000, 10000000), + rand=int(time())) params['url'] = base_url + search_path From d2fd56612c9ba363732d4ed983967008b4684594 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 21 Oct 2015 10:50:00 +0200 Subject: [PATCH 43/53] [fix] rename after result refactor --- searx/plugins/self_info.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/searx/plugins/self_info.py b/searx/plugins/self_info.py index 5ca994526..dc6b7cd0e 100644 --- a/searx/plugins/self_info.py +++ b/searx/plugins/self_info.py @@ -35,10 +35,10 @@ def post_search(request, ctx): ip = x_forwarded_for[0] else: ip = request.remote_addr - ctx['search'].answers.clear() - ctx['search'].answers.add(ip) + ctx['search'].result_container.answers.clear() + ctx['search'].result_container.answers.add(ip) elif p.match(ctx['search'].query): ua = request.user_agent - ctx['search'].answers.clear() - ctx['search'].answers.add(ua) + ctx['search'].result_container.answers.clear() + ctx['search'].result_container.answers.add(ua) return True From 29dfd9679b11c68384ef5f90d1880780352037e6 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 23 Oct 2015 23:07:36 +0200 Subject: [PATCH 44/53] [fix] use base_url in http redirects - closes #451 --- searx/webapp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index 07750456d..794b7ea8c 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -42,7 +42,7 @@ except: from datetime import datetime, timedelta from urllib import urlencode -from urlparse import urlparse +from urlparse import urlparse, urljoin from werkzeug.contrib.fixers import ProxyFix from flask import ( Flask, request, render_template, url_for, Response, make_response, @@ -531,7 +531,7 @@ def preferences(): blocked_engines = [] - resp = make_response(redirect(url_for('index'))) + resp = make_response(redirect(urljoin(settings['server']['base_url'], url_for('index')))) if request.method == 'GET': blocked_engines = get_blocked_engines(engines, request.cookies) @@ -766,7 +766,7 @@ def favicon(): @app.route('/clear_cookies') def clear_cookies(): - resp = make_response(redirect(url_for('index'))) + resp = make_response(redirect(urljoin(settings['server']['base_url'], url_for('index')))) for cookie_name in request.cookies: resp.delete_cookie(cookie_name) return resp From a959977ab445bca91059d98bf8ca822fffc51fdf Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 23 Oct 2015 23:31:53 +0200 Subject: [PATCH 45/53] [fix] tests fix after result refactor --- searx/tests/test_plugins.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/searx/tests/test_plugins.py b/searx/tests/test_plugins.py index c5171127c..98d39ec14 100644 --- a/searx/tests/test_plugins.py +++ b/searx/tests/test_plugins.py @@ -5,6 +5,12 @@ from searx import plugins from mock import Mock +def get_search_mock(query, **kwargs): + return {'search': Mock(query=query, + result_container=Mock(answers=set()), + **kwargs)} + + class PluginStoreTest(SearxTestCase): def test_PluginStore_init(self): @@ -46,23 +52,23 @@ class SelfIPTest(SearxTestCase): request = Mock(user_plugins=store.plugins, remote_addr='127.0.0.1') request.headers.getlist.return_value = [] - ctx = {'search': Mock(answers=set(), - query='ip')} + ctx = get_search_mock(query='ip') store.call('post_search', request, ctx) - self.assertTrue('127.0.0.1' in ctx['search'].answers) + self.assertTrue('127.0.0.1' in ctx['search'].result_container.answers) # User agent test request = Mock(user_plugins=store.plugins, user_agent='Mock') request.headers.getlist.return_value = [] - ctx = {'search': Mock(answers=set(), - query='user-agent')} + + ctx = get_search_mock(query='user-agent') store.call('post_search', request, ctx) - self.assertTrue('Mock' in ctx['search'].answers) - ctx = {'search': Mock(answers=set(), - query='user agent')} + self.assertTrue('Mock' in ctx['search'].result_container.answers) + + ctx = get_search_mock(query='user-agent') store.call('post_search', request, ctx) - self.assertTrue('Mock' in ctx['search'].answers) - ctx = {'search': Mock(answers=set(), - query='What is my User-Agent?')} + self.assertTrue('Mock' in ctx['search'].result_container.answers) + + ctx = get_search_mock(query='What is my User-Agent?') store.call('post_search', request, ctx) + self.assertTrue('Mock' in ctx['search'].result_container.answers) From 4508c966677708a2926afb1d05f134f252d8f93a Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sat, 24 Oct 2015 16:15:30 +0200 Subject: [PATCH 46/53] [enh] fix content fetching, parse published date from description --- searx/engines/startpage.py | 43 +++++++++++++++++++++++---- searx/tests/engines/test_startpage.py | 6 ++-- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 7d58f7f01..a91cafa00 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -12,6 +12,8 @@ from lxml import html from cgi import escape +from dateutil import parser +from datetime import datetime, timedelta import re from searx.engines.xpath import extract_text @@ -79,15 +81,44 @@ def response(resp): title = escape(extract_text(link)) - if result.xpath('./p[@class="desc"]'): - content = escape(extract_text(result.xpath('./p[@class="desc"]'))) + if result.xpath('./p[@class="desc clk"]'): + content = escape(extract_text(result.xpath('./p[@class="desc clk"]'))) else: content = '' - # append result - results.append({'url': url, - 'title': title, - 'content': content}) + published_date = None + + # check if search result starts with something like: "2 Sep 2014 ... " + if re.match("^([1-9]|[1-2][0-9]|3[0-1]) [A-Z][a-z]{2} [0-9]{4} \.\.\. ", content): + date_pos = content.find('...')+4 + date_string = content[0:date_pos-5] + published_date = parser.parse(date_string, dayfirst=True) + + # fix content string + content = content[date_pos:] + + # check if search result starts with something like: "5 days ago ... " + elif re.match("^[0-9]+ days? ago \.\.\. ", content): + date_pos = content.find('...')+4 + date_string = content[0:date_pos-5] + + # calculate datetime + published_date = datetime.now() - timedelta(days=int(re.match(r'\d+', date_string).group())) + + # fix content string + content = content[date_pos:] + + if published_date: + # append result + results.append({'url': url, + 'title': title, + 'content': content, + 'publishedDate': published_date}) + else: + # append result + results.append({'url': url, + 'title': title, + 'content': content}) # return results return results diff --git a/searx/tests/engines/test_startpage.py b/searx/tests/engines/test_startpage.py index 07f13ee27..9a1a09bc7 100644 --- a/searx/tests/engines/test_startpage.py +++ b/searx/tests/engines/test_startpage.py @@ -42,7 +42,7 @@ class TestStartpageEngine(SearxTestCase): -

+

This should be the content.

@@ -78,7 +78,7 @@ class TestStartpageEngine(SearxTestCase): -

+

This should be the content.

@@ -101,7 +101,7 @@ class TestStartpageEngine(SearxTestCase):

-

+

This should be the content.

From 4a15e65cfafa3de3534e0dd0dd1b9be59f00d461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= Date: Mon, 26 Oct 2015 13:40:06 +0100 Subject: [PATCH 47/53] [fix] broken link in README from #314 The format changed in 1fcf066, but the link wasn't updated -- until now. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 669741ef3..cf1263c0f 100644 --- a/README.rst +++ b/README.rst @@ -96,7 +96,7 @@ remember 'untested code is broken code'. Runs robot (Selenium) tests, you must have ``firefox`` installed because this functional tests actually run the browser and perform operations on it. Also searx is executed with -`settings\_robot `__. +`settings\_robot `__. ``make flake8`` ''''''''''''''' From a59d171385a0bfbff1b5df675ec78a88a0323543 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 26 Oct 2015 14:22:27 +0100 Subject: [PATCH 48/53] [fix] answer result type --- searx/results.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/results.py b/searx/results.py index 2fbb6d6c7..bc656f2ac 100644 --- a/searx/results.py +++ b/searx/results.py @@ -100,7 +100,7 @@ class ResultContainer(object): self.suggestions.add(result['suggestion']) results.remove(result) elif 'answer' in result: - self.answers.add(result['suggestion']) + self.answers.add(result['answer']) results.remove(result) elif 'infobox' in result: self._merge_infobox(result) From 5d49c15f791c3b9297bb890b28643e6c50406f35 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 29 Oct 2015 12:47:12 +0100 Subject: [PATCH 49/53] [fix] google engine - ignore new useless result type --- searx/engines/google.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/searx/engines/google.py b/searx/engines/google.py index c8299d04b..67e6ebb87 100644 --- a/searx/engines/google.py +++ b/searx/engines/google.py @@ -12,9 +12,12 @@ import re from cgi import escape from urllib import urlencode from urlparse import urlparse, parse_qsl -from lxml import html +from lxml import html, etree from searx.poolrequests import get from searx.engines.xpath import extract_text, extract_url +from searx.search import logger + +logger = logger.getChild('google engine') # engine dependent config @@ -225,8 +228,8 @@ def response(resp): # parse results for result in dom.xpath(results_xpath): - title = extract_text(result.xpath(title_xpath)[0]) try: + title = extract_text(result.xpath(title_xpath)[0]) url = parse_url(extract_url(result.xpath(url_xpath), google_url), google_hostname) parsed_url = urlparse(url, google_hostname) @@ -269,6 +272,7 @@ def response(resp): 'content': content }) except: + logger.debug('result parse error in:\n%s', etree.tostring(result, pretty_print=True)) continue # parse suggestion From 357fc47811a1de5a273622881574dbde23c7cb59 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sat, 31 Oct 2015 14:40:59 +0100 Subject: [PATCH 50/53] [fix] lock request pool generator --- searx/poolrequests.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/searx/poolrequests.py b/searx/poolrequests.py index c44bdc7e2..4761f6ae8 100644 --- a/searx/poolrequests.py +++ b/searx/poolrequests.py @@ -1,5 +1,7 @@ import requests + from itertools import cycle +from threading import RLock from searx import settings @@ -55,9 +57,10 @@ class SessionSinglePool(requests.Session): super(SessionSinglePool, self).__init__() # reuse the same adapters - self.adapters.clear() - self.mount('https://', next(https_adapters)) - self.mount('http://', next(http_adapters)) + with RLock(): + self.adapters.clear() + self.mount('https://', next(https_adapters)) + self.mount('http://', next(http_adapters)) def close(self): """Call super, but clear adapters since there are managed globaly""" @@ -67,7 +70,6 @@ class SessionSinglePool(requests.Session): def request(method, url, **kwargs): """same as requests/requests/api.py request(...) except it use SessionSinglePool and force proxies""" - global settings session = SessionSinglePool() kwargs['proxies'] = settings['outgoing'].get('proxies', None) response = session.request(method=method, url=url, **kwargs) From fafc564874c63e2c8fb5082c944779c1572e2f15 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sat, 31 Oct 2015 15:27:23 +0100 Subject: [PATCH 51/53] [enh] yandex engine added --- searx/engines/yandex.py | 55 +++++++++++++++++++++++++++++++++++++++++ searx/settings.yml | 5 ++++ 2 files changed, 60 insertions(+) create mode 100644 searx/engines/yandex.py diff --git a/searx/engines/yandex.py b/searx/engines/yandex.py new file mode 100644 index 000000000..a1d2ab792 --- /dev/null +++ b/searx/engines/yandex.py @@ -0,0 +1,55 @@ +""" + Yahoo (Web) + + @website https://yandex.ru/ + @provide-api ? + @using-api no + @results HTML (using search portal) + @stable no (HTML can change) + @parse url, title, content +""" + +from urllib import urlencode +from lxml import html +from searx.search import logger + +logger = logger.getChild('yandex engine') + +# engine dependent config +categories = ['general'] +paging = True +language_support = True # TODO + +# search-url +base_url = 'https://yandex.ru/' +search_url = 'search/?{query}&p={page}' + +results_xpath = '//div[@class="serp-item serp-item_plain_yes clearfix i-bem"]' +url_xpath = './/h2/a/@href' +title_xpath = './/h2/a//text()' +content_xpath = './/div[@class="serp-item__text"]//text()' + + +def request(query, params): + params['url'] = base_url + search_url.format(page=params['pageno']-1, + query=urlencode({'text': query})) + return params + + +# get response from search-request +def response(resp): + dom = html.fromstring(resp.text) + results = [] + + for result in dom.xpath(results_xpath): + try: + res = {'url': result.xpath(url_xpath)[0], + 'title': ''.join(result.xpath(title_xpath)), + 'content': ''.join(result.xpath(content_xpath))} + except: + logger.exception('yandex parse crash') + continue + + results.append(res) + + return results diff --git a/searx/settings.yml b/searx/settings.yml index ffc3502ee..8a9193539 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -274,6 +274,11 @@ engines: engine : yahoo shortcut : yh + - name : yandex + engine : yandex + shortcut : ya + disabled : True + - name : yahoo news engine : yahoo_news shortcut : yhn From 4b8f9778feab79205bfaa42db55390e058748096 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sat, 31 Oct 2015 20:41:39 +0100 Subject: [PATCH 52/53] [mod] yandex shortcut --- searx/settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/settings.yml b/searx/settings.yml index 8a9193539..4e377789a 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -276,7 +276,7 @@ engines: - name : yandex engine : yandex - shortcut : ya + shortcut : yn disabled : True - name : yahoo news From e98aef6fc4954681e58d774203d522f0ae478004 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sat, 31 Oct 2015 23:05:07 +0100 Subject: [PATCH 53/53] [fix] yandex engine language support according to #430 --- searx/engines/yandex.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/searx/engines/yandex.py b/searx/engines/yandex.py index a1d2ab792..edc6ad5f2 100644 --- a/searx/engines/yandex.py +++ b/searx/engines/yandex.py @@ -20,8 +20,13 @@ categories = ['general'] paging = True language_support = True # TODO +default_tld = 'com' +language_map = {'ru': 'ru', + 'ua': 'uk', + 'tr': 'com.tr'} + # search-url -base_url = 'https://yandex.ru/' +base_url = 'https://yandex.{tld}/' search_url = 'search/?{query}&p={page}' results_xpath = '//div[@class="serp-item serp-item_plain_yes clearfix i-bem"]' @@ -31,8 +36,10 @@ content_xpath = './/div[@class="serp-item__text"]//text()' def request(query, params): - params['url'] = base_url + search_url.format(page=params['pageno']-1, - query=urlencode({'text': query})) + lang = params['language'].split('_')[0] + host = base_url.format(tld=language_map.get(lang) or default_tld) + params['url'] = host + search_url.format(page=params['pageno']-1, + query=urlencode({'text': query})) return params