diff --git a/sources/.gitignore b/sources/.gitignore index 105f019..cd6d7e9 100644 --- a/sources/.gitignore +++ b/sources/.gitignore @@ -1,4 +1,5 @@ .coverage +coverage/ .installed.cfg engines.cfg env diff --git a/sources/.travis.yml b/sources/.travis.yml index 3bef5e5..65f8ef2 100644 --- a/sources/.travis.yml +++ b/sources/.travis.yml @@ -16,11 +16,10 @@ install: - ./manage.sh update_dev_packages - pip install coveralls script: - - ./manage.sh pep8_check - ./manage.sh styles - ./manage.sh grunt_build + - ./manage.sh tests - ./manage.sh py_test_coverage - - ./manage.sh robot_tests after_success: coveralls notifications: diff --git a/sources/AUTHORS.rst b/sources/AUTHORS.rst index 5bc6807..505b28e 100644 --- a/sources/AUTHORS.rst +++ b/sources/AUTHORS.rst @@ -1,4 +1,4 @@ -Searx was created by Adam Tauber and is maintained by Adam Tauber and Alexandre Flament. +Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament and Noémi Ványi. Major contributing authors: @@ -7,6 +7,7 @@ Major contributing authors: - Thomas Pointhuber - Alexandre Flament `@dalf `_ - @Cqoicebordel +- Noémi Ványi People who have submitted patches/translates, reported bugs, consulted features or generally made searx better: @@ -39,15 +40,21 @@ generally made searx better: - @underr - Emmanuel Benazera - @GreenLunar -- Noemi Vanyi - Kang-min Liu - Kirill Isakov - Guilhem Bonnefille - Marc Abonce Seguin - - @jibe-b - Christian Pietsch @pietsch - @Maxqia - Ashutosh Das @pyprism - YuLun Shih @imZack - Dmitry Mikhirev @mikhirev +- David A Roberts `@davidar `_ +- Jan Verbeek @blyxxyz +- Ammar Najjar @ammarnajjar +- @stepshal +- François Revol @mmuman +- marc @a01200356 +- Harry Wood @harry-wood +- Thomas Renard @threnard diff --git a/sources/CHANGELOG.rst b/sources/CHANGELOG.rst index 8907ab4..999570e 100644 --- a/sources/CHANGELOG.rst +++ b/sources/CHANGELOG.rst @@ -1,3 +1,38 @@ +0.10.0 2016.09.06 +================= + +- New engines + + - Archive.is (general) + - INA (videos) + - Scanr (science) + - Google Scholar (science) + - Crossref (science) + - Openrepos (files) + - Microsoft Academic Search Engine (science) + - Hoogle (it) + - Diggbt (files) + - Dictzone (general - dictionary) + - Translated (general - translation) +- New Plugins + + - Infinite scroll on results page + - DOAI rewrite +- Full theme redesign +- Display the number of results +- Filter searches by date range +- Instance config API endpoint +- Dependency version updates +- Socks proxy support for outgoing requests +- 404 page + + +News +~~~~ + +@kvch joined the maintainer team + + 0.9.0 2016.05.24 ================ @@ -36,6 +71,7 @@ - Multilingual autocompleter - Qwant autocompleter backend + 0.8.1 2015.12.22 ================ diff --git a/sources/README.rst b/sources/README.rst index 6563fe8..a0bb12f 100644 --- a/sources/README.rst +++ b/sources/README.rst @@ -15,7 +15,7 @@ Installation ~~~~~~~~~~~~ - clone source: - ``git clone git@github.com:asciimoo/searx.git && cd searx`` + ``git clone https://github.com/asciimoo/searx.git && cd searx`` - install dependencies: ``./manage.sh update_packages`` - edit your `settings.yml `__ diff --git a/sources/examples/basic_engine.py b/sources/examples/basic_engine.py index d786564..c7d02af 100644 --- a/sources/examples/basic_engine.py +++ b/sources/examples/basic_engine.py @@ -1,5 +1,6 @@ -categories = ['general'] # optional +categories = ['general'] # optional + def request(query, params): '''pre-request callback @@ -22,4 +23,3 @@ def response(resp): resp: requests response object ''' return [{'url': '', 'title': '', 'content': ''}] - diff --git a/sources/manage.sh b/sources/manage.sh index 0a21f0e..75ba320 100755 --- a/sources/manage.sh +++ b/sources/manage.sh @@ -1,6 +1,6 @@ #!/bin/sh -BASE_DIR=$(dirname `readlink -f $0`) +BASE_DIR=$(dirname "`readlink -f "$0"`") PYTHONPATH=$BASE_DIR SEARX_DIR="$BASE_DIR/searx" ACTION=$1 @@ -58,7 +58,8 @@ styles() { build_style themes/courgette/less/style.less themes/courgette/css/style.css build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css build_style less/bootstrap/bootstrap.less css/bootstrap.min.css - build_style themes/oscar/less/oscar/oscar.less themes/oscar/css/oscar.min.css + build_style themes/oscar/less/pointhi/oscar.less themes/oscar/css/pointhi.min.css + build_style themes/oscar/less/logicodev/oscar.less themes/oscar/css/logicodev.min.css build_style themes/pix-art/less/style.less themes/pix-art/css/style.css } diff --git a/sources/requirements-dev.txt b/sources/requirements-dev.txt index 38be888..580ef63 100644 --- a/sources/requirements-dev.txt +++ b/sources/requirements-dev.txt @@ -1,8 +1,8 @@ -babel==2.2.0 -mock==1.0.1 +babel==2.3.4 +mock==2.0.0 nose2[coverage-plugin] pep8==1.7.0 -plone.testing==4.0.15 +plone.testing==5.0.0 robotframework-selenium2library==1.7.4 robotsuite==1.7.0 transifex-client==0.11 diff --git a/sources/requirements.txt b/sources/requirements.txt index 80c08a4..029c0cf 100644 --- a/sources/requirements.txt +++ b/sources/requirements.txt @@ -1,12 +1,12 @@ -certifi==2015.11.20.1 -flask==0.10.1 -flask-babel==0.9 -lxml==3.5.0 -ndg-httpsclient==0.4.0 +certifi==2016.2.28 +flask==0.11.1 +flask-babel==0.11.1 +lxml==3.6.0 +ndg-httpsclient==0.4.1 pyasn1==0.1.9 pyasn1-modules==0.0.8 -pygments==2.0.2 +pygments==2.1.3 pyopenssl==0.15.1 -python-dateutil==2.4.2 +python-dateutil==2.5.3 pyyaml==3.11 -requests==2.9.1 +requests[socks]==2.10.0 diff --git a/sources/searx/engines/__init__.py b/sources/searx/engines/__init__.py index 6d50667..782b622 100644 --- a/sources/searx/engines/__init__.py +++ b/sources/searx/engines/__init__.py @@ -19,7 +19,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. from os.path import realpath, dirname, splitext, join import sys from imp import load_source -from flask.ext.babel import gettext +from flask_babel import gettext from operator import itemgetter from searx import settings from searx import logger @@ -42,7 +42,8 @@ engine_default_args = {'paging': False, 'shortcut': '-', 'disabled': False, 'suspend_end_time': 0, - 'continuous_errors': 0} + 'continuous_errors': 0, + 'time_range_support': False} def load_module(filename): @@ -57,7 +58,11 @@ def load_module(filename): def load_engine(engine_data): engine_name = engine_data['engine'] - engine = load_module(engine_name + '.py') + try: + engine = load_module(engine_name + '.py') + except: + logger.exception('Cannot load engine "{}"'.format(engine_name)) + return None for param_name in engine_data: if param_name == 'engine': @@ -199,4 +204,5 @@ if 'engines' not in settings or not settings['engines']: for engine_data in settings['engines']: engine = load_engine(engine_data) - engines[engine.name] = engine + if engine is not None: + engines[engine.name] = engine diff --git a/sources/searx/engines/archlinux.py b/sources/searx/engines/archlinux.py index 84e0d0f..b846934 100644 --- a/sources/searx/engines/archlinux.py +++ b/sources/searx/engines/archlinux.py @@ -34,6 +34,7 @@ def locale_to_lang_code(locale): locale = locale.split('_')[0] return locale + # wikis for some languages were moved off from the main site, we need to make # requests to correct URLs to be able to get results in those languages lang_urls = { @@ -70,6 +71,7 @@ def get_lang_urls(language): return lang_urls[language] return lang_urls['all'] + # Language names to build search requests for # those languages which are hosted on the main site. main_langs = { diff --git a/sources/searx/engines/btdigg.py b/sources/searx/engines/btdigg.py index c2b22f0..ea6baf1 100644 --- a/sources/searx/engines/btdigg.py +++ b/sources/searx/engines/btdigg.py @@ -16,6 +16,7 @@ from urllib import quote from lxml import html from operator import itemgetter from searx.engines.xpath import extract_text +from searx.utils import get_torrent_size # engine dependent config categories = ['videos', 'music', 'files'] @@ -68,20 +69,7 @@ def response(resp): leech = 0 # convert filesize to byte if possible - try: - filesize = float(filesize) - - # convert filesize to byte - if filesize_multiplier == 'TB': - filesize = int(filesize * 1024 * 1024 * 1024 * 1024) - elif filesize_multiplier == 'GB': - filesize = int(filesize * 1024 * 1024 * 1024) - elif filesize_multiplier == 'MB': - filesize = int(filesize * 1024 * 1024) - elif filesize_multiplier == 'KB': - filesize = int(filesize * 1024) - except: - filesize = None + filesize = get_torrent_size(filesize, filesize_multiplier) # convert files to int if possible if files.isdigit(): diff --git a/sources/searx/engines/currency_convert.py b/sources/searx/engines/currency_convert.py index b0ffb49..bc839cf 100644 --- a/sources/searx/engines/currency_convert.py +++ b/sources/searx/engines/currency_convert.py @@ -9,7 +9,7 @@ categories = [] url = 'https://download.finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s={query}=X' weight = 100 -parser_re = re.compile(u'.*?(\d+(?:\.\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I) # noqa +parser_re = re.compile(u'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I) # noqa db = 1 diff --git a/sources/searx/engines/deviantart.py b/sources/searx/engines/deviantart.py index 135aeb3..d893fc7 100644 --- a/sources/searx/engines/deviantart.py +++ b/sources/searx/engines/deviantart.py @@ -13,7 +13,6 @@ """ from urllib import urlencode -from urlparse import urljoin from lxml import html import re from searx.engines.xpath import extract_text @@ -21,10 +20,16 @@ from searx.engines.xpath import extract_text # engine dependent config categories = ['images'] paging = True +time_range_support = True # search-url base_url = 'https://www.deviantart.com/' search_url = base_url + 'browse/all/?offset={offset}&{query}' +time_range_url = '&order={range}' + +time_range_dict = {'day': 11, + 'week': 14, + 'month': 15} # do search-request @@ -33,6 +38,8 @@ def request(query, params): params['url'] = search_url.format(offset=offset, query=urlencode({'q': query})) + if params['time_range'] in time_range_dict: + params['url'] += time_range_url.format(range=time_range_dict[params['time_range']]) return params @@ -47,14 +54,13 @@ def response(resp): dom = html.fromstring(resp.text) - regex = re.compile('\/200H\/') + regex = re.compile(r'\/200H\/') # parse results - for result in dom.xpath('//div[contains(@class, "tt-a tt-fh")]'): - link = result.xpath('.//a[contains(@class, "thumb")]')[0] - url = urljoin(base_url, link.attrib.get('href')) - title_links = result.xpath('.//span[@class="details"]//a[contains(@class, "t")]') - title = extract_text(title_links[0]) + for result in dom.xpath('.//span[@class="thumb wide"]'): + link = result.xpath('.//a[@class="torpedo-thumb-link"]')[0] + url = link.attrib.get('href') + title = extract_text(result.xpath('.//span[@class="title"]')) thumbnail_src = link.xpath('.//img')[0].attrib.get('src') img_src = regex.sub('/', thumbnail_src) diff --git a/sources/searx/engines/dictzone.py b/sources/searx/engines/dictzone.py new file mode 100644 index 0000000..9765d5f --- /dev/null +++ b/sources/searx/engines/dictzone.py @@ -0,0 +1,69 @@ +""" + Dictzone + + @website https://dictzone.com/ + @provide-api no + @using-api no + @results HTML (using search portal) + @stable no (HTML can change) + @parse url, title, content +""" + +import re +from urlparse import urljoin +from lxml import html +from cgi import escape +from searx.utils import is_valid_lang + +categories = ['general'] +url = u'http://dictzone.com/{from_lang}-{to_lang}-dictionary/{query}' +weight = 100 + +parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I) +results_xpath = './/table[@id="r"]/tr' + + +def request(query, params): + m = parser_re.match(unicode(query, 'utf8')) + if not m: + return params + + from_lang, to_lang, query = m.groups() + + from_lang = is_valid_lang(from_lang) + to_lang = is_valid_lang(to_lang) + + if not from_lang or not to_lang: + return params + + params['url'] = url.format(from_lang=from_lang[2], + to_lang=to_lang[2], + query=query) + + return params + + +def response(resp): + results = [] + + dom = html.fromstring(resp.text) + + for k, result in enumerate(dom.xpath(results_xpath)[1:]): + try: + from_result, to_results_raw = result.xpath('./td') + except: + continue + + to_results = [] + for to_result in to_results_raw.xpath('./p/a'): + t = to_result.text_content() + if t.strip(): + to_results.append(to_result.text_content()) + + results.append({ + 'url': urljoin(resp.url, '?%d' % k), + 'title': escape(from_result.text_content()), + 'content': escape('; '.join(to_results)) + }) + + return results diff --git a/sources/searx/engines/digbt.py b/sources/searx/engines/digbt.py new file mode 100644 index 0000000..c35327e --- /dev/null +++ b/sources/searx/engines/digbt.py @@ -0,0 +1,58 @@ +""" + DigBT (Videos, Music, Files) + + @website https://digbt.org + @provide-api no + + @using-api no + @results HTML (using search portal) + @stable no (HTML can change) + @parse url, title, content, magnetlink +""" + +from urlparse import urljoin +from lxml import html +from searx.engines.xpath import extract_text +from searx.utils import get_torrent_size + +categories = ['videos', 'music', 'files'] +paging = True + +URL = 'https://digbt.org' +SEARCH_URL = URL + '/search/{query}-time-{pageno}' +FILESIZE = 3 +FILESIZE_MULTIPLIER = 4 + + +def request(query, params): + params['url'] = SEARCH_URL.format(query=query, pageno=params['pageno']) + + return params + + +def response(resp): + dom = html.fromstring(resp.content) + search_res = dom.xpath('.//td[@class="x-item"]') + + if not search_res: + return list() + + results = list() + for result in search_res: + url = urljoin(URL, result.xpath('.//a[@title]/@href')[0]) + title = result.xpath('.//a[@title]/text()')[0] + content = extract_text(result.xpath('.//div[@class="files"]')) + files_data = extract_text(result.xpath('.//div[@class="tail"]')).split() + filesize = get_torrent_size(files_data[FILESIZE], files_data[FILESIZE_MULTIPLIER]) + magnetlink = result.xpath('.//div[@class="tail"]//a[@class="title"]/@href')[0] + + results.append({'url': url, + 'title': title, + 'content': content, + 'filesize': filesize, + 'magnetlink': magnetlink, + 'seed': 'N/A', + 'leech': 'N/A', + 'template': 'torrent.html'}) + + return results diff --git a/sources/searx/engines/duckduckgo.py b/sources/searx/engines/duckduckgo.py index 373ce1b..2153492 100644 --- a/sources/searx/engines/duckduckgo.py +++ b/sources/searx/engines/duckduckgo.py @@ -11,21 +11,26 @@ @parse url, title, content @todo rewrite to api - @todo language support - (the current used site does not support language-change) """ from urllib import urlencode from lxml.html import fromstring from searx.engines.xpath import extract_text +from searx.languages import language_codes # engine dependent config categories = ['general'] paging = True language_support = True +time_range_support = True # search-url url = 'https://duckduckgo.com/html?{query}&s={offset}' +time_range_url = '&df={range}' + +time_range_dict = {'day': 'd', + 'week': 'w', + 'month': 'm'} # specific xpath variables result_xpath = '//div[@class="result results_links results_links_deep web-result "]' # noqa @@ -39,13 +44,31 @@ def request(query, params): offset = (params['pageno'] - 1) * 30 if params['language'] == 'all': - locale = 'en-us' + locale = None else: - locale = params['language'].replace('_', '-').lower() + locale = params['language'].split('_') + if len(locale) == 2: + # country code goes first + locale = locale[1].lower() + '-' + locale[0].lower() + else: + # tries to get a country code from language + locale = locale[0].lower() + lang_codes = [x[0] for x in language_codes] + for lc in lang_codes: + lc = lc.split('_') + if locale == lc[0]: + locale = lc[1].lower() + '-' + lc[0].lower() + break - params['url'] = url.format( - query=urlencode({'q': query, 'kl': locale}), - offset=offset) + if locale: + params['url'] = url.format( + query=urlencode({'q': query, 'kl': locale}), offset=offset) + else: + params['url'] = url.format( + query=urlencode({'q': query}), offset=offset) + + if params['time_range'] in time_range_dict: + params['url'] += time_range_url.format(range=time_range_dict[params['time_range']]) return params diff --git a/sources/searx/engines/filecrop.py b/sources/searx/engines/filecrop.py index 89dc776..71665bd 100644 --- a/sources/searx/engines/filecrop.py +++ b/sources/searx/engines/filecrop.py @@ -8,6 +8,7 @@ paging = True class FilecropResultParser(HTMLParser): + def __init__(self): HTMLParser.__init__(self) self.__start_processing = False diff --git a/sources/searx/engines/google.py b/sources/searx/engines/google.py index 6018ad1..ea93bc9 100644 --- a/sources/searx/engines/google.py +++ b/sources/searx/engines/google.py @@ -24,6 +24,7 @@ categories = ['general'] paging = True language_support = True use_locale_domain = True +time_range_support = True # based on https://en.wikipedia.org/wiki/List_of_Google_domains and tests default_hostname = 'www.google.com' @@ -92,6 +93,11 @@ search_url = ('https://{hostname}' + search_path + '?{query}&start={offset}&gws_rd=cr&gbv=1&lr={lang}&ei=x') +time_range_search = "&tbs=qdr:{range}" +time_range_dict = {'day': 'd', + 'week': 'w', + 'month': 'm'} + # other URLs map_hostname_start = 'maps.google.' maps_path = '/maps' @@ -179,6 +185,8 @@ def request(query, params): query=urlencode({'q': query}), hostname=google_hostname, lang=url_lang) + if params['time_range'] in time_range_dict: + params['url'] += time_range_search.format(range=time_range_dict[params['time_range']]) params['headers']['Accept-Language'] = language params['headers']['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' @@ -300,9 +308,9 @@ def parse_map_detail(parsed_url, result, google_hostname): results = [] # try to parse the geoloc - m = re.search('@([0-9\.]+),([0-9\.]+),([0-9]+)', parsed_url.path) + m = re.search(r'@([0-9\.]+),([0-9\.]+),([0-9]+)', parsed_url.path) if m is None: - m = re.search('ll\=([0-9\.]+),([0-9\.]+)\&z\=([0-9]+)', parsed_url.query) + m = re.search(r'll\=([0-9\.]+),([0-9\.]+)\&z\=([0-9]+)', parsed_url.query) if m is not None: # geoloc found (ignored) diff --git a/sources/searx/engines/google_images.py b/sources/searx/engines/google_images.py index efe4681..77bdc13 100644 --- a/sources/searx/engines/google_images.py +++ b/sources/searx/engines/google_images.py @@ -11,7 +11,6 @@ """ from urllib import urlencode -from urlparse import parse_qs from json import loads from lxml import html @@ -19,24 +18,38 @@ from lxml import html categories = ['images'] paging = True safesearch = True +time_range_support = True +number_of_results = 100 search_url = 'https://www.google.com/search'\ '?{query}'\ + '&asearch=ichunk'\ + '&async=_id:rg_s,_pms:s'\ '&tbm=isch'\ - '&ijn=1'\ - '&start={offset}' + '&yv=2'\ + '&{search_options}' +time_range_attr = "qdr:{range}" +time_range_dict = {'day': 'd', + 'week': 'w', + 'month': 'm'} # do search-request def request(query, params): - offset = (params['pageno'] - 1) * 100 - params['url'] = search_url.format(query=urlencode({'q': query}), - offset=offset, - safesearch=safesearch) + search_options = { + 'ijn': params['pageno'] - 1, + 'start': (params['pageno'] - 1) * number_of_results + } + + if params['time_range'] in time_range_dict: + search_options['tbs'] = time_range_attr.format(range=time_range_dict[params['time_range']]) if safesearch and params['safesearch']: - params['url'] += '&' + urlencode({'safe': 'active'}) + search_options['safe'] = 'on' + + params['url'] = search_url.format(query=urlencode({'q': query}), + search_options=urlencode(search_options)) return params @@ -45,12 +58,17 @@ def request(query, params): def response(resp): results = [] - dom = html.fromstring(resp.text) + g_result = loads(resp.text) + + dom = html.fromstring(g_result[1][1]) # parse results for result in dom.xpath('//div[@data-ved]'): - metadata = loads(result.xpath('./div[@class="rg_meta"]/text()')[0]) + try: + metadata = loads(''.join(result.xpath('./div[@class="rg_meta"]/text()'))) + except: + continue thumbnail_src = metadata['tu'] diff --git a/sources/searx/engines/ina.py b/sources/searx/engines/ina.py new file mode 100644 index 0000000..86a3978 --- /dev/null +++ b/sources/searx/engines/ina.py @@ -0,0 +1,83 @@ +# INA (Videos) +# +# @website https://www.ina.fr/ +# @provide-api no +# +# @using-api no +# @results HTML (using search portal) +# @stable no (HTML can change) +# @parse url, title, content, publishedDate, thumbnail +# +# @todo set content-parameter with correct data +# @todo embedded (needs some md5 from video page) + +from json import loads +from urllib import urlencode +from lxml import html +from HTMLParser import HTMLParser +from searx.engines.xpath import extract_text +from dateutil import parser + +# engine dependent config +categories = ['videos'] +paging = True +page_size = 48 + +# search-url +base_url = 'https://www.ina.fr' +search_url = base_url + '/layout/set/ajax/recherche/result?autopromote=&hf={ps}&b={start}&type=Video&r=&{query}' + +# specific xpath variables +results_xpath = '//div[contains(@class,"search-results--list")]/div[@class="media"]' +url_xpath = './/a/@href' +title_xpath = './/h3[@class="h3--title media-heading"]' +thumbnail_xpath = './/img/@src' +publishedDate_xpath = './/span[@class="broadcast"]' +content_xpath = './/p[@class="media-body__summary"]' + + +# do search-request +def request(query, params): + params['url'] = search_url.format(ps=page_size, + start=params['pageno'] * page_size, + query=urlencode({'q': query})) + + return params + + +# get response from search-request +def response(resp): + results = [] + + # we get html in a JSON container... + response = loads(resp.text) + if "content" not in response: + return [] + dom = html.fromstring(response["content"]) + p = HTMLParser() + + # parse results + for result in dom.xpath(results_xpath): + videoid = result.xpath(url_xpath)[0] + url = base_url + videoid + title = p.unescape(extract_text(result.xpath(title_xpath))) + thumbnail = extract_text(result.xpath(thumbnail_xpath)[0]) + if thumbnail[0] == '/': + thumbnail = base_url + thumbnail + d = extract_text(result.xpath(publishedDate_xpath)[0]) + d = d.split('/') + # force ISO date to avoid wrong parsing + d = "%s-%s-%s" % (d[2], d[1], d[0]) + publishedDate = parser.parse(d) + content = extract_text(result.xpath(content_xpath)) + + # append result + results.append({'url': url, + 'title': title, + 'content': content, + 'template': 'videos.html', + 'publishedDate': publishedDate, + 'thumbnail': thumbnail}) + + # return results + return results diff --git a/sources/searx/engines/json_engine.py b/sources/searx/engines/json_engine.py index 5525b7f..4604c3c 100644 --- a/sources/searx/engines/json_engine.py +++ b/sources/searx/engines/json_engine.py @@ -6,7 +6,16 @@ search_url = None url_query = None content_query = None title_query = None -# suggestion_xpath = '' +suggestion_query = '' +results_query = '' + +# parameters for engines with paging support +# +# number of results on each page +# (only needed if the site requires not a page number, but an offset) +page_size = 1 +# number of the first page (usually 0 or 1) +first_page_num = 1 def iterate(iterable): @@ -69,19 +78,36 @@ def query(data, query_string): def request(query, params): query = urlencode({'q': query})[2:] - params['url'] = search_url.format(query=query) + + fp = {'query': query} + if paging and search_url.find('{pageno}') >= 0: + fp['pageno'] = (params['pageno'] - 1) * page_size + first_page_num + + params['url'] = search_url.format(**fp) params['query'] = query + return params def response(resp): results = [] - json = loads(resp.text) + if results_query: + for result in query(json, results_query)[0]: + url = query(result, url_query)[0] + title = query(result, title_query)[0] + content = query(result, content_query)[0] + results.append({'url': url, 'title': title, 'content': content}) + else: + for url, title, content in zip( + query(json, url_query), + query(json, title_query), + query(json, content_query) + ): + results.append({'url': url, 'title': title, 'content': content}) - urls = query(json, url_query) - contents = query(json, content_query) - titles = query(json, title_query) - for url, title, content in zip(urls, titles, contents): - results.append({'url': url, 'title': title, 'content': content}) + if not suggestion_query: + return results + for suggestion in query(json, suggestion_query): + results.append({'suggestion': suggestion}) return results diff --git a/sources/searx/engines/scanr_structures.py b/sources/searx/engines/scanr_structures.py new file mode 100644 index 0000000..ad78155 --- /dev/null +++ b/sources/searx/engines/scanr_structures.py @@ -0,0 +1,78 @@ +""" + ScanR Structures (Science) + + @website https://scanr.enseignementsup-recherche.gouv.fr + @provide-api yes (https://scanr.enseignementsup-recherche.gouv.fr/api/swagger-ui.html) + + @using-api yes + @results JSON + @stable yes + @parse url, title, content, img_src +""" + +from urllib import urlencode +from json import loads, dumps +from dateutil import parser +from searx.utils import html_to_text + +# engine dependent config +categories = ['science'] +paging = True +page_size = 20 + +# search-url +url = 'https://scanr.enseignementsup-recherche.gouv.fr/' +search_url = url + 'api/structures/search' + + +# do search-request +def request(query, params): + + params['url'] = search_url + params['method'] = 'POST' + params['headers']['Content-type'] = "application/json" + params['data'] = dumps({"query": query, + "searchField": "ALL", + "sortDirection": "ASC", + "sortOrder": "RELEVANCY", + "page": params['pageno'], + "pageSize": page_size}) + + return params + + +# get response from search-request +def response(resp): + results = [] + + search_res = loads(resp.text) + + # return empty array if there are no results + if search_res.get('total') < 1: + return [] + + # parse results + for result in search_res['results']: + if 'id' not in result: + continue + + # is it thumbnail or img_src?? + thumbnail = None + if 'logo' in result: + thumbnail = result['logo'] + if thumbnail[0] == '/': + thumbnail = url + thumbnail + + content = None + if 'highlights' in result: + content = result['highlights'][0]['value'] + + # append result + results.append({'url': url + 'structure/' + result['id'], + 'title': result['label'], + # 'thumbnail': thumbnail, + 'img_src': thumbnail, + 'content': html_to_text(content)}) + + # return results + return results diff --git a/sources/searx/engines/soundcloud.py b/sources/searx/engines/soundcloud.py index ac23c1e..62b03ac 100644 --- a/sources/searx/engines/soundcloud.py +++ b/sources/searx/engines/soundcloud.py @@ -57,6 +57,7 @@ def get_client_id(): logger.warning("Unable to fetch guest client_id from SoundCloud, check parser!") return "" + # api-key guest_client_id = get_client_id() diff --git a/sources/searx/engines/startpage.py b/sources/searx/engines/startpage.py index 52dd0b9..d8b702c 100644 --- a/sources/searx/engines/startpage.py +++ b/sources/searx/engines/startpage.py @@ -68,15 +68,15 @@ 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(r"^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): + if re.match(r"^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): + if re.match(r"^http(s|)://(www\.)?ixquick\.com/do/search\?.*$", url): continue title = escape(extract_text(link)) @@ -89,7 +89,7 @@ def response(resp): 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): + if re.match(r"^([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) @@ -98,7 +98,7 @@ def response(resp): content = content[date_pos:] # check if search result starts with something like: "5 days ago ... " - elif re.match("^[0-9]+ days? ago \.\.\. ", content): + elif re.match(r"^[0-9]+ days? ago \.\.\. ", content): date_pos = content.find('...') + 4 date_string = content[0:date_pos - 5] diff --git a/sources/searx/engines/swisscows.py b/sources/searx/engines/swisscows.py index 864436a..1a94ed6 100644 --- a/sources/searx/engines/swisscows.py +++ b/sources/searx/engines/swisscows.py @@ -25,10 +25,10 @@ base_url = 'https://swisscows.ch/' search_string = '?{query}&page={page}' # regex -regex_json = re.compile('initialData: {"Request":(.|\n)*},\s*environment') -regex_json_remove_start = re.compile('^initialData:\s*') -regex_json_remove_end = re.compile(',\s*environment$') -regex_img_url_remove_start = re.compile('^https?://i\.swisscows\.ch/\?link=') +regex_json = re.compile(r'initialData: {"Request":(.|\n)*},\s*environment') +regex_json_remove_start = re.compile(r'^initialData:\s*') +regex_json_remove_end = re.compile(r',\s*environment$') +regex_img_url_remove_start = re.compile(r'^https?://i\.swisscows\.ch/\?link=') # do search-request diff --git a/sources/searx/engines/tokyotoshokan.py b/sources/searx/engines/tokyotoshokan.py index 17e8e21..e2990e1 100644 --- a/sources/searx/engines/tokyotoshokan.py +++ b/sources/searx/engines/tokyotoshokan.py @@ -48,7 +48,7 @@ def response(resp): return [] # regular expression for parsing torrent size strings - size_re = re.compile('Size:\s*([\d.]+)(TB|GB|MB|B)', re.IGNORECASE) + size_re = re.compile(r'Size:\s*([\d.]+)(TB|GB|MB|B)', re.IGNORECASE) # processing the results, two rows at a time for i in xrange(0, len(rows), 2): diff --git a/sources/searx/engines/translated.py b/sources/searx/engines/translated.py new file mode 100644 index 0000000..02047bc --- /dev/null +++ b/sources/searx/engines/translated.py @@ -0,0 +1,65 @@ +""" + MyMemory Translated + + @website https://mymemory.translated.net/ + @provide-api yes (https://mymemory.translated.net/doc/spec.php) + @using-api yes + @results JSON + @stable yes + @parse url, title, content +""" +import re +from cgi import escape +from searx.utils import is_valid_lang + +categories = ['general'] +url = u'http://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}' +web_url = u'http://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}' +weight = 100 + +parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I) +api_key = '' + + +def request(query, params): + m = parser_re.match(unicode(query, 'utf8')) + if not m: + return params + + from_lang, to_lang, query = m.groups() + + from_lang = is_valid_lang(from_lang) + to_lang = is_valid_lang(to_lang) + + if not from_lang or not to_lang: + return params + + if api_key: + key_form = '&key=' + api_key + else: + key_form = '' + params['url'] = url.format(from_lang=from_lang[1], + to_lang=to_lang[1], + query=query, + key=key_form) + params['query'] = query + params['from_lang'] = from_lang + params['to_lang'] = to_lang + + return params + + +def response(resp): + results = [] + results.append({ + 'url': escape(web_url.format( + from_lang=resp.search_params['from_lang'][2], + to_lang=resp.search_params['to_lang'][2], + query=resp.search_params['query'])), + 'title': escape('[{0}-{1}] {2}'.format( + resp.search_params['from_lang'][1], + resp.search_params['to_lang'][1], + resp.search_params['query'])), + 'content': escape(resp.json()['responseData']['translatedText']) + }) + return results diff --git a/sources/searx/engines/wikidata.py b/sources/searx/engines/wikidata.py index 8aa2fcd..91040e2 100644 --- a/sources/searx/engines/wikidata.py +++ b/sources/searx/engines/wikidata.py @@ -1,56 +1,86 @@ -import json +# -*- coding: utf-8 -*- +""" + Wikidata + + @website https://wikidata.org + @provide-api yes (https://wikidata.org/w/api.php) + + @using-api partially (most things require scraping) + @results JSON, HTML + @stable no (html can change) + @parse url, infobox +""" from searx import logger from searx.poolrequests import get -from searx.utils import format_date_by_locale +from searx.engines.xpath import extract_text -from datetime import datetime -from dateutil.parser import parse as dateutil_parse +from json import loads +from lxml.html import fromstring from urllib import urlencode - logger = logger.getChild('wikidata') result_count = 1 + +# urls wikidata_host = 'https://www.wikidata.org' +url_search = wikidata_host \ + + '/wiki/Special:ItemDisambiguation?{query}' + wikidata_api = wikidata_host + '/w/api.php' -url_search = wikidata_api \ - + '?action=query&list=search&format=json'\ - + '&srnamespace=0&srprop=sectiontitle&{query}' url_detail = wikidata_api\ - + '?action=wbgetentities&format=json'\ - + '&props=labels%7Cinfo%7Csitelinks'\ - + '%7Csitelinks%2Furls%7Cdescriptions%7Cclaims'\ - + '&{query}' + + '?action=parse&format=json&{query}'\ + + '&redirects=1&prop=text%7Cdisplaytitle%7Clanglinks%7Crevid'\ + + '&disableeditsection=1&disabletidy=1&preview=1§ionpreview=1&disabletoc=1&utf8=1&formatversion=2' + url_map = 'https://www.openstreetmap.org/'\ + '?lat={latitude}&lon={longitude}&zoom={zoom}&layers=M' +url_image = 'https://commons.wikimedia.org/wiki/Special:FilePath/{filename}?width=500&height=400' + +# xpaths +wikidata_ids_xpath = '//div/ul[@class="wikibase-disambiguation"]/li/a/@title' +title_xpath = '//*[contains(@class,"wikibase-title-label")]' +description_xpath = '//div[contains(@class,"wikibase-entitytermsview-heading-description")]' +property_xpath = '//div[@id="{propertyid}"]' +label_xpath = './/div[contains(@class,"wikibase-statementgroupview-property-label")]/a' +url_xpath = './/a[contains(@class,"external free") or contains(@class, "wb-external-id")]' +wikilink_xpath = './/ul[contains(@class,"wikibase-sitelinklistview-listview")]'\ + + '/li[contains(@data-wb-siteid,"{wikiid}")]//a/@href' +property_row_xpath = './/div[contains(@class,"wikibase-statementview")]' +preferred_rank_xpath = './/span[contains(@class,"wikibase-rankselector-preferred")]' +value_xpath = './/div[contains(@class,"wikibase-statementview-mainsnak")]'\ + + '/*/div[contains(@class,"wikibase-snakview-value")]' +language_fallback_xpath = '//sup[contains(@class,"wb-language-fallback-indicator")]' +calendar_name_xpath = './/sup[contains(@class,"wb-calendar-name")]' def request(query, params): + language = params['language'].split('_')[0] + if language == 'all': + language = 'en' + params['url'] = url_search.format( - query=urlencode({'srsearch': query, - 'srlimit': result_count})) + query=urlencode({'label': query, + 'language': language})) return params def response(resp): results = [] - search_res = json.loads(resp.text) - - wikidata_ids = set() - for r in search_res.get('query', {}).get('search', {}): - wikidata_ids.add(r.get('title', '')) + html = fromstring(resp.content) + wikidata_ids = html.xpath(wikidata_ids_xpath) language = resp.search_params['language'].split('_')[0] if language == 'all': language = 'en' - url = url_detail.format(query=urlencode({'ids': '|'.join(wikidata_ids), - 'languages': language + '|en'})) - - htmlresponse = get(url) - jsonresponse = json.loads(htmlresponse.content) - for wikidata_id in wikidata_ids: - results = results + getDetail(jsonresponse, wikidata_id, language, resp.search_params['language']) + # TODO: make requests asynchronous to avoid timeout when result_count > 1 + for wikidata_id in wikidata_ids[:result_count]: + url = url_detail.format(query=urlencode({'page': wikidata_id, + 'uselang': language})) + htmlresponse = get(url) + jsonresponse = loads(htmlresponse.content) + results += getDetail(jsonresponse, wikidata_id, language, resp.search_params['language']) return results @@ -60,124 +90,206 @@ def getDetail(jsonresponse, wikidata_id, language, locale): urls = [] attributes = [] - result = jsonresponse.get('entities', {}).get(wikidata_id, {}) + title = jsonresponse.get('parse', {}).get('displaytitle', {}) + result = jsonresponse.get('parse', {}).get('text', {}) - title = result.get('labels', {}).get(language, {}).get('value', None) - if title is None: - title = result.get('labels', {}).get('en', {}).get('value', None) - if title is None: + if not title or not result: return results - description = result\ - .get('descriptions', {})\ - .get(language, {})\ - .get('value', None) + title = fromstring(title) + for elem in title.xpath(language_fallback_xpath): + elem.getparent().remove(elem) + title = extract_text(title.xpath(title_xpath)) - if description is None: - description = result\ - .get('descriptions', {})\ - .get('en', {})\ - .get('value', '') + result = fromstring(result) + for elem in result.xpath(language_fallback_xpath): + elem.getparent().remove(elem) - claims = result.get('claims', {}) - official_website = get_string(claims, 'P856', None) - if official_website is not None: - urls.append({'title': 'Official site', 'url': official_website}) - results.append({'title': title, 'url': official_website}) + description = extract_text(result.xpath(description_xpath)) + # URLS + + # official website + add_url(urls, result, 'P856', results=results) + + # wikipedia wikipedia_link_count = 0 wikipedia_link = get_wikilink(result, language + 'wiki') - wikipedia_link_count += add_url(urls, - 'Wikipedia (' + language + ')', - wikipedia_link) + if wikipedia_link: + wikipedia_link_count += 1 + urls.append({'title': 'Wikipedia (' + language + ')', + 'url': wikipedia_link}) + if language != 'en': wikipedia_en_link = get_wikilink(result, 'enwiki') - wikipedia_link_count += add_url(urls, - 'Wikipedia (en)', - wikipedia_en_link) - if wikipedia_link_count == 0: - misc_language = get_wiki_firstlanguage(result, 'wiki') - if misc_language is not None: - add_url(urls, - 'Wikipedia (' + misc_language + ')', - get_wikilink(result, misc_language + 'wiki')) + if wikipedia_en_link: + wikipedia_link_count += 1 + urls.append({'title': 'Wikipedia (en)', + 'url': wikipedia_en_link}) - if language != 'en': - add_url(urls, - 'Wiki voyage (' + language + ')', - get_wikilink(result, language + 'wikivoyage')) + # TODO: get_wiki_firstlanguage + # if wikipedia_link_count == 0: - add_url(urls, - 'Wiki voyage (en)', - get_wikilink(result, 'enwikivoyage')) + # more wikis + add_url(urls, result, default_label='Wikivoyage (' + language + ')', link_type=language + 'wikivoyage') + add_url(urls, result, default_label='Wikiquote (' + language + ')', link_type=language + 'wikiquote') + add_url(urls, result, default_label='Wikimedia Commons', link_type='commonswiki') - if language != 'en': - add_url(urls, - 'Wikiquote (' + language + ')', - get_wikilink(result, language + 'wikiquote')) + add_url(urls, result, 'P625', 'OpenStreetMap', link_type='geo') - add_url(urls, - 'Wikiquote (en)', - get_wikilink(result, 'enwikiquote')) + # musicbrainz + add_url(urls, result, 'P434', 'MusicBrainz', 'http://musicbrainz.org/artist/') + add_url(urls, result, 'P435', 'MusicBrainz', 'http://musicbrainz.org/work/') + add_url(urls, result, 'P436', 'MusicBrainz', 'http://musicbrainz.org/release-group/') + add_url(urls, result, 'P966', 'MusicBrainz', 'http://musicbrainz.org/label/') - add_url(urls, - 'Commons wiki', - get_wikilink(result, 'commonswiki')) + # IMDb + add_url(urls, result, 'P345', 'IMDb', 'https://www.imdb.com/', link_type='imdb') + # source code repository + add_url(urls, result, 'P1324') + # blog + add_url(urls, result, 'P1581') + # social media links + add_url(urls, result, 'P2397', 'YouTube', 'https://www.youtube.com/channel/') + add_url(urls, result, 'P1651', 'YouTube', 'https://www.youtube.com/watch?v=') + add_url(urls, result, 'P2002', 'Twitter', 'https://twitter.com/') + add_url(urls, result, 'P2013', 'Facebook', 'https://facebook.com/') + add_url(urls, result, 'P2003', 'Instagram', 'https://instagram.com/') - add_url(urls, - 'Location', - get_geolink(claims, 'P625', None)) + urls.append({'title': 'Wikidata', + 'url': 'https://www.wikidata.org/wiki/' + + wikidata_id + '?uselang=' + language}) - add_url(urls, - 'Wikidata', - 'https://www.wikidata.org/wiki/' - + wikidata_id + '?uselang=' + language) + # INFOBOX ATTRIBUTES (ROWS) - musicbrainz_work_id = get_string(claims, 'P435') - if musicbrainz_work_id is not None: - add_url(urls, - 'MusicBrainz', - 'http://musicbrainz.org/work/' - + musicbrainz_work_id) + # DATES + # inception date + add_attribute(attributes, result, 'P571', date=True) + # dissolution date + add_attribute(attributes, result, 'P576', date=True) + # start date + add_attribute(attributes, result, 'P580', date=True) + # end date + add_attribute(attributes, result, 'P582', date=True) + # date of birth + add_attribute(attributes, result, 'P569', date=True) + # date of death + add_attribute(attributes, result, 'P570', date=True) + # date of spacecraft launch + add_attribute(attributes, result, 'P619', date=True) + # date of spacecraft landing + add_attribute(attributes, result, 'P620', date=True) - musicbrainz_artist_id = get_string(claims, 'P434') - if musicbrainz_artist_id is not None: - add_url(urls, - 'MusicBrainz', - 'http://musicbrainz.org/artist/' - + musicbrainz_artist_id) + # nationality + add_attribute(attributes, result, 'P27') + # country of origin + add_attribute(attributes, result, 'P495') + # country + add_attribute(attributes, result, 'P17') + # headquarters + add_attribute(attributes, result, 'Q180') - musicbrainz_release_group_id = get_string(claims, 'P436') - if musicbrainz_release_group_id is not None: - add_url(urls, - 'MusicBrainz', - 'http://musicbrainz.org/release-group/' - + musicbrainz_release_group_id) + # PLACES + # capital + add_attribute(attributes, result, 'P36', trim=True) + # head of state + add_attribute(attributes, result, 'P35', trim=True) + # head of government + add_attribute(attributes, result, 'P6', trim=True) + # type of government + add_attribute(attributes, result, 'P122') + # official language + add_attribute(attributes, result, 'P37') + # population + add_attribute(attributes, result, 'P1082', trim=True) + # area + add_attribute(attributes, result, 'P2046') + # currency + add_attribute(attributes, result, 'P38', trim=True) + # heigth (building) + add_attribute(attributes, result, 'P2048') - musicbrainz_label_id = get_string(claims, 'P966') - if musicbrainz_label_id is not None: - add_url(urls, - 'MusicBrainz', - 'http://musicbrainz.org/label/' - + musicbrainz_label_id) + # MEDIA + # platform (videogames) + add_attribute(attributes, result, 'P400') + # author + add_attribute(attributes, result, 'P50') + # creator + add_attribute(attributes, result, 'P170') + # director + add_attribute(attributes, result, 'P57') + # performer + add_attribute(attributes, result, 'P175') + # developer + add_attribute(attributes, result, 'P178') + # producer + add_attribute(attributes, result, 'P162') + # manufacturer + add_attribute(attributes, result, 'P176') + # screenwriter + add_attribute(attributes, result, 'P58') + # production company + add_attribute(attributes, result, 'P272') + # record label + add_attribute(attributes, result, 'P264') + # publisher + add_attribute(attributes, result, 'P123') + # original network + add_attribute(attributes, result, 'P449') + # distributor + add_attribute(attributes, result, 'P750') + # composer + add_attribute(attributes, result, 'P86') + # publication date + add_attribute(attributes, result, 'P577', date=True) + # genre + add_attribute(attributes, result, 'P136') + # original language + add_attribute(attributes, result, 'P364') + # isbn + add_attribute(attributes, result, 'Q33057') + # software license + add_attribute(attributes, result, 'P275') + # programming language + add_attribute(attributes, result, 'P277') + # version + add_attribute(attributes, result, 'P348', trim=True) + # narrative location + add_attribute(attributes, result, 'P840') - # musicbrainz_area_id = get_string(claims, 'P982') - # P1407 MusicBrainz series ID - # P1004 MusicBrainz place ID - # P1330 MusicBrainz instrument ID - # P1407 MusicBrainz series ID + # LANGUAGES + # number of speakers + add_attribute(attributes, result, 'P1098') + # writing system + add_attribute(attributes, result, 'P282') + # regulatory body + add_attribute(attributes, result, 'P1018') + # language code + add_attribute(attributes, result, 'P218') - postal_code = get_string(claims, 'P281', None) - if postal_code is not None: - attributes.append({'label': 'Postal code(s)', 'value': postal_code}) + # OTHER + # ceo + add_attribute(attributes, result, 'P169', trim=True) + # founder + add_attribute(attributes, result, 'P112') + # legal form (company/organization) + add_attribute(attributes, result, 'P1454') + # operator + add_attribute(attributes, result, 'P137') + # crew members (tripulation) + add_attribute(attributes, result, 'P1029') + # taxon + add_attribute(attributes, result, 'P225') + # chemical formula + add_attribute(attributes, result, 'P274') + # winner (sports/contests) + add_attribute(attributes, result, 'P1346') + # number of deaths + add_attribute(attributes, result, 'P1120') + # currency code + add_attribute(attributes, result, 'P498') - date_of_birth = get_time(claims, 'P569', locale, None) - if date_of_birth is not None: - attributes.append({'label': 'Date of birth', 'value': date_of_birth}) - - date_of_death = get_time(claims, 'P570', locale, None) - if date_of_death is not None: - attributes.append({'label': 'Date of death', 'value': date_of_death}) + image = add_image(result) if len(attributes) == 0 and len(urls) == 2 and len(description) == 0: results.append({ @@ -190,6 +302,7 @@ def getDetail(jsonresponse, wikidata_id, language, locale): 'infobox': title, 'id': wikipedia_link, 'content': description, + 'img_src': image, 'attributes': attributes, 'urls': urls }) @@ -197,92 +310,151 @@ def getDetail(jsonresponse, wikidata_id, language, locale): return results -def add_url(urls, title, url): - if url is not None: - urls.append({'title': title, 'url': url}) - return 1 +# only returns first match +def add_image(result): + # P15: route map, P242: locator map, P154: logo, P18: image, P242: map, P41: flag, P2716: collage, P2910: icon + property_ids = ['P15', 'P242', 'P154', 'P18', 'P242', 'P41', 'P2716', 'P2910'] + + for property_id in property_ids: + image = result.xpath(property_xpath.replace('{propertyid}', property_id)) + if image: + image_name = image[0].xpath(value_xpath) + image_src = url_image.replace('{filename}', extract_text(image_name[0])) + return image_src + + +# setting trim will only returned high ranked rows OR the first row +def add_attribute(attributes, result, property_id, default_label=None, date=False, trim=False): + attribute = result.xpath(property_xpath.replace('{propertyid}', property_id)) + if attribute: + + if default_label: + label = default_label + else: + label = extract_text(attribute[0].xpath(label_xpath)) + label = label[0].upper() + label[1:] + + if date: + trim = True + # remove calendar name + calendar_name = attribute[0].xpath(calendar_name_xpath) + for calendar in calendar_name: + calendar.getparent().remove(calendar) + + concat_values = "" + values = [] + first_value = None + for row in attribute[0].xpath(property_row_xpath): + if not first_value or not trim or row.xpath(preferred_rank_xpath): + + value = row.xpath(value_xpath) + if not value: + continue + value = extract_text(value) + + # save first value in case no ranked row is found + if trim and not first_value: + first_value = value + else: + # to avoid duplicate values + if value not in values: + concat_values += value + ", " + values.append(value) + + if trim and not values: + attributes.append({'label': label, + 'value': first_value}) + else: + attributes.append({'label': label, + 'value': concat_values[:-2]}) + + +# requires property_id unless it's a wiki link (defined in link_type) +def add_url(urls, result, property_id=None, default_label=None, url_prefix=None, results=None, link_type=None): + links = [] + + # wiki links don't have property in wikidata page + if link_type and 'wiki' in link_type: + links.append(get_wikilink(result, link_type)) else: - return 0 + dom_element = result.xpath(property_xpath.replace('{propertyid}', property_id)) + if dom_element: + dom_element = dom_element[0] + if not default_label: + label = extract_text(dom_element.xpath(label_xpath)) + label = label[0].upper() + label[1:] + + if link_type == 'geo': + links.append(get_geolink(dom_element)) + + elif link_type == 'imdb': + links.append(get_imdblink(dom_element, url_prefix)) + + else: + url_results = dom_element.xpath(url_xpath) + for link in url_results: + if link is not None: + if url_prefix: + link = url_prefix + extract_text(link) + else: + link = extract_text(link) + links.append(link) + + # append urls + for url in links: + if url is not None: + urls.append({'title': default_label or label, + 'url': url}) + if results is not None: + results.append({'title': default_label or label, + 'url': url}) -def get_mainsnak(claims, propertyName): - propValue = claims.get(propertyName, {}) - if len(propValue) == 0: +def get_imdblink(result, url_prefix): + imdb_id = result.xpath(value_xpath) + if imdb_id: + imdb_id = extract_text(imdb_id) + id_prefix = imdb_id[:2] + if id_prefix == 'tt': + url = url_prefix + 'title/' + imdb_id + elif id_prefix == 'nm': + url = url_prefix + 'name/' + imdb_id + elif id_prefix == 'ch': + url = url_prefix + 'character/' + imdb_id + elif id_prefix == 'co': + url = url_prefix + 'company/' + imdb_id + elif id_prefix == 'ev': + url = url_prefix + 'event/' + imdb_id + else: + url = None + return url + + +def get_geolink(result): + coordinates = result.xpath(value_xpath) + if not coordinates: return None + coordinates = extract_text(coordinates[0]) + latitude, longitude = coordinates.split(',') - propValue = propValue[0].get('mainsnak', None) - return propValue - - -def get_string(claims, propertyName, defaultValue=None): - propValue = claims.get(propertyName, {}) - if len(propValue) == 0: - return defaultValue - - result = [] - for e in propValue: - mainsnak = e.get('mainsnak', {}) - - datavalue = mainsnak.get('datavalue', {}) - if datavalue is not None: - result.append(datavalue.get('value', '')) - - if len(result) == 0: - return defaultValue - else: - # TODO handle multiple urls - return result[0] - - -def get_time(claims, propertyName, locale, defaultValue=None): - propValue = claims.get(propertyName, {}) - if len(propValue) == 0: - return defaultValue - - result = [] - for e in propValue: - mainsnak = e.get('mainsnak', {}) - - datavalue = mainsnak.get('datavalue', {}) - if datavalue is not None: - value = datavalue.get('value', '') - result.append(value.get('time', '')) - - if len(result) == 0: - date_string = defaultValue - else: - 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=''): - mainsnak = get_mainsnak(claims, propertyName) - - if mainsnak is None: - return defaultValue - - datatype = mainsnak.get('datatype', '') - datavalue = mainsnak.get('datavalue', {}) - - if datatype != 'globe-coordinate': - return defaultValue - - value = datavalue.get('value', {}) - - precision = value.get('precision', 0.0002) + # convert to decimal + lat = int(latitude[:latitude.find(u'°')]) + if latitude.find('\'') >= 0: + lat += int(latitude[latitude.find(u'°') + 1:latitude.find('\'')] or 0) / 60.0 + if latitude.find('"') >= 0: + lat += float(latitude[latitude.find('\'') + 1:latitude.find('"')] or 0) / 3600.0 + if latitude.find('S') >= 0: + lat *= -1 + lon = int(longitude[:longitude.find(u'°')]) + if longitude.find('\'') >= 0: + lon += int(longitude[longitude.find(u'°') + 1:longitude.find('\'')] or 0) / 60.0 + if longitude.find('"') >= 0: + lon += float(longitude[longitude.find('\'') + 1:longitude.find('"')] or 0) / 3600.0 + if longitude.find('W') >= 0: + lon *= -1 + # TODO: get precision + precision = 0.0002 # there is no zoom information, deduce from precision (error prone) # samples : # 13 --> 5 @@ -298,26 +470,20 @@ def get_geolink(claims, propertyName, defaultValue=''): zoom = int(15 - precision * 8.8322 + precision * precision * 0.625447) url = url_map\ - .replace('{latitude}', str(value.get('latitude', 0)))\ - .replace('{longitude}', str(value.get('longitude', 0)))\ + .replace('{latitude}', str(lat))\ + .replace('{longitude}', str(lon))\ .replace('{zoom}', str(zoom)) return url def get_wikilink(result, wikiid): - url = result.get('sitelinks', {}).get(wikiid, {}).get('url', None) - if url is None: - return url - elif url.startswith('http://'): + url = result.xpath(wikilink_xpath.replace('{wikiid}', wikiid)) + if not url: + return None + url = url[0] + if url.startswith('http://'): url = url.replace('http://', 'https://') elif url.startswith('//'): url = 'https:' + url return url - - -def get_wiki_firstlanguage(result, wikipatternid): - for k in result.get('sitelinks', {}).keys(): - if k.endswith(wikipatternid) and len(k) == (2 + len(wikipatternid)): - return k[0:2] - return None diff --git a/sources/searx/engines/wikipedia.py b/sources/searx/engines/wikipedia.py index fed7b26..70191d2 100644 --- a/sources/searx/engines/wikipedia.py +++ b/sources/searx/engines/wikipedia.py @@ -99,9 +99,8 @@ def response(resp): return [] # link to wikipedia article - # parenthesis are not quoted to make infobox mergeable with wikidata's wikipedia_link = url_lang(resp.search_params['language']) \ - + 'wiki/' + quote(title.replace(' ', '_').encode('utf8')).replace('%28', '(').replace('%29', ')') + + 'wiki/' + quote(title.replace(' ', '_').encode('utf8')) results.append({'url': wikipedia_link, 'title': title}) diff --git a/sources/searx/engines/wolframalpha_noapi.py b/sources/searx/engines/wolframalpha_noapi.py index 59629b8..3a8180f 100644 --- a/sources/searx/engines/wolframalpha_noapi.py +++ b/sources/searx/engines/wolframalpha_noapi.py @@ -8,11 +8,9 @@ # @stable no # @parse url, infobox -from cgi import escape from json import loads from time import time from urllib import urlencode -from lxml.etree import XML from searx.poolrequests import get as http_get @@ -36,7 +34,7 @@ search_url = url + 'input/json.jsp'\ referer_url = url + 'input/?{query}' token = {'value': '', - 'last_updated': None} + 'last_updated': 0} # pods to display as image in infobox # this pods do return a plaintext, but they look better and are more useful as images diff --git a/sources/searx/engines/www500px.py b/sources/searx/engines/www500px.py index c98e194..f1bc6c5 100644 --- a/sources/searx/engines/www500px.py +++ b/sources/searx/engines/www500px.py @@ -41,7 +41,7 @@ def response(resp): results = [] dom = html.fromstring(resp.text) - regex = re.compile('3\.jpg.*$') + regex = re.compile(r'3\.jpg.*$') # parse results for result in dom.xpath('//div[@class="photo"]'): diff --git a/sources/searx/engines/xpath.py b/sources/searx/engines/xpath.py index e701c02..e5c0c5b 100644 --- a/sources/searx/engines/xpath.py +++ b/sources/searx/engines/xpath.py @@ -87,7 +87,7 @@ def request(query, params): fp = {'query': query} if paging and search_url.find('{pageno}') >= 0: - fp['pageno'] = (params['pageno'] + first_page_num - 1) * page_size + fp['pageno'] = (params['pageno'] - 1) * page_size + first_page_num params['url'] = search_url.format(**fp) params['query'] = query diff --git a/sources/searx/engines/yahoo.py b/sources/searx/engines/yahoo.py index b8b40e4..8e24a28 100644 --- a/sources/searx/engines/yahoo.py +++ b/sources/searx/engines/yahoo.py @@ -20,10 +20,12 @@ from searx.engines.xpath import extract_text, extract_url categories = ['general'] paging = True language_support = True +time_range_support = True # search-url base_url = 'https://search.yahoo.com/' search_url = 'search?{query}&b={offset}&fl=1&vl=lang_{lang}' +search_url_with_time = 'search?{query}&b={offset}&fl=1&vl=lang_{lang}&age={age}&btf={btf}&fr2=time' # specific xpath variables results_xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' Sr ')]" @@ -32,6 +34,10 @@ title_xpath = './/h3/a' content_xpath = './/div[@class="compText aAbs"]' suggestion_xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' AlsoTry ')]//a" +time_range_dict = {'day': ['1d', 'd'], + 'week': ['1w', 'w'], + 'month': ['1m', 'm']} + # remove yahoo-specific tracking-url def parse_url(url_string): @@ -51,18 +57,30 @@ def parse_url(url_string): return unquote(url_string[start:end]) +def _get_url(query, offset, language, time_range): + if time_range in time_range_dict: + return base_url + search_url_with_time.format(offset=offset, + query=urlencode({'p': query}), + lang=language, + age=time_range_dict[time_range][0], + btf=time_range_dict[time_range][1]) + return base_url + search_url.format(offset=offset, + query=urlencode({'p': query}), + lang=language) + + +def _get_language(params): + if params['language'] == 'all': + return 'en' + return params['language'].split('_')[0] + + # do search-request def request(query, params): offset = (params['pageno'] - 1) * 10 + 1 + language = _get_language(params) - if params['language'] == 'all': - language = 'en' - else: - language = params['language'].split('_')[0] - - params['url'] = base_url + search_url.format(offset=offset, - query=urlencode({'p': query}), - lang=language) + params['url'] = _get_url(query, offset, language, params['time_range']) # TODO required? params['cookies']['sB'] = 'fl=1&vl=lang_{lang}&sh=1&rw=new&v=1'\ diff --git a/sources/searx/engines/yahoo_news.py b/sources/searx/engines/yahoo_news.py index d4cfbed..e91c1d3 100644 --- a/sources/searx/engines/yahoo_news.py +++ b/sources/searx/engines/yahoo_news.py @@ -55,7 +55,7 @@ def request(query, params): def sanitize_url(url): if ".yahoo.com/" in url: - return re.sub(u"\;\_ylt\=.+$", "", url) + return re.sub(u"\\;\\_ylt\\=.+$", "", url) else: return url diff --git a/sources/searx/plugins/__init__.py b/sources/searx/plugins/__init__.py index efb9b06..768a510 100644 --- a/sources/searx/plugins/__init__.py +++ b/sources/searx/plugins/__init__.py @@ -19,15 +19,17 @@ from searx import logger logger = logger.getChild('plugins') -from searx.plugins import (https_rewrite, +from searx.plugins import (doai_rewrite, + https_rewrite, + infinite_scroll, open_results_on_new_tab, self_info, search_on_category_select, tracker_url_remover, vim_hotkeys) -required_attrs = (('name', str), - ('description', str), +required_attrs = (('name', (str, unicode)), + ('description', (str, unicode)), ('default_on', bool)) optional_attrs = (('js_dependencies', tuple), @@ -73,7 +75,9 @@ class PluginStore(): plugins = PluginStore() +plugins.register(doai_rewrite) plugins.register(https_rewrite) +plugins.register(infinite_scroll) plugins.register(open_results_on_new_tab) plugins.register(self_info) plugins.register(search_on_category_select) diff --git a/sources/searx/plugins/doai_rewrite.py b/sources/searx/plugins/doai_rewrite.py new file mode 100644 index 0000000..fc5998b --- /dev/null +++ b/sources/searx/plugins/doai_rewrite.py @@ -0,0 +1,31 @@ +from flask_babel import gettext +import re +from urlparse import urlparse, parse_qsl + +regex = re.compile(r'10\.\d{4,9}/[^\s]+') + +name = gettext('DOAI rewrite') +description = gettext('Avoid paywalls by redirecting to open-access versions of publications when available') +default_on = False + + +def extract_doi(url): + match = regex.search(url.path) + if match: + return match.group(0) + for _, v in parse_qsl(url.query): + match = regex.search(v) + if match: + return match.group(0) + return None + + +def on_result(request, ctx): + doi = extract_doi(ctx['result']['parsed_url']) + if doi and len(doi) < 50: + for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'): + if doi.endswith(suffix): + doi = doi[:-len(suffix)] + ctx['result']['url'] = 'http://doai.io/' + doi + ctx['result']['parsed_url'] = urlparse(ctx['result']['url']) + return True diff --git a/sources/searx/plugins/https_rewrite.py b/sources/searx/plugins/https_rewrite.py index 0a58cc8..8a9fcd4 100644 --- a/sources/searx/plugins/https_rewrite.py +++ b/sources/searx/plugins/https_rewrite.py @@ -21,7 +21,7 @@ from lxml import etree from os import listdir, environ from os.path import isfile, isdir, join from searx.plugins import logger -from flask.ext.babel import gettext +from flask_babel import gettext from searx import searx_dir @@ -87,7 +87,7 @@ def load_single_https_ruleset(rules_path): # convert host-rule to valid regex host = ruleset.attrib.get('host')\ - .replace('.', '\.').replace('*', '.*') + .replace('.', r'\.').replace('*', '.*') # append to host list hosts.append(host) diff --git a/sources/searx/plugins/infinite_scroll.py b/sources/searx/plugins/infinite_scroll.py new file mode 100644 index 0000000..422a4be --- /dev/null +++ b/sources/searx/plugins/infinite_scroll.py @@ -0,0 +1,8 @@ +from flask_babel import gettext + +name = gettext('Infinite scroll') +description = gettext('Automatically load next page when scrolling to bottom of current page') +default_on = False + +js_dependencies = ('plugins/js/infinite_scroll.js',) +css_dependencies = ('plugins/css/infinite_scroll.css',) diff --git a/sources/searx/plugins/open_results_on_new_tab.py b/sources/searx/plugins/open_results_on_new_tab.py index 5ebece1..ae27ea2 100644 --- a/sources/searx/plugins/open_results_on_new_tab.py +++ b/sources/searx/plugins/open_results_on_new_tab.py @@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2016 by Adam Tauber, ''' -from flask.ext.babel import gettext +from flask_babel import gettext name = gettext('Open result links on new browser tabs') description = gettext('Results are opened in the same window by default. ' 'This plugin overwrites the default behaviour to open links on new tabs/windows. ' diff --git a/sources/searx/plugins/search_on_category_select.py b/sources/searx/plugins/search_on_category_select.py index 53585fa..f72c63d 100644 --- a/sources/searx/plugins/search_on_category_select.py +++ b/sources/searx/plugins/search_on_category_select.py @@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2015 by Adam Tauber, ''' -from flask.ext.babel import gettext +from flask_babel import gettext name = gettext('Search on category select') description = gettext('Perform search immediately if a category selected. ' 'Disable to select multiple categories. (JavaScript required)') diff --git a/sources/searx/plugins/self_info.py b/sources/searx/plugins/self_info.py index dc6b7cd..438274c 100644 --- a/sources/searx/plugins/self_info.py +++ b/sources/searx/plugins/self_info.py @@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2015 by Adam Tauber, ''' -from flask.ext.babel import gettext +from flask_babel import gettext import re name = "Self Informations" description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".') @@ -29,6 +29,8 @@ p = re.compile('.*user[ -]agent.*', re.IGNORECASE) # request: flask request object # ctx: the whole local context of the pre search hook def post_search(request, ctx): + if ctx['search'].pageno > 1: + return True if ctx['search'].query == 'ip': x_forwarded_for = request.headers.getlist("X-Forwarded-For") if x_forwarded_for: diff --git a/sources/searx/plugins/tracker_url_remover.py b/sources/searx/plugins/tracker_url_remover.py index ed71c94..b909e3f 100644 --- a/sources/searx/plugins/tracker_url_remover.py +++ b/sources/searx/plugins/tracker_url_remover.py @@ -15,7 +15,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2015 by Adam Tauber, ''' -from flask.ext.babel import gettext +from flask_babel import gettext import re from urlparse import urlunparse diff --git a/sources/searx/plugins/vim_hotkeys.py b/sources/searx/plugins/vim_hotkeys.py index e537a3a..8f06f13 100644 --- a/sources/searx/plugins/vim_hotkeys.py +++ b/sources/searx/plugins/vim_hotkeys.py @@ -1,4 +1,4 @@ -from flask.ext.babel import gettext +from flask_babel import gettext name = gettext('Vim-like hotkeys') description = gettext('Navigate search results with Vim-like hotkeys ' diff --git a/sources/searx/preferences.py b/sources/searx/preferences.py index dd9133d..ed7b6f6 100644 --- a/sources/searx/preferences.py +++ b/sources/searx/preferences.py @@ -166,6 +166,7 @@ class SwitchableSetting(Setting): class EnginesSetting(SwitchableSetting): + def _post_init(self): super(EnginesSetting, self)._post_init() transformed_choices = [] @@ -191,6 +192,7 @@ class EnginesSetting(SwitchableSetting): class PluginsSetting(SwitchableSetting): + def _post_init(self): super(PluginsSetting, self)._post_init() transformed_choices = [] @@ -225,7 +227,8 @@ class Preferences(object): 'safesearch': MapSetting(settings['search']['safe_search'], map={'0': 0, '1': 1, '2': 2}), - 'theme': EnumStringSetting(settings['ui']['default_theme'], choices=themes)} + 'theme': EnumStringSetting(settings['ui']['default_theme'], choices=themes), + 'results_on_new_tab': MapSetting(False, map={'0': False, '1': True})} self.engines = EnginesSetting('engines', choices=engines) self.plugins = PluginsSetting('plugins', choices=plugins) diff --git a/sources/searx/results.py b/sources/searx/results.py index dcd966e..32832f1 100644 --- a/sources/searx/results.py +++ b/sources/searx/results.py @@ -5,7 +5,7 @@ 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) +CONTENT_LEN_IGNORED_CHARS_REGEX = re.compile(r'[,;:!?\./\\\\ ()-_]', re.M | re.U) WHITESPACE_REGEX = re.compile('( |\t|\n)+', re.M | re.U) @@ -18,7 +18,17 @@ def result_content_len(content): def compare_urls(url_a, url_b): - if url_a.netloc != url_b.netloc or url_a.query != url_b.query: + # ignore www. in comparison + if url_a.netloc.startswith('www.'): + host_a = url_a.netloc.replace('www.', '', 1) + else: + host_a = url_a.netloc + if url_b.netloc.startswith('www.'): + host_b = url_b.netloc.replace('www.', '', 1) + else: + host_b = url_b.netloc + + if host_a != host_b or url_a.query != url_b.query or url_a.fragment != url_b.fragment: return False # remove / from the end of the url if required @@ -33,25 +43,42 @@ def compare_urls(url_a, url_b): def merge_two_infoboxes(infobox1, infobox2): + # get engines weights + if hasattr(engines[infobox1['engine']], 'weight'): + weight1 = engines[infobox1['engine']].weight + else: + weight1 = 1 + if hasattr(engines[infobox2['engine']], 'weight'): + weight2 = engines[infobox2['engine']].weight + else: + weight2 = 1 + + if weight2 > weight1: + infobox1['engine'] = infobox2['engine'] + if 'urls' in infobox2: urls1 = infobox1.get('urls', None) if urls1 is None: urls1 = [] - infobox1['urls'] = urls1 - urlSet = set() - for url in infobox1.get('urls', []): - urlSet.add(url.get('url', None)) + for url2 in infobox2.get('urls', []): + unique_url = True + for url1 in infobox1.get('urls', []): + if compare_urls(urlparse(url1.get('url', '')), urlparse(url2.get('url', ''))): + unique_url = False + break + if unique_url: + urls1.append(url2) - for url in infobox2.get('urls', []): - if url.get('url', None) not in urlSet: - urls1.append(url) + infobox1['urls'] = urls1 if 'img_src' in infobox2: img1 = infobox1.get('img_src', None) img2 = infobox2.get('img_src') if img1 is None: infobox1['img_src'] = img2 + elif weight2 > weight1: + infobox1['img_src'] = img2 if 'attributes' in infobox2: attributes1 = infobox1.get('attributes', None) @@ -65,7 +92,8 @@ def merge_two_infoboxes(infobox1, infobox2): attributeSet.add(attribute.get('label', None)) for attribute in infobox2.get('attributes', []): - attributes1.append(attribute) + if attribute.get('label', None) not in attributeSet: + attributes1.append(attribute) if 'content' in infobox2: content1 = infobox1.get('content', None) @@ -91,15 +119,15 @@ def result_score(result): 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() - self.number_of_results = 0 + self._number_of_results = [] def extend(self, engine_name, results): for result in list(results): @@ -113,7 +141,7 @@ class ResultContainer(object): self._merge_infobox(result) results.remove(result) elif 'number_of_results' in result: - self.number_of_results = max(self.number_of_results, result['number_of_results']) + self._number_of_results.append(result['number_of_results']) results.remove(result) with RLock(): @@ -137,14 +165,13 @@ class ResultContainer(object): 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 + for existingIndex in self.infoboxes: + if compare_urls(urlparse(existingIndex.get('id', '')), urlparse(infobox_id)): + merge_two_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']) @@ -154,11 +181,6 @@ class ResultContainer(object): result['parsed_url'] = result['parsed_url']._replace(scheme="http") result['url'] = result['parsed_url'].geturl() - 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 @@ -252,3 +274,9 @@ class ResultContainer(object): def results_length(self): return len(self._merged_results) + + def results_number(self): + resultnum_sum = sum(self._number_of_results) + if not resultnum_sum or not self._number_of_results: + return 0 + return resultnum_sum / len(self._number_of_results) diff --git a/sources/searx/search.py b/sources/searx/search.py index a408016..c6d17eb 100644 --- a/sources/searx/search.py +++ b/sources/searx/search.py @@ -15,14 +15,15 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2013- by Adam Tauber, ''' +import gc import threading -import searx.poolrequests as requests_lib +from thread import start_new_thread from time import time -from searx import settings +from uuid import uuid4 +import searx.poolrequests as requests_lib from searx.engines import ( categories, engines ) -from searx.languages import language_codes from searx.utils import gen_useragent from searx.query import Query from searx.results import ResultContainer @@ -56,19 +57,20 @@ def search_request_wrapper(fn, url, engine_name, **kwargs): def threaded_requests(requests): timeout_limit = max(r[2]['timeout'] for r in requests) search_start = time() + search_id = uuid4().__str__() for fn, url, request_args, engine_name in requests: request_args['timeout'] = timeout_limit th = threading.Thread( target=search_request_wrapper, args=(fn, url, engine_name), kwargs=request_args, - name='search_request', + name=search_id, ) th._engine_name = engine_name th.start() for th in threading.enumerate(): - if th.name == 'search_request': + if th.name == search_id: remaining_time = max(0.0, timeout_limit - (time() - search_start)) th.join(remaining_time) if th.isAlive(): @@ -138,6 +140,8 @@ class Search(object): self.paging = False self.pageno = 1 self.lang = 'all' + self.time_range = None + self.is_advanced = None # set blocked engines self.disabled_engines = request.preferences.engines.get_disabled() @@ -178,9 +182,10 @@ class Search(object): if len(query_obj.languages): self.lang = query_obj.languages[-1] - self.engines = query_obj.engines + self.time_range = self.request_data.get('time_range') + self.is_advanced = self.request_data.get('advanced_search') - self.categories = [] + self.engines = query_obj.engines # if engines are calculated from query, # set categories by using that informations @@ -279,6 +284,9 @@ class Search(object): if self.lang != 'all' and not engine.language_support: continue + if self.time_range and not engine.time_range_support: + continue + # set default request parameters request_params = default_request_params() request_params['headers']['User-Agent'] = user_agent @@ -293,6 +301,8 @@ class Search(object): # 0 = None, 1 = Moderate, 2 = Strict request_params['safesearch'] = request.preferences.get_value('safesearch') + request_params['time_range'] = self.time_range + request_params['advanced_search'] = self.is_advanced # update request parameters dependent on # search-engine (contained in engines folder) @@ -339,6 +349,7 @@ class Search(object): return self # send all search-request threaded_requests(requests) + start_new_thread(gc.collect, tuple()) # return results, suggestions, answers and infoboxes return self diff --git a/sources/searx/settings.yml b/sources/searx/settings.yml index 9308756..4969c4a 100644 --- a/sources/searx/settings.yml +++ b/sources/searx/settings.yml @@ -25,7 +25,7 @@ outgoing: # communication with search engines pool_maxsize : 10 # Number of simultaneous requests by host # uncomment below section if you want to use a proxy # see http://docs.python-requests.org/en/latest/user/advanced/#proxies -# SOCKS proxies are not supported : see https://github.com/kennethreitz/requests/pull/478 +# SOCKS proxies are also supported: see http://docs.python-requests.org/en/master/user/advanced/#socks # proxies : # http : http://127.0.0.1:8080 # https: http://127.0.0.1:8080 @@ -84,9 +84,15 @@ engines: disabled : True shortcut : bb - - name : btdigg - engine : btdigg - shortcut : bt + - name : crossref + engine : json_engine + paging : True + search_url : http://search.crossref.org/dois?q={query}&page={pageno} + url_query : doi + title_query : title + content_query : fullCitation + categories : science + shortcut : cr - name : currency engine : currency_convert @@ -105,6 +111,13 @@ engines: - name : ddg definitions engine : duckduckgo_definitions shortcut : ddd + weight : 2 + disabled : True + + - name : digbt + engine : digbt + shortcut : dbt + timeout : 6.0 disabled : True - name : digg @@ -127,10 +140,12 @@ engines: - name : wikidata engine : wikidata shortcut : wd + weight : 2 - name : duckduckgo engine : duckduckgo shortcut : ddg + disabled : True # api-key required: http://www.faroo.com/hp/api/api.html#key # - name : faroo @@ -200,6 +215,20 @@ engines: engine : google_news shortcut : gon + - name : google scholar + engine : xpath + paging : True + search_url : https://scholar.google.com/scholar?start={pageno}&q={query}&hl=en&as_sdt=0,5&as_vis=1 + results_xpath : //div[@class="gs_r"]/div[@class="gs_ri"] + url_xpath : .//h3/a/@href + title_xpath : .//h3/a + content_xpath : .//div[@class="gs_rs"] + suggestion_xpath : //div[@id="gs_qsuggest"]/ul/li + page_size : 10 + first_page_num : 0 + categories : science + shortcut : gos + - name : google play apps engine : xpath search_url : https://play.google.com/store/search?q={query}&c=apps @@ -254,6 +283,37 @@ engines: disabled : True shortcut : habr + - name : hoogle + engine : json_engine + paging : True + search_url : https://www.haskell.org/hoogle/?mode=json&hoogle={query}&start={pageno} + results_query : results + url_query : location + title_query : self + content_query : docs + page_size : 20 + categories : it + shortcut : ho + + - name : ina + engine : ina + shortcut : in + timeout : 6.0 + disabled : True + + - name : microsoft academic + engine : json_engine + paging : True + search_url : https://academic.microsoft.com/api/search/GetEntityResults?query=%40{query}%40&filters=&offset={pageno}&limit=8&correlationId=undefined + results_query : results + url_query : u + title_query : dn + content_query : d + page_size : 8 + first_page_num : 0 + categories : science + shortcut : ma + - name : mixcloud engine : mixcloud shortcut : mc @@ -267,6 +327,18 @@ engines: engine : openstreetmap shortcut : osm + - name : openrepos + engine : xpath + paging : True + search_url : https://openrepos.net/search/node/{query}?page={pageno} + url_xpath : //li[@class="search-result"]//h3[@class="title"]/a/@href + title_xpath : //li[@class="search-result"]//h3[@class="title"]/a + content_xpath : //li[@class="search-result"]//div[@class="search-snippet-info"]//p[@class="search-snippet"] + categories : files + timeout : 4.0 + disabled : True + shortcut : or + - name : photon engine : photon shortcut : ph @@ -274,7 +346,8 @@ engines: - name : piratebay engine : piratebay shortcut : tpb - disabled : True + url: https://pirateproxy.red/ + timeout : 3.0 - name : qwant engine : qwant @@ -304,9 +377,10 @@ engines: timeout : 10.0 disabled : True - - name : kickass - engine : kickass - shortcut : ka + - name : scanr_structures + shortcut: scs + engine : scanr_structures + disabled : True - name : soundcloud engine : soundcloud @@ -361,11 +435,6 @@ engines: timeout : 6.0 disabled : True - - name : torrentz - engine : torrentz - timeout : 5.0 - shortcut : to - - name : twitter engine : twitter shortcut : tw @@ -426,6 +495,19 @@ engines: timeout: 6.0 categories : science + - name : dictzone + engine : dictzone + shortcut : dc + + - name : mymemory translated + engine : translated + shortcut : tl + timeout : 5.0 + disabled : True + # You can use without an API key, but you are limited to 1000 words/day + # See : http://mymemory.translated.net/doc/usagelimits.php + # api_key : '' + #The blekko technology and team have joined IBM Watson! -> https://blekko.com/ # - name : blekko images # engine : blekko_images diff --git a/sources/searx/static/plugins/css/infinite_scroll.css b/sources/searx/static/plugins/css/infinite_scroll.css new file mode 100644 index 0000000..7e0ee20 --- /dev/null +++ b/sources/searx/static/plugins/css/infinite_scroll.css @@ -0,0 +1,16 @@ +@keyframes rotate-forever { + 0% { transform: rotate(0deg) } + 100% { transform: rotate(360deg) } +} +.loading-spinner { + animation-duration: 0.75s; + animation-iteration-count: infinite; + animation-name: rotate-forever; + animation-timing-function: linear; + height: 30px; + width: 30px; + border: 8px solid #666; + border-right-color: transparent; + border-radius: 50% !important; + margin: 0 auto; +} diff --git a/sources/searx/static/plugins/js/infinite_scroll.js b/sources/searx/static/plugins/js/infinite_scroll.js new file mode 100644 index 0000000..213f74b --- /dev/null +++ b/sources/searx/static/plugins/js/infinite_scroll.js @@ -0,0 +1,18 @@ +$(document).ready(function() { + var win = $(window); + win.scroll(function() { + if ($(document).height() - win.height() == win.scrollTop()) { + var formData = $('#pagination form:last').serialize(); + if (formData) { + $('#pagination').html(''); + $.post('/', formData, function (data) { + var body = $(data); + $('#pagination').remove(); + $('#main_results').append('
'); + $('#main_results').append(body.find('.result')); + $('#main_results').append(body.find('#pagination')); + }); + } + } + }); +}); diff --git a/sources/searx/static/plugins/js/search_on_category_select.js b/sources/searx/static/plugins/js/search_on_category_select.js index 5ecc2cd..19aeef9 100644 --- a/sources/searx/static/plugins/js/search_on_category_select.js +++ b/sources/searx/static/plugins/js/search_on_category_select.js @@ -4,13 +4,16 @@ $(document).ready(function() { $('#categories input[type="checkbox"]').each(function(i, checkbox) { $(checkbox).prop('checked', false); }); - $('#categories label').removeClass('btn-primary').removeClass('active').addClass('btn-default'); - $(this).removeClass('btn-default').addClass('btn-primary').addClass('active'); - $($(this).children()[0]).prop('checked', 'checked'); + $(document.getElementById($(this).attr("for"))).prop('checked', true); if($('#q').val()) { $('#search_form').submit(); } return false; }); + $('#time-range > option').click(function(e) { + if($('#q').val()) { + $('#search_form').submit(); + } + }); } }); diff --git a/sources/searx/static/themes/oscar/css/logicodev.min.css b/sources/searx/static/themes/oscar/css/logicodev.min.css index 4f9fffb..bd58aa5 100644 --- a/sources/searx/static/themes/oscar/css/logicodev.min.css +++ b/sources/searx/static/themes/oscar/css/logicodev.min.css @@ -1 +1 @@ -.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{background:#29314d;color:#01d7d4}.navbar>li>a{padding:0;margin:0}.navbar-nav>li>a{background:#29314d;padding:0 8px;margin:0;line-height:30px}.navbar,.navbar-default{background-color:#29314d;border:none;border-top:4px solid #01d7d4;padding-top:5px;color:#f6f9fa!important;font-weight:700;font-size:1.1em;text-transform:lowercase;margin-bottom:24px;height:30px;line-height:30px;z-index:1}.navbar .navbar-nav>li>a,.navbar-default .navbar-nav>li>a{color:#f6f9fa}.navbar .navbar-brand,.navbar-default .navbar-brand{font-weight:700;color:#01d7d4;line-height:30px;padding:0 30px;margin:0}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#01d7d4;background:#29314d}.navbar-toggle{margin-top:0}*{border-radius:0!important}html{position:relative;min-height:100%;color:#29314d}body{font-family:Roboto,Helvetica,Arial,sans-serif;margin-bottom:80px;background-color:#fff}body a{color:#08c}.footer{position:absolute;bottom:0;width:100%;height:60px;text-align:center;color:#999}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.result_header{margin-top:6px;margin-bottom:4px;font-size:16px}.result_header .favicon{margin-bottom:-3px}.result_header a{color:#29314d;text-decoration:none}.result_header a:hover{color:#08c}.result_header a:visited{color:#684898}.result_header a .highlight{background-color:#f6f9fa}.result-content{margin-top:2px;margin-bottom:0;word-wrap:break-word;color:#666;font-size:13px}.result-content .highlight{font-weight:700}.external-link,.external-link a{color:#2ecc71}.external-link a,.external-link a a{margin-right:3px}.result-default,.result-code,.result-torrent,.result-videos,.result-map{clear:both;padding:2px 4px}.result-default:hover,.result-code:hover,.result-torrent:hover,.result-videos:hover,.result-map:hover{background-color:#f6f9fa}.result-images{float:left!important;width:24%;margin:.5%}.result-images a{display:block;width:100%;height:170px;background-size:cover}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-videos hr{margin:5px 0 15px 0}.result-videos .collapse{width:100%}.result-videos .in{margin-bottom:8px}.result-torrent{clear:both}.result-torrent b{margin-right:5px;margin-left:5px}.result-torrent .seeders{color:#2ecc71}.result-torrent .leechers{color:#f35e77}.result-map{clear:both}.result-code{clear:both}.result-code .code-fork,.result-code .code-fork a{color:#666}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:60px}.label-default{color:#a4a4a4;background:0 0}.infobox .panel-heading{background-color:#f6f9fa}.infobox .panel-heading .panel-title{font-weight:700}.infobox p{font-family:"DejaVu Serif",Georgia,Cambria,"Times New Roman",Times,serif!important;font-style:italic}.infobox .btn{background-color:#2ecc71;border:none}.infobox .btn a{color:#fff;margin:5px}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories,#categories{margin:10px 0 4px 0;text-transform:capitalize}.search_categories label,#categories label{border:none;box-shadow:none;font-size:13px;padding-bottom:2px;color:#a4a4a4;margin-bottom:5px}.search_categories label:hover,#categories label:hover{color:#29314d;background-color:transparent}.search_categories label:active,#categories label:active{box-shadow:none}.search_categories .active,#categories .active,.search_categories .btn-primary,#categories .btn-primary{color:#29314d;font-weight:700;border-bottom:5px solid #01d7d4;background-color:transparent}#categories{margin:0}#main-logo{margin-top:10vh;margin-bottom:25px}#main-logo>img{max-width:350px;width:80%}#q{box-shadow:none;border-right:none;border-color:#a4a4a4}#search_form .input-group-btn .btn{border-color:#a4a4a4}#search_form .input-group-btn .btn:hover{background-color:#2ecc71;color:#fff}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}pre,code{font-family:'Ubuntu Mono','Courier New','Lucida Console',monospace!important}.lineno{margin-right:5px}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#556366;font-style:italic}.highlight .err{border:1px solid #ffa92f}.highlight .k{color:#BE74D5;font-weight:700}.highlight .o{color:#d19a66}.highlight .cm{color:#556366;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#556366;font-style:italic}.highlight .cs{color:#556366;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:#BE74D5;font-weight:700}.highlight .kd{color:#BE74D5;font-weight:700}.highlight .kn{color:#BE74D5;font-weight:700}.highlight .kp{color:#be74d5}.highlight .kr{color:#BE74D5;font-weight:700}.highlight .kt{color:#d46c72}.highlight .m{color:#d19a66}.highlight .s{color:#86c372}.highlight .na{color:#7d9029}.highlight .nb{color:#be74d5}.highlight .nc{color:#61AFEF;font-weight:700}.highlight .no{color:#d19a66}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#61afef}.highlight .nl{color:#a0a000}.highlight .nn{color:#61AFEF;font-weight:700}.highlight .nt{color:#BE74D5;font-weight:700}.highlight .nv{color:#dfc06f}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#d7dae0}.highlight .mf{color:#d19a66}.highlight .mh{color:#d19a66}.highlight .mi{color:#d19a66}.highlight .mo{color:#d19a66}.highlight .sb{color:#86c372}.highlight .sc{color:#86c372}.highlight .sd{color:#86C372;font-style:italic}.highlight .s2{color:#86c372}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#86c372}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:#be74d5}.highlight .sr{color:#b68}.highlight .s1{color:#86c372}.highlight .ss{color:#dfc06f}.highlight .bp{color:#be74d5}.highlight .vc{color:#dfc06f}.highlight .vg{color:#dfc06f}.highlight .vi{color:#dfc06f}.highlight .il{color:#d19a66}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;color:#556366}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}.highlight pre{background-color:#282C34;color:#D7DAE0;border:none;margin-bottom:25px;font-size:15px;padding:20px 10px}.highlight{font-weight:700} \ No newline at end of file +.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{background:#29314d;color:#01d7d4}.navbar>li>a{padding:0;margin:0}.navbar-nav>li>a{background:#29314d;padding:0 8px;margin:0;line-height:30px}.navbar,.navbar-default{background-color:#29314d;border:none;border-top:4px solid #01d7d4;padding-top:5px;color:#f6f9fa!important;font-weight:700;font-size:1.1em;text-transform:lowercase;margin-bottom:24px;height:30px;line-height:30px;z-index:10}.navbar .navbar-nav>li>a,.navbar-default .navbar-nav>li>a{color:#f6f9fa}.navbar .navbar-brand,.navbar-default .navbar-brand{font-weight:700;color:#01d7d4;line-height:30px;padding:0 30px;margin:0}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#01d7d4;background:#29314d}.navbar-toggle{margin-top:0}*{border-radius:0!important}html{position:relative;min-height:100%;color:#29314d}body{font-family:Roboto,Helvetica,Arial,sans-serif;margin-bottom:80px;background-color:#fff}body a{color:#08c}.footer{position:absolute;bottom:0;width:100%;height:60px;text-align:center;color:#999}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.onoff-checkbox{width:15%}.onoffswitch{position:relative;width:110px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #FFF!important;border-radius:50px!important}.onoffswitch-inner{display:block;transition:margin .3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:30px;padding:0;line-height:40px;font-size:20px;box-sizing:border-box;content:"";background-color:#EEE}.onoffswitch-switch{display:block;width:37px;background-color:#01d7d4;position:absolute;top:0;bottom:0;right:0;border:2px solid #FFF!important;border-radius:50px!important;transition:all .3s ease-in 0s}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-right:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:71px;background-color:#A1A1A1}.result_header{margin-top:6px;margin-bottom:4px;font-size:16px}.result_header .favicon{margin-bottom:-3px}.result_header a{color:#29314d;text-decoration:none}.result_header a:hover{color:#08c}.result_header a:visited{color:#684898}.result_header a .highlight{background-color:#f6f9fa}.result-content{margin-top:2px;margin-bottom:0;word-wrap:break-word;color:#666;font-size:13px}.result-content .highlight{font-weight:700}.external-link,.external-link a{color:#2ecc71}.external-link a,.external-link a a{margin-right:3px}.result-default,.result-code,.result-torrent,.result-videos,.result-map{clear:both;padding:2px 4px}.result-default:hover,.result-code:hover,.result-torrent:hover,.result-videos:hover,.result-map:hover{background-color:#f6f9fa}.result-images{float:left!important;width:24%;margin:.5%}.result-images a{display:block;width:100%;background-size:cover}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-videos hr{margin:5px 0 15px 0}.result-videos .collapse{width:100%}.result-videos .in{margin-bottom:8px}.result-torrent{clear:both}.result-torrent b{margin-right:5px;margin-left:5px}.result-torrent .seeders{color:#2ecc71}.result-torrent .leechers{color:#f35e77}.result-map{clear:both}.result-code{clear:both}.result-code .code-fork,.result-code .code-fork a{color:#666}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:60px}.label-default{color:#a4a4a4;background:0 0}.result .text-muted small{word-wrap:break-word}.modal-wrapper{box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-wrapper{background-clip:padding-box;background-color:#fff;border:1px solid rgba(0,0,0,.2);border-radius:6px;box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0 none;position:relative}.infobox .panel-heading{background-color:#f6f9fa}.infobox .panel-heading .panel-title{font-weight:700}.infobox p{font-family:"DejaVu Serif",Georgia,Cambria,"Times New Roman",Times,serif!important;font-style:italic}.infobox .btn{background-color:#2ecc71;border:none}.infobox .btn a{color:#fff;margin:5px}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories,#categories{text-transform:capitalize;margin-bottom:.5rem;display:flex;flex-wrap:wrap;flex-flow:row wrap;align-content:stretch}.search_categories label,#categories label,.search_categories .input-group-addon,#categories .input-group-addon{flex-grow:1;flex-basis:auto;font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;border-right:none;color:#666;padding-bottom:.4rem;padding-top:.4rem;text-align:center}.search_categories label:last-child,#categories label:last-child,.search_categories .input-group-addon:last-child,#categories .input-group-addon:last-child{border-right:#ddd 1px solid}.search_categories input[type=checkbox]:checked+label,#categories input[type=checkbox]:checked+label{color:#29314d;font-weight:700;border-bottom:#01d7d4 5px solid}#main-logo{margin-top:10vh;margin-bottom:25px}#main-logo>img{max-width:350px;width:80%}#q{box-shadow:none;border-right:none;border-color:#a4a4a4}#search_form .input-group-btn .btn{border-color:#a4a4a4}#search_form .input-group-btn .btn:hover{background-color:#2ecc71;color:#fff}#advanced-search-container{display:none;text-align:left;margin-bottom:1rem;clear:both}#advanced-search-container label,#advanced-search-container .input-group-addon{font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;border-right:none;color:#666;padding-bottom:.4rem;padding-right:.7rem;padding-left:.7rem}#advanced-search-container label:last-child,#advanced-search-container .input-group-addon:last-child{border-right:#ddd 1px solid}#advanced-search-container input[type=radio]{display:none}#advanced-search-container input[type=radio]:checked+label{color:#29314d;font-weight:700;border-bottom:#01d7d4 5px solid}#advanced-search-container select{appearance:none;-webkit-appearance:none;-moz-appearance:none;font-size:1.2rem;font-weight:400;background-color:#fff;border:#ddd 1px solid;color:#666;padding-bottom:.4rem;padding-top:.4rem;padding-left:1rem;padding-right:5rem;margin-right:.5rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGnsAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW86/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNy0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC) 96% no-repeat}#check-advanced{display:none}#check-advanced:checked~#advanced-search-container{display:block}.advanced{padding:0;margin-top:.3rem;text-align:right}.advanced label,.advanced select{cursor:pointer}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}pre,code{font-family:'Ubuntu Mono','Courier New','Lucida Console',monospace!important}.lineno{margin-right:5px}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#556366;font-style:italic}.highlight .err{border:1px solid #ffa92f}.highlight .k{color:#BE74D5;font-weight:700}.highlight .o{color:#d19a66}.highlight .cm{color:#556366;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#556366;font-style:italic}.highlight .cs{color:#556366;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:#BE74D5;font-weight:700}.highlight .kd{color:#BE74D5;font-weight:700}.highlight .kn{color:#BE74D5;font-weight:700}.highlight .kp{color:#be74d5}.highlight .kr{color:#BE74D5;font-weight:700}.highlight .kt{color:#d46c72}.highlight .m{color:#d19a66}.highlight .s{color:#86c372}.highlight .na{color:#7d9029}.highlight .nb{color:#be74d5}.highlight .nc{color:#61AFEF;font-weight:700}.highlight .no{color:#d19a66}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#61afef}.highlight .nl{color:#a0a000}.highlight .nn{color:#61AFEF;font-weight:700}.highlight .nt{color:#BE74D5;font-weight:700}.highlight .nv{color:#dfc06f}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#d7dae0}.highlight .mf{color:#d19a66}.highlight .mh{color:#d19a66}.highlight .mi{color:#d19a66}.highlight .mo{color:#d19a66}.highlight .sb{color:#86c372}.highlight .sc{color:#86c372}.highlight .sd{color:#86C372;font-style:italic}.highlight .s2{color:#86c372}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#86c372}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:#be74d5}.highlight .sr{color:#b68}.highlight .s1{color:#86c372}.highlight .ss{color:#dfc06f}.highlight .bp{color:#be74d5}.highlight .vc{color:#dfc06f}.highlight .vg{color:#dfc06f}.highlight .vi{color:#dfc06f}.highlight .il{color:#d19a66}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;color:#556366}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}.highlight pre{background-color:#282C34;color:#D7DAE0;border:none;margin-bottom:25px;font-size:15px;padding:20px 10px}.highlight{font-weight:700} \ No newline at end of file diff --git a/sources/searx/static/themes/oscar/css/pointhi.min.css b/sources/searx/static/themes/oscar/css/pointhi.min.css index 29f7497..0c2472c 100644 --- a/sources/searx/static/themes/oscar/css/pointhi.min.css +++ b/sources/searx/static/themes/oscar/css/pointhi.min.css @@ -1 +1 @@ -html{position:relative;min-height:100%}body{margin-bottom:80px}.footer{position:absolute;bottom:0;width:100%;height:60px}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.result_header{margin-bottom:5px;margin-top:20px}.result_header .favicon{margin-bottom:-3px}.result_header a{vertical-align:bottom}.result_header a .highlight{font-weight:700}.result-content{margin-top:5px;word-wrap:break-word}.result-content .highlight{font-weight:700}.result-default{clear:both}.result-images{float:left!important}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-torrents{clear:both}.result-map{clear:both}.result-code{clear:both}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:50px}.label-default{color:#AAA;background:#FFF}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories{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 red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:green;font-weight:700}.highlight .kd{color:green;font-weight:700}.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177c}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#BA2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#ba2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:green}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0} \ No newline at end of file +html{position:relative;min-height:100%}body{margin-bottom:80px}.footer{position:absolute;bottom:0;width:100%;height:60px}input[type=checkbox]:checked+.label_hide_if_checked,input[type=checkbox]:checked+.label_hide_if_not_checked+.label_hide_if_checked{display:none}input[type=checkbox]:not(:checked)+.label_hide_if_not_checked,input[type=checkbox]:not(:checked)+.label_hide_if_checked+.label_hide_if_not_checked{display:none}.onoff-checkbox{width:15%}.onoffswitch{position:relative;width:110px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border:2px solid #FFF!important;border-radius:50px!important}.onoffswitch-inner{display:block;transition:margin .3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:30px;padding:0;line-height:40px;font-size:20px;box-sizing:border-box;content:"";background-color:#EEE}.onoffswitch-switch{display:block;width:37px;background-color:#0C0;position:absolute;top:0;bottom:0;right:0;border:2px solid #FFF!important;border-radius:50px!important;transition:all .3s ease-in 0s}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-right:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:71px;background-color:#A1A1A1}.result_header{margin-bottom:5px;margin-top:20px}.result_header .favicon{margin-bottom:-3px}.result_header a{vertical-align:bottom}.result_header a .highlight{font-weight:700}.result-content{margin-top:5px;word-wrap:break-word}.result-content .highlight{font-weight:700}.result-default{clear:both}.result-images{float:left!important}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-torrents{clear:both}.result-map{clear:both}.result-code{clear:both}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:50px}.label-default{color:#AAA;background:#FFF}.result .text-muted small{word-wrap:break-word}.modal-wrapper{box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-wrapper{background-clip:padding-box;background-color:#fff;border:1px solid rgba(0,0,0,.2);border-radius:6px;box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0 none;position:relative}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories,#categories{text-transform:capitalize;margin-bottom:1.5rem;margin-top:1.5rem;display:flex;flex-wrap:wrap;align-content:stretch}.search_categories label,#categories label,.search_categories .input-group-addon,#categories .input-group-addon{flex-grow:1;flex-basis:auto;font-size:1.3rem;font-weight:400;background-color:#fff;border:#DDD 1px solid;border-right:none;color:#333;padding-bottom:.8rem;padding-top:.8rem;text-align:center}.search_categories label:last-child,#categories label:last-child,.search_categories .input-group-addon:last-child,#categories .input-group-addon:last-child{border-right:#DDD 1px solid}.search_categories input[type=checkbox]:checked+label,#categories input[type=checkbox]:checked+label{color:#000;font-weight:700;background-color:#EEE}#advanced-search-container{display:none;text-align:center;margin-bottom:1rem;clear:both}#advanced-search-container label,#advanced-search-container .input-group-addon{font-size:1.3rem;font-weight:400;background-color:#fff;border:#DDD 1px solid;border-right:none;color:#333;padding-bottom:.8rem;padding-left:1.2rem;padding-right:1.2rem}#advanced-search-container label:last-child,#advanced-search-container .input-group-addon:last-child{border-right:#DDD 1px solid}#advanced-search-container input[type=radio]{display:none}#advanced-search-container input[type=radio]:checked+label{color:#000;font-weight:700;background-color:#EEE}#check-advanced{display:none}#check-advanced:checked~#advanced-search-container{display:block}.advanced{padding:0;margin-top:.3rem;text-align:right}.advanced label,.advanced select{cursor:pointer}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080;font-style:italic}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:green;font-weight:700}.highlight .kd{color:green;font-weight:700}.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177c}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#BA2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#ba2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:green}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0} \ No newline at end of file diff --git a/sources/searx/static/themes/oscar/js/searx.min.js b/sources/searx/static/themes/oscar/js/searx.min.js index 8a1055d..9bc4aae 100644 --- a/sources/searx/static/themes/oscar/js/searx.min.js +++ b/sources/searx/static/themes/oscar/js/searx.min.js @@ -1,2 +1,2 @@ -/*! oscar/searx.min.js | 09-01-2015 | https://github.com/asciimoo/searx */ -requirejs.config({baseUrl:"./static/themes/oscar/js",paths:{app:"../app"}}),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"./autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){searx.autocompleter&&$("#q").typeahead(null,{name:"search-results",displayKey:function(a){return a},source:searx.searchResults.ttAdapter()})}),$(document).ready(function(){$("#q.autofocus").focus(),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var a=$(this).data("btn-text-collapsed"),b=$(this).data("btn-text-not-collapsed");""!==a&&""!==b&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(a,b):$(this).html().replace(b,a),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var a="btn-"+$(this).data("btn-class"),b=$(this).data("btn-label-default"),c=$(this).data("btn-label-toggled");""!==c&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(b,c):$(this).html().replace(c,b),$(this).html(new_html)),$(this).toggleClass(a),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var a=$(this).data("target"),b=$(a+" > iframe"),c=b.attr("src");(void 0===c||c===!1)&&b.attr("src",b.data("src"))}),$(".btn-sm").dblclick(function(){var a="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(a),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(a),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(a){var b="https://overpass-api.de/api/interpreter?data=",c=b+"[out:json][timeout:25];(",d=");out meta;",e=$(this).data("osm-id"),f=$(this).data("osm-type"),g=$(this).data("result-table"),h="#"+$(this).data("result-table-loadicon"),i=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(e&&f&&g){g="#"+g;var j=null;switch(f){case"node":j=c+"node("+e+");"+d;break;case"way":j=c+"way("+e+");"+d;break;case"relation":j=c+"relation("+e+");"+d}if(j){$.ajax(j).done(function(a){if(a&&a.elements&&a.elements[0]){var b=a.elements[0],c=$(g).html();for(var d in b.tags)if(null===b.tags.name||-1==i.indexOf(d)){switch(c+=""+d+"",d){case"phone":case"fax":c+=''+b.tags[d]+"";break;case"email":c+=''+b.tags[d]+"";break;case"website":case"url":c+=''+b.tags[d]+"";break;case"wikidata":c+=''+b.tags[d]+"";break;case"wikipedia":if(-1!=b.tags[d].indexOf(":")){c+=''+b.tags[d]+"";break}default:c+=b.tags[d]}c+=""}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'

could not load data!

')})}}$(this).off(a)}),$(".searx_init_map").on("click",function(a){var b=$(this).data("leaflet-target"),c=$(this).data("map-lon"),d=$(this).data("map-lat"),e=$(this).data("map-zoom"),f=$(this).data("map-boundingbox"),g=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(){f&&(southWest=L.latLng(f[0],f[2]),northEast=L.latLng(f[1],f[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";{var a=L.map(b),h="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",i='Map data © OpenStreetMap contributors',j=new L.TileLayer(h,{minZoom:1,maxZoom:19,attribution:i}),k="http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg",l='Map data © OpenStreetMap contributors | Tiles Courtesy of MapQuest ',m=new L.TileLayer(k,{minZoom:1,maxZoom:18,subdomains:"1234",attribution:l}),n="http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg",o='Map data © OpenStreetMap contributors | Tiles Courtesy of MapQuest | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';new L.TileLayer(n,{minZoom:1,maxZoom:11,subdomains:"1234",attribution:o})}map_bounds?setTimeout(function(){a.fitBounds(map_bounds,{maxZoom:17})},0):c&&d&&(e?a.setView(new L.LatLng(d,c),e):a.setView(new L.LatLng(d,c),8)),a.addLayer(m);var p={"OSM Mapnik":j,MapQuest:m};L.control.layers(p).addTo(a),g&&L.geoJson(g).addTo(a)}),$(this).off(a)})}); \ No newline at end of file +/*! oscar/searx.min.js | 25-07-2016 | https://github.com/asciimoo/searx */ +requirejs.config({baseUrl:"./static/themes/oscar/js",paths:{app:"../app"}}),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"./autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){searx.autocompleter&&$("#q").typeahead(null,{name:"search-results",displayKey:function(a){return a},source:searx.searchResults.ttAdapter()})}),$(document).ready(function(){$("#q.autofocus").focus(),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var a=$(this).data("btn-text-collapsed"),b=$(this).data("btn-text-not-collapsed");""!==a&&""!==b&&($(this).hasClass("collapsed")?new_html=$(this).html().replace(a,b):new_html=$(this).html().replace(b,a),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var a="btn-"+$(this).data("btn-class"),b=$(this).data("btn-label-default"),c=$(this).data("btn-label-toggled");""!==c&&($(this).hasClass("btn-default")?new_html=$(this).html().replace(b,c):new_html=$(this).html().replace(c,b),$(this).html(new_html)),$(this).toggleClass(a),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var a=$(this).data("target"),b=$(a+" > iframe"),c=b.attr("src");void 0!==c&&c!==!1||b.attr("src",b.data("src"))}),$(".btn-sm").dblclick(function(){var a="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(a),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(a),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(a){var b="https://overpass-api.de/api/interpreter?data=",c=b+"[out:json][timeout:25];(",d=");out meta;",e=$(this).data("osm-id"),f=$(this).data("osm-type"),g=$(this).data("result-table"),h="#"+$(this).data("result-table-loadicon"),i=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(e&&f&&g){g="#"+g;var j=null;switch(f){case"node":j=c+"node("+e+");"+d;break;case"way":j=c+"way("+e+");"+d;break;case"relation":j=c+"relation("+e+");"+d}if(j){$.ajax(j).done(function(a){if(a&&a.elements&&a.elements[0]){var b=a.elements[0],c=$(g).html();for(var d in b.tags)if(null===b.tags.name||i.indexOf(d)==-1){switch(c+=""+d+"",d){case"phone":case"fax":c+=''+b.tags[d]+"";break;case"email":c+=''+b.tags[d]+"";break;case"website":case"url":c+=''+b.tags[d]+"";break;case"wikidata":c+=''+b.tags[d]+"";break;case"wikipedia":if(b.tags[d].indexOf(":")!=-1){c+=''+b.tags[d]+"";break}default:c+=b.tags[d]}c+=""}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'

could not load data!

')})}}$(this).off(a)}),$(".searx_init_map").on("click",function(a){var b=$(this).data("leaflet-target"),c=$(this).data("map-lon"),d=$(this).data("map-lat"),e=$(this).data("map-zoom"),f=$(this).data("map-boundingbox"),g=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(a){f&&(southWest=L.latLng(f[0],f[2]),northEast=L.latLng(f[1],f[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";var h=L.map(b),i="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",j='Map data © OpenStreetMap contributors',k=new L.TileLayer(i,{minZoom:1,maxZoom:19,attribution:j}),l="https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png",m='Wikimedia maps beta | Maps data © OpenStreetMap contributors';new L.TileLayer(l,{minZoom:1,maxZoom:19,attribution:m});map_bounds?setTimeout(function(){h.fitBounds(map_bounds,{maxZoom:17})},0):c&&d&&(e?h.setView(new L.LatLng(d,c),e):h.setView(new L.LatLng(d,c),8)),h.addLayer(k);var n={"OSM Mapnik":k};L.control.layers(n).addTo(h),g&&L.geoJson(g).addTo(h)}),$(this).off(a)})}); \ No newline at end of file diff --git a/sources/searx/static/themes/oscar/js/searx_src/leaflet_map.js b/sources/searx/static/themes/oscar/js/searx_src/leaflet_map.js index cbcbe15..4be46ac 100644 --- a/sources/searx/static/themes/oscar/js/searx_src/leaflet_map.js +++ b/sources/searx/static/themes/oscar/js/searx_src/leaflet_map.js @@ -122,17 +122,13 @@ $(document).ready(function(){ var map = L.map(leaflet_target); // create the tile layer with correct attribution - var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; - var osmMapnikAttrib='Map data © OpenStreetMap contributors'; - var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib}); - - var osmMapquestUrl='http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg'; - var osmMapquestAttrib='Map data © OpenStreetMap contributors | Tiles Courtesy of MapQuest '; - var osmMapquest = new L.TileLayer(osmMapquestUrl, {minZoom: 1, maxZoom: 18, subdomains: '1234', attribution: osmMapquestAttrib}); - - var osmMapquestOpenAerialUrl='http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg'; - var osmMapquestOpenAerialAttrib='Map data © OpenStreetMap contributors | Tiles Courtesy of MapQuest | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency'; - var osmMapquestOpenAerial = new L.TileLayer(osmMapquestOpenAerialUrl, {minZoom: 1, maxZoom: 11, subdomains: '1234', attribution: osmMapquestOpenAerialAttrib}); + var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; + var osmMapnikAttrib='Map data © OpenStreetMap contributors'; + var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib}); + + var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'; + var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © OpenStreetMap contributors'; + var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib}); // init map view if(map_bounds) { @@ -149,12 +145,11 @@ $(document).ready(function(){ map.setView(new L.LatLng(map_lat, map_lon),8); } - map.addLayer(osmMapquest); + map.addLayer(osmMapnik); var baseLayers = { - "OSM Mapnik": osmMapnik, - "MapQuest": osmMapquest/*, - "MapQuest Open Aerial": osmMapquestOpenAerial*/ + "OSM Mapnik": osmMapnik/*, + "OSM Wikimedia": osmWikimedia*/ }; L.control.layers(baseLayers).addTo(map); diff --git a/sources/searx/static/themes/oscar/less/logicodev/advanced.less b/sources/searx/static/themes/oscar/less/logicodev/advanced.less new file mode 100644 index 0000000..3b2cd3c --- /dev/null +++ b/sources/searx/static/themes/oscar/less/logicodev/advanced.less @@ -0,0 +1,72 @@ +#advanced-search-container { + display: none; + text-align: left; + margin-bottom: 1rem; + clear: both; + + label, .input-group-addon { + font-size: 1.2rem; + font-weight:normal; + background-color: white; + border: @mild-gray 1px solid; + border-right: none; + color: @dark-gray; + padding-bottom: 0.4rem; + padding-right: 0.7rem; + padding-left: 0.7rem; + } + + label:last-child, .input-group-addon:last-child { + border-right: @mild-gray 1px solid; + } + + input[type="radio"] { + display: none; + } + + input[type="radio"]:checked + label{ + color: @black; + font-weight: bold; + border-bottom: @light-green 5px solid; + } + select { + appearance: none; + -webkit-appearance: none; + -moz-appearance: none; + font-size: 1.2rem; + font-weight:normal; + background-color: white; + border: @mild-gray 1px solid; + color: @dark-gray; + padding-bottom: 0.4rem; + padding-top: 0.4rem; + padding-left: 1rem; + padding-right: 5rem; + margin-right: 0.5rem; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ +cwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGn +sAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW8 +6/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0 +ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0w +Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb +7jwaAAAAAElFTkSuQmCC) 96% no-repeat; + } +} + +#check-advanced { + display: none; +} + +#check-advanced:checked ~ #advanced-search-container { + display: block; +} + +.advanced { + padding: 0; + margin-top: 0.3rem; + text-align: right; + label, select { + cursor: pointer; + } +} diff --git a/sources/searx/static/themes/oscar/less/logicodev/navbar.less b/sources/searx/static/themes/oscar/less/logicodev/navbar.less index 493c9dc..2426210 100644 --- a/sources/searx/static/themes/oscar/less/logicodev/navbar.less +++ b/sources/searx/static/themes/oscar/less/logicodev/navbar.less @@ -39,7 +39,7 @@ padding: 0 30px; margin: 0; } - z-index: 1; + z-index: 10; } // Hover color diff --git a/sources/searx/static/themes/oscar/less/logicodev/onoff.less b/sources/searx/static/themes/oscar/less/logicodev/onoff.less new file mode 100644 index 0000000..f471892 --- /dev/null +++ b/sources/searx/static/themes/oscar/less/logicodev/onoff.less @@ -0,0 +1,57 @@ +.onoff-checkbox { + width:15%; +} +.onoffswitch { + position: relative; + width: 110px; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select: none; +} +.onoffswitch-checkbox { + display: none; +} +.onoffswitch-label { + display: block; + overflow: hidden; + cursor: pointer; + border: 2px solid #FFFFFF !important; + border-radius: 50px !important; +} +.onoffswitch-inner { + display: block; + transition: margin 0.3s ease-in 0s; +} + +.onoffswitch-inner:before, .onoffswitch-inner:after { + display: block; + float: left; + width: 50%; + height: 30px; + padding: 0; + line-height: 40px; + font-size: 20px; + box-sizing: border-box; + content: ""; + background-color: #EEEEEE; +} + +.onoffswitch-switch { + display: block; + width: 37px; + background-color: @light-green; + position: absolute; + top: 0; + bottom: 0; + right: 0px; + border: 2px solid #FFFFFF !important; + border-radius: 50px !important; + transition: all 0.3s ease-in 0s; +} +.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner { + margin-right: 0; +} +.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch { + right: 71px; + background-color: #A1A1A1; +} diff --git a/sources/searx/static/themes/oscar/less/logicodev/oscar.less b/sources/searx/static/themes/oscar/less/logicodev/oscar.less index fba596c..55181cb 100644 --- a/sources/searx/static/themes/oscar/less/logicodev/oscar.less +++ b/sources/searx/static/themes/oscar/less/logicodev/oscar.less @@ -6,12 +6,16 @@ @import "checkbox.less"; +@import "onoff.less"; + @import "results.less"; @import "infobox.less"; @import "search.less"; +@import "advanced.less"; + @import "cursor.less"; @import "code.less"; diff --git a/sources/searx/static/themes/oscar/less/logicodev/results.less b/sources/searx/static/themes/oscar/less/logicodev/results.less index 37a5a76..9e57da7 100644 --- a/sources/searx/static/themes/oscar/less/logicodev/results.less +++ b/sources/searx/static/themes/oscar/less/logicodev/results.less @@ -6,7 +6,7 @@ .favicon { margin-bottom:-3px; } - + a { color: @black; text-decoration: none; @@ -18,7 +18,7 @@ &:visited{ color: @violet; } - + .highlight { background-color: @dim-gray; // Chrome hack: bold is different size than normal @@ -64,10 +64,9 @@ float: left !important; width: 24%; margin: .5%; - a{ + a { display: block; width: 100%; - height: 170px; background-size: cover; } } @@ -148,3 +147,21 @@ color: @gray; background: transparent; } + +.result .text-muted small { + word-wrap: break-word; +} + +.modal-wrapper { + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); +} + +.modal-wrapper { + background-clip: padding-box; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + outline: 0 none; + position: relative; +} diff --git a/sources/searx/static/themes/oscar/less/logicodev/search.less b/sources/searx/static/themes/oscar/less/logicodev/search.less index 1bb71a7..4ebfe88 100644 --- a/sources/searx/static/themes/oscar/less/logicodev/search.less +++ b/sources/searx/static/themes/oscar/less/logicodev/search.less @@ -1,36 +1,33 @@ .search_categories, #categories { - margin: 10px 0 4px 0; text-transform: capitalize; - - label{ - border: none; - box-shadow: none; - font-size: 13px; - padding-bottom: 2px; - color: @gray; - margin-bottom: 5px; + margin-bottom: 0.5rem; + display: flex; + flex-wrap: wrap; + flex-flow: row wrap; + align-content: stretch; - &:hover{ - color: @black; - background-color: transparent; - } - - &:active{ - box-shadow: none; - } + label, .input-group-addon { + flex-grow: 1; + flex-basis: auto; + font-size: 1.2rem; + font-weight: normal; + background-color: white; + border: @mild-gray 1px solid; + border-right: none; + color: @dark-gray; + padding-bottom: 0.4rem; + padding-top: 0.4rem; + text-align: center; + } + label:last-child, .input-group-addon:last-child { + border-right: @mild-gray 1px solid; } - .active, .btn-primary{ + input[type="checkbox"]:checked + label { color: @black; - font-weight: 700; - border-bottom: 5px solid @light-green; - background-color: transparent; + font-weight: bold; + border-bottom: @light-green 5px solid; } - -} - -#categories{ - margin: 0; } #main-logo{ diff --git a/sources/searx/static/themes/oscar/less/logicodev/variables.less b/sources/searx/static/themes/oscar/less/logicodev/variables.less index 3ca05e7..32d5bb9 100644 --- a/sources/searx/static/themes/oscar/less/logicodev/variables.less +++ b/sources/searx/static/themes/oscar/less/logicodev/variables.less @@ -2,7 +2,9 @@ @gray: #A4A4A4; @dim-gray: #F6F9FA; @dark-gray: #666; -@blue: #0088CC; +@middle-gray: #F5F5F5; +@mild-gray: #DDD; +@blue: #0088CC; @red: #F35E77; @violet: #684898; @green: #2ecc71; diff --git a/sources/searx/static/themes/oscar/less/pointhi/advanced.less b/sources/searx/static/themes/oscar/less/pointhi/advanced.less new file mode 100644 index 0000000..23bfdb0 --- /dev/null +++ b/sources/searx/static/themes/oscar/less/pointhi/advanced.less @@ -0,0 +1,49 @@ +#advanced-search-container { + display: none; + text-align: center; + margin-bottom: 1rem; + clear: both; + + label, .input-group-addon { + font-size: 1.3rem; + font-weight:normal; + background-color: white; + border: #DDD 1px solid; + border-right: none; + color: #333; + padding-bottom: 0.8rem; + padding-left: 1.2rem; + padding-right: 1.2rem; + } + + label:last-child, .input-group-addon:last-child { + border-right: #DDD 1px solid; + } + + input[type="radio"] { + display: none; + } + + input[type="radio"]:checked + label { + color: black; + font-weight: bold; + background-color: #EEE; + } +} + +#check-advanced { + display: none; +} + +#check-advanced:checked ~ #advanced-search-container { + display: block; +} + +.advanced { + padding: 0; + margin-top: 0.3rem; + text-align: right; + label, select { + cursor: pointer; + } +} diff --git a/sources/searx/static/themes/oscar/less/pointhi/onoff.less b/sources/searx/static/themes/oscar/less/pointhi/onoff.less new file mode 100644 index 0000000..72b289a --- /dev/null +++ b/sources/searx/static/themes/oscar/less/pointhi/onoff.less @@ -0,0 +1,57 @@ +.onoff-checkbox { + width:15%; +} +.onoffswitch { + position: relative; + width: 110px; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select: none; +} +.onoffswitch-checkbox { + display: none; +} +.onoffswitch-label { + display: block; + overflow: hidden; + cursor: pointer; + border: 2px solid #FFFFFF !important; + border-radius: 50px !important; +} +.onoffswitch-inner { + display: block; + transition: margin 0.3s ease-in 0s; +} + +.onoffswitch-inner:before, .onoffswitch-inner:after { + display: block; + float: left; + width: 50%; + height: 30px; + padding: 0; + line-height: 40px; + font-size: 20px; + box-sizing: border-box; + content: ""; + background-color: #EEEEEE; +} + +.onoffswitch-switch { + display: block; + width: 37px; + background-color: #00CC00; + position: absolute; + top: 0; + bottom: 0; + right: 0px; + border: 2px solid #FFFFFF !important; + border-radius: 50px !important; + transition: all 0.3s ease-in 0s; +} +.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner { + margin-right: 0; +} +.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch { + right: 71px; + background-color: #A1A1A1; +} diff --git a/sources/searx/static/themes/oscar/less/pointhi/oscar.less b/sources/searx/static/themes/oscar/less/pointhi/oscar.less index 6a84785..ef69ace 100644 --- a/sources/searx/static/themes/oscar/less/pointhi/oscar.less +++ b/sources/searx/static/themes/oscar/less/pointhi/oscar.less @@ -2,12 +2,16 @@ @import "checkbox.less"; +@import "onoff.less"; + @import "results.less"; @import "infobox.less"; @import "search.less"; +@import "advanced.less"; + @import "cursor.less"; @import "code.less"; diff --git a/sources/searx/static/themes/oscar/less/pointhi/results.less b/sources/searx/static/themes/oscar/less/pointhi/results.less index b3d8700..beea353 100644 --- a/sources/searx/static/themes/oscar/less/pointhi/results.less +++ b/sources/searx/static/themes/oscar/less/pointhi/results.less @@ -6,10 +6,10 @@ .favicon { margin-bottom:-3px; } - + a { vertical-align: bottom; - + .highlight { font-weight:bold; } @@ -81,3 +81,21 @@ color: #AAA; background: #FFF; } + +.result .text-muted small { + word-wrap: break-word; +} + +.modal-wrapper { + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); +} + +.modal-wrapper { + background-clip: padding-box; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + outline: 0 none; + position: relative; +} diff --git a/sources/searx/static/themes/oscar/less/pointhi/search.less b/sources/searx/static/themes/oscar/less/pointhi/search.less index f95ab50..cea6799 100644 --- a/sources/searx/static/themes/oscar/less/pointhi/search.less +++ b/sources/searx/static/themes/oscar/less/pointhi/search.less @@ -1,4 +1,32 @@ -.search_categories { - margin:10px 0; - text-transform: capitalize; +.search_categories, #categories { + text-transform: capitalize; + margin-bottom: 1.5rem; + margin-top: 1.5rem; + display: flex; + flex-wrap: wrap; + align-content: stretch; + + label, .input-group-addon { + flex-grow: 1; + flex-basis: auto; + font-size: 1.3rem; + font-weight: normal; + background-color: white; + border: #DDD 1px solid; + border-right: none; + color: #333; + padding-bottom: 0.8rem; + padding-top: 0.8rem; + text-align: center; + } + + label:last-child, .input-group-addon:last-child { + border-right: #DDD 1px solid; + } + + input[type="checkbox"]:checked + label{ + color: black; + font-weight: bold; + background-color: #EEE; + } } diff --git a/sources/searx/templates/courgette/404.html b/sources/searx/templates/courgette/404.html new file mode 100644 index 0000000..77f1287 --- /dev/null +++ b/sources/searx/templates/courgette/404.html @@ -0,0 +1,9 @@ +{% extends "courgette/base.html" %} +{% block content %} +
+

{{ _('Page not found') }}

+ {% autoescape false %} +

{{ _('Go to %(search_page)s.', search_page='{}'.decode('utf-8').format(url_for('index'), _('search page'))) }}

+ {% endautoescape %} +
+{% endblock %} diff --git a/sources/searx/templates/courgette/about.html b/sources/searx/templates/courgette/about.html index 2945e1f..3855d46 100644 --- a/sources/searx/templates/courgette/about.html +++ b/sources/searx/templates/courgette/about.html @@ -6,20 +6,20 @@

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users.

-

Why use Searx?

+

Why use searx?

    -
  • Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • -
  • Searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • -
  • Searx is free software, the code is 100% open and you can help to make it better. See more on github
    • +
  • searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • +
  • searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • +
  • searx is free software, the code is 100% open and you can help to make it better. See more on github

If you do care about privacy, want to be a conscious user, or otherwise believe - in digital freedom, make Searx your default search engine or run it on your own server

+ in digital freedom, make searx your default search engine or run it on your own server

Technical details - How does it work?

Searx is a metasearch engine, inspired by the seeks project.
-It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests.
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, searx uses the search bar to perform GET requests.
Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.

diff --git a/sources/searx/templates/courgette/base.html b/sources/searx/templates/courgette/base.html index 276fae8..b2c70a3 100644 --- a/sources/searx/templates/courgette/base.html +++ b/sources/searx/templates/courgette/base.html @@ -2,7 +2,7 @@ - + diff --git a/sources/searx/templates/courgette/result_templates/code.html b/sources/searx/templates/courgette/result_templates/code.html index 726f305..953617e 100644 --- a/sources/searx/templates/courgette/result_templates/code.html +++ b/sources/searx/templates/courgette/result_templates/code.html @@ -1,8 +1,8 @@
-

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

+

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

- {% if result.repository %}

{{ result.repository }}

{% endif %} + {% if result.repository %}

{{ result.repository }}

{% endif %}
{{ result.codelines|code_highlighter(result.code_language)|safe }}
diff --git a/sources/searx/templates/courgette/result_templates/default.html b/sources/searx/templates/courgette/result_templates/default.html index 585ecf3..5f2ead6 100644 --- a/sources/searx/templates/courgette/result_templates/default.html +++ b/sources/searx/templates/courgette/result_templates/default.html @@ -5,7 +5,7 @@ {% endif %}
-

{{ result.title|safe }}

+

{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

{% if result.content %}{{ result.content|safe }}
{% endif %}

{{ result.pretty_url }}‎

diff --git a/sources/searx/templates/courgette/result_templates/images.html b/sources/searx/templates/courgette/result_templates/images.html index 87fc774..49acb3b 100644 --- a/sources/searx/templates/courgette/result_templates/images.html +++ b/sources/searx/templates/courgette/result_templates/images.html @@ -1,6 +1,6 @@

- {{ result.title|striptags }} - {{ _('original context') }} + {{ result.title|striptags }} + {{ _('original context') }}

diff --git a/sources/searx/templates/courgette/result_templates/map.html b/sources/searx/templates/courgette/result_templates/map.html index 585ecf3..5f2ead6 100644 --- a/sources/searx/templates/courgette/result_templates/map.html +++ b/sources/searx/templates/courgette/result_templates/map.html @@ -5,7 +5,7 @@ {% endif %}
-

{{ result.title|safe }}

+

{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

{% if result.content %}{{ result.content|safe }}
{% endif %}

{{ result.pretty_url }}‎

diff --git a/sources/searx/templates/courgette/result_templates/torrent.html b/sources/searx/templates/courgette/result_templates/torrent.html index 33b5742..2fd8395 100644 --- a/sources/searx/templates/courgette/result_templates/torrent.html +++ b/sources/searx/templates/courgette/result_templates/torrent.html @@ -2,12 +2,12 @@ {% if "icon_"~result.engine~".ico" in favicons %} {{result.engine}} {% endif %} -

{{ result.title|safe }}

+

{{ result.title|safe }}

{% if result.content %}{{ result.content|safe }}
{% endif %} {{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}
{% if result.magnetlink %}{{ _('magnet link') }}{% endif %} - {% if result.torrentfile %}{{ _('torrent file') }}{% endif %} + {% if result.torrentfile %}{{ _('torrent file') }}{% endif %}

{{ result.pretty_url }}‎

diff --git a/sources/searx/templates/courgette/result_templates/videos.html b/sources/searx/templates/courgette/result_templates/videos.html index ceed8b2..b3e19e0 100644 --- a/sources/searx/templates/courgette/result_templates/videos.html +++ b/sources/searx/templates/courgette/result_templates/videos.html @@ -3,8 +3,8 @@ {{result.engine}} {% endif %} -

{{ result.title|safe }}

+

{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}
{% endif %} - {{ result.title|striptags }} + {{ result.title|striptags }}

{{ result.pretty_url }}‎

diff --git a/sources/searx/templates/default/404.html b/sources/searx/templates/default/404.html new file mode 100644 index 0000000..1d88f86 --- /dev/null +++ b/sources/searx/templates/default/404.html @@ -0,0 +1,9 @@ +{% extends "default/base.html" %} +{% block content %} +
+

{{ _('Page not found') }}

+ {% autoescape false %} +

{{ _('Go to %(search_page)s.', search_page='{}'.decode('utf-8').format(url_for('index'), _('search page'))) }}

+ {% endautoescape %} +
+{% endblock %} diff --git a/sources/searx/templates/default/about.html b/sources/searx/templates/default/about.html index 1b5fc34..f21a6f2 100644 --- a/sources/searx/templates/default/about.html +++ b/sources/searx/templates/default/about.html @@ -6,20 +6,20 @@

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users.

-

Why use Searx?

+

Why use searx?

    -
  • Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • -
  • Searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • -
  • Searx is free software, the code is 100% open and you can help to make it better. See more on github
    • +
  • searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • +
  • searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • +
  • searx is free software, the code is 100% open and you can help to make it better. See more on github

If you do care about privacy, want to be a conscious user, or otherwise believe - in digital freedom, make Searx your default search engine or run it on your own server

+ in digital freedom, make searx your default search engine or run it on your own server

Technical details - How does it work?

Searx is a metasearch engine, inspired by the seeks project.
-It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, if Searx used from the search bar it performs GET requests.
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, if searx used from the search bar it performs GET requests.
Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.

diff --git a/sources/searx/templates/default/base.html b/sources/searx/templates/default/base.html index 143bdb8..a2c38fe 100644 --- a/sources/searx/templates/default/base.html +++ b/sources/searx/templates/default/base.html @@ -2,7 +2,7 @@ - + diff --git a/sources/searx/templates/default/infobox.html b/sources/searx/templates/default/infobox.html index 178a27e..4dd25fa 100644 --- a/sources/searx/templates/default/infobox.html +++ b/sources/searx/templates/default/infobox.html @@ -1,18 +1,18 @@
-

{{ infobox.infobox }}

+

{{ infobox.infobox }}

{% if infobox.img_src %}{{ infobox.infobox|striptags }}{% endif %} -

{{ infobox.entity }}

-

{{ infobox.content | safe }}

+

{{ infobox.entity }}

+

{{ infobox.content | safe }}

{% if infobox.attributes %}
{% for attribute in infobox.attributes %} - + {% if attribute.image %} {% else %} - + {% endif %} {% endfor %} @@ -24,7 +24,7 @@
@@ -34,7 +34,7 @@
{% for topic in infobox.relatedTopics %}
-

{{ topic.name }}

+

{{ topic.name }}

{% for suggestion in topic.suggestions %}
diff --git a/sources/searx/templates/default/preferences.html b/sources/searx/templates/default/preferences.html index a47dba4..1de9d22 100644 --- a/sources/searx/templates/default/preferences.html +++ b/sources/searx/templates/default/preferences.html @@ -80,6 +80,15 @@

+
+ {{ _('Results on new tabs') }} +

+ +

+
{{ _('Currently used search engines') }} diff --git a/sources/searx/templates/default/result_templates/code.html b/sources/searx/templates/default/result_templates/code.html index ad1d97e..9e3ed20 100644 --- a/sources/searx/templates/default/result_templates/code.html +++ b/sources/searx/templates/default/result_templates/code.html @@ -1,9 +1,9 @@
-

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

-

{{ result.pretty_url }}‎ {{ _('cached') }}

+

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

+

{{ result.pretty_url }}‎ {{ _('cached') }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

- {% if result.repository %}

{{ result.repository }}

{% endif %} + {% if result.repository %}

{{ result.repository }}

{% endif %}
{{ result.codelines|code_highlighter(result.code_language)|safe }} diff --git a/sources/searx/templates/default/result_templates/default.html b/sources/searx/templates/default/result_templates/default.html index 89091e2..da09117 100644 --- a/sources/searx/templates/default/result_templates/default.html +++ b/sources/searx/templates/default/result_templates/default.html @@ -1,6 +1,6 @@
-

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

-

{{ result.pretty_url }}‎ {{ _('cached') }} +

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

+

{{ result.pretty_url }}‎ {{ _('cached') }} {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/sources/searx/templates/default/result_templates/images.html b/sources/searx/templates/default/result_templates/images.html index d85f841..00f62ab 100644 --- a/sources/searx/templates/default/result_templates/images.html +++ b/sources/searx/templates/default/result_templates/images.html @@ -1,6 +1,6 @@

- {{ result.title|striptags }} - {{ _('original context') }} + {{ result.title|striptags }} + {{ _('original context') }}

diff --git a/sources/searx/templates/default/result_templates/map.html b/sources/searx/templates/default/result_templates/map.html index d413742..0200e0f 100644 --- a/sources/searx/templates/default/result_templates/map.html +++ b/sources/searx/templates/default/result_templates/map.html @@ -5,8 +5,8 @@ {% endif %}
-

{{ result.title|safe }}

-

{{ result.pretty_url }}‎ {{ _('cached') }} +

{{ result.title|safe }}

+

{{ result.pretty_url }}‎ {{ _('cached') }} {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/sources/searx/templates/default/result_templates/torrent.html b/sources/searx/templates/default/result_templates/torrent.html index 4b2522a..935af4f 100644 --- a/sources/searx/templates/default/result_templates/torrent.html +++ b/sources/searx/templates/default/result_templates/torrent.html @@ -2,12 +2,12 @@ {% if "icon_"~result.engine~".ico" in favicons %} {{result.engine}} {% endif %} -

{{ result.title|safe }}

+

{{ result.title|safe }}

{{ result.pretty_url }}‎

{% if result.content %}

{{ result.content|safe }}

{% endif %}

{% if result.magnetlink %}{{ _('magnet link') }}{% endif %} - {% if result.torrentfile %}{{ _('torrent file') }}{% endif %} - + {% if result.torrentfile %}{{ _('torrent file') }}{% endif %} - {{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}

diff --git a/sources/searx/templates/default/result_templates/videos.html b/sources/searx/templates/default/result_templates/videos.html index 5a377b7..727f44c 100644 --- a/sources/searx/templates/default/result_templates/videos.html +++ b/sources/searx/templates/default/result_templates/videos.html @@ -1,6 +1,6 @@
-

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}
{% endif %} - {{ result.title|striptags }} + {{ result.title|striptags }}

{{ result.url }}‎

diff --git a/sources/searx/templates/oscar/404.html b/sources/searx/templates/oscar/404.html new file mode 100644 index 0000000..11d7895 --- /dev/null +++ b/sources/searx/templates/oscar/404.html @@ -0,0 +1,9 @@ +{% extends "oscar/base.html" %} +{% block content %} +
+

{{ _('Page not found') }}

+ {% autoescape false %} +

{{ _('Go to %(search_page)s.', search_page='{}'.decode('utf-8').format(url_for('index'), _('search page'))) }}

+ {% endautoescape %} +
+{% endblock %} diff --git a/sources/searx/templates/oscar/about.html b/sources/searx/templates/oscar/about.html index e1f3782..d42b783 100644 --- a/sources/searx/templates/oscar/about.html +++ b/sources/searx/templates/oscar/about.html @@ -7,27 +7,27 @@

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users.

-

Why use Searx?

+

Why use searx?

    -
  • Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • -
  • Searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • -
  • Searx is free software, the code is 100% open and you can help to make it better. See more on github
    • +
  • searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • +
  • searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • +
  • searx is free software, the code is 100% open and you can help to make it better. See more on github

If you do care about privacy, want to be a conscious user, or otherwise believe - in digital freedom, make Searx your default search engine or run it on your own server

+ in digital freedom, make searx your default search engine or run it on your own server

Technical details - How does it work?

Searx is a metasearch engine, inspired by the seeks project.
-It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests.
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, searx uses the search bar to perform GET requests.
Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.

How can I make it my own?

Searx appreciates your concern regarding logs, so take the code and run it yourself!
Add your Searx to this list to help other people reclaim their privacy and make the Internet freer! -
The more decentralized the Internet, is the more freedom we have!

+
The more decentralized the Internet is, the more freedom we have!

More about searx

diff --git a/sources/searx/templates/oscar/advanced.html b/sources/searx/templates/oscar/advanced.html new file mode 100644 index 0000000..2c694cf --- /dev/null +++ b/sources/searx/templates/oscar/advanced.html @@ -0,0 +1,9 @@ + + +
+ {% include 'oscar/categories.html' %} + {% include 'oscar/time-range.html' %} +
diff --git a/sources/searx/templates/oscar/base.html b/sources/searx/templates/oscar/base.html index 649d91f..d3170d6 100644 --- a/sources/searx/templates/oscar/base.html +++ b/sources/searx/templates/oscar/base.html @@ -2,7 +2,7 @@ - + @@ -90,8 +90,5 @@ {% for script in scripts %} {% endfor %} - diff --git a/sources/searx/templates/oscar/categories.html b/sources/searx/templates/oscar/categories.html index 834cffc..241d262 100644 --- a/sources/searx/templates/oscar/categories.html +++ b/sources/searx/templates/oscar/categories.html @@ -1,42 +1,14 @@ - -
{{ attribute.label }}{{ attribute.label }}{{ attribute.image.alt }}{{ attribute.value }}{{ attribute.value }}
{% for attribute in infobox.attributes %} - + {% if attribute.image %} {% else %} - + {% endif %} {% endfor %} @@ -24,11 +24,12 @@ {% if infobox.urls %}
+ {% for url in infobox.urls %} -

{{ url.title }}

+

{{ result_link(url.url, url.title) }}

{% endfor %} +
{% endif %} - diff --git a/sources/searx/templates/oscar/macros.html b/sources/searx/templates/oscar/macros.html index a826b0e..06881db 100644 --- a/sources/searx/templates/oscar/macros.html +++ b/sources/searx/templates/oscar/macros.html @@ -9,16 +9,20 @@ {{ favicon }} {%- endmacro %} +{%- macro result_link(url, title, classes='') -%} +{{ title }} +{%- endmacro -%} + -{% macro result_header(result, favicons) -%} -

{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result.title|safe }}

+{% macro result_header(result, favicons) -%} +

{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}

{%- endmacro %} {% macro result_sub_header(result) -%} {% if result.publishedDate %}{% endif %} - {% if result.magnetlink %} • {{ icon('magnet') }} {{ _('magnet link') }}{% endif %} - {% if result.torrentfile %} • {{ icon('download-alt') }} {{ _('torrent file') }}{% endif %} + {% if result.magnetlink %} • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}{% endif %} + {% if result.torrentfile %} • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}{% endif %} {%- endmacro %} @@ -28,7 +32,7 @@ {% for engine in result.engines %} {{ engine }} {% endfor %} - {{ icon('link') }} {{ _('cached') }} + {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}
{{ result.pretty_url }}
{%- endmacro %} @@ -39,7 +43,7 @@ {% for engine in result.engines %} {{ engine }} {% endfor %} - {{ icon('link') }} {{ _('cached') }} + {{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}
{{ result.pretty_url }}
{%- endmacro %} @@ -68,9 +72,11 @@ {%- endmacro %} {% macro checkbox_toggle(id, blocked) -%} -
- - - +
+ +
{%- endmacro %} diff --git a/sources/searx/templates/oscar/preferences.html b/sources/searx/templates/oscar/preferences.html index 18308bd..283b7ba 100644 --- a/sources/searx/templates/oscar/preferences.html +++ b/sources/searx/templates/oscar/preferences.html @@ -36,7 +36,7 @@ {% else %} -
+
{% include 'oscar/categories.html' %}
{% endif %} @@ -117,6 +117,15 @@ {{ preferences_item_footer(_('Choose style for this theme'), _('Style'), rtl) }} + + {% set label = _('Results on new tabs') %} + {% set info = _('Open result links on new browser tabs') %} + {{ preferences_item_header(info, label, rtl) }} + + {{ preferences_item_footer(info, label, rtl) }}
@@ -164,7 +173,9 @@ {% if not search_engine.private %} {% if not rtl %} - + @@ -176,7 +187,9 @@ - + {% endif %} {% endif %} @@ -203,7 +216,9 @@
{{ _(plugin.description) }}
+
{{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }} +
diff --git a/sources/searx/templates/oscar/result_templates/code.html b/sources/searx/templates/oscar/result_templates/code.html index 582a214..ba74d03 100644 --- a/sources/searx/templates/oscar/result_templates/code.html +++ b/sources/searx/templates/oscar/result_templates/code.html @@ -5,7 +5,7 @@ {% if result.content %}

{{ result.content|safe }}

{% endif %} -{% if result.repository %}

{{ icon('file') }} {{ result.repository }}

{% endif %} +{% if result.repository %}

{{ icon('file') }} {{ result.repository }}

{% endif %}
{{ result.codelines|code_highlighter(result.code_language)|safe }} diff --git a/sources/searx/templates/oscar/result_templates/default.html b/sources/searx/templates/oscar/result_templates/default.html index f283693..3ed0f31 100644 --- a/sources/searx/templates/oscar/result_templates/default.html +++ b/sources/searx/templates/oscar/result_templates/default.html @@ -1,4 +1,4 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %} {{ result_header(result, favicons) }} {{ result_sub_header(result) }} diff --git a/sources/searx/templates/oscar/result_templates/images.html b/sources/searx/templates/oscar/result_templates/images.html index 1bfff0a..812749c 100644 --- a/sources/searx/templates/oscar/result_templates/images.html +++ b/sources/searx/templates/oscar/result_templates/images.html @@ -1,12 +1,12 @@ {% from 'oscar/macros.html' import draw_favicon %} - + {{ result.title|striptags }} @@ -118,7 +122,7 @@
- 1 %}&pageno={{ pageno }}{% endif %}" readonly> + 1 %}&pageno={{ pageno }}{% endif %}{% if time_range %}&time_range={{ time_range }}{% endif %}" readonly>
@@ -130,6 +134,7 @@ {% for category in selected_categories %}{% endfor %} + {% endfor %} diff --git a/sources/searx/templates/oscar/search.html b/sources/searx/templates/oscar/search.html index e48c80f..6a3b2d2 100644 --- a/sources/searx/templates/oscar/search.html +++ b/sources/searx/templates/oscar/search.html @@ -6,7 +6,7 @@
-
- {% include 'oscar/categories.html' %} -
+
+ {% include 'oscar/advanced.html' %} +
diff --git a/sources/searx/templates/oscar/search_full.html b/sources/searx/templates/oscar/search_full.html index 26dae41..6fdae40 100644 --- a/sources/searx/templates/oscar/search_full.html +++ b/sources/searx/templates/oscar/search_full.html @@ -11,11 +11,8 @@ +
+ {% include 'oscar/advanced.html' %} +
- -
-
- {% include 'oscar/categories.html' %} -
-
diff --git a/sources/searx/templates/oscar/time-range.html b/sources/searx/templates/oscar/time-range.html new file mode 100644 index 0000000..4a13c4f --- /dev/null +++ b/sources/searx/templates/oscar/time-range.html @@ -0,0 +1,14 @@ + diff --git a/sources/searx/templates/pix-art/404.html b/sources/searx/templates/pix-art/404.html new file mode 100644 index 0000000..592e861 --- /dev/null +++ b/sources/searx/templates/pix-art/404.html @@ -0,0 +1,9 @@ +{% extends "pix-art/base.html" %} +{% block content %} +
+

{{ _('Page not found') }}

+ {% autoescape false %} +

{{ _('Go to %(search_page)s.', search_page='{}'.decode('utf-8').format(url_for('index'), _('search page'))) }}

+ {% endautoescape %} +
+{% endblock %} diff --git a/sources/searx/templates/pix-art/about.html b/sources/searx/templates/pix-art/about.html index cb4b351..6484b85 100644 --- a/sources/searx/templates/pix-art/about.html +++ b/sources/searx/templates/pix-art/about.html @@ -5,20 +5,20 @@

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users.

-

Why use Searx?

+

Why use searx?

    -
  • Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • -
  • Searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • -
  • Searx is free software, the code is 100% open and you can help to make it better. See more on github
    • +
  • searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
    • +
  • searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
    • +
  • searx is free software, the code is 100% open and you can help to make it better. See more on github

If you do care about privacy, want to be a conscious user, or otherwise believe - in digital freedom, make Searx your default search engine or run it on your own server

+ in digital freedom, make searx your default search engine or run it on your own server

Technical details - How does it work?

Searx is a metasearch engine, inspired by the seeks project.
-It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, if Searx used from the search bar it performs GET requests.
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, if searx used from the search bar it performs GET requests.
Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.

diff --git a/sources/searx/templates/pix-art/base.html b/sources/searx/templates/pix-art/base.html index 578180c..6af8823 100644 --- a/sources/searx/templates/pix-art/base.html +++ b/sources/searx/templates/pix-art/base.html @@ -2,7 +2,7 @@ - + diff --git a/sources/searx/templates/pix-art/index.html b/sources/searx/templates/pix-art/index.html index d398cc8..a0c61f9 100644 --- a/sources/searx/templates/pix-art/index.html +++ b/sources/searx/templates/pix-art/index.html @@ -1,7 +1,7 @@ {% extends "pix-art/base.html" %} {% block content %}
-

Searx Logo

+

searx Logo

{% include 'pix-art/search.html' %}

{{ _('about') }} diff --git a/sources/searx/templates/pix-art/results.html b/sources/searx/templates/pix-art/results.html index 9385b60..f7d0e20 100644 --- a/sources/searx/templates/pix-art/results.html +++ b/sources/searx/templates/pix-art/results.html @@ -8,7 +8,7 @@ {% block title %}{{ q }} - {% endblock %} {% block meta %}{% endblock %} {% block content %} -

+
preferences
{% include 'pix-art/search.html' %} diff --git a/sources/searx/translations/bg/LC_MESSAGES/messages.mo b/sources/searx/translations/bg/LC_MESSAGES/messages.mo index 887d052..926beb9 100644 Binary files a/sources/searx/translations/bg/LC_MESSAGES/messages.mo and b/sources/searx/translations/bg/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/bg/LC_MESSAGES/messages.po b/sources/searx/translations/bg/LC_MESSAGES/messages.po index b5f4430..82fa87c 100644 --- a/sources/searx/translations/bg/LC_MESSAGES/messages.po +++ b/sources/searx/translations/bg/LC_MESSAGES/messages.po @@ -3,94 +3,124 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# poke amom , 2015 +# ubone , 2015 +# ubone , 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Bulgarian (http://www.transifex.com/asciimoo/searx/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "файлове" -#: searx/webapp.py:115 -msgid "general" -msgstr "общ" - #: searx/webapp.py:116 +msgid "general" +msgstr "общо" + +#: searx/webapp.py:117 msgid "music" msgstr "музика" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "социална мрежа" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "изображения" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "видео" -#: searx/webapp.py:120 -msgid "it" -msgstr "ай-ти" - #: searx/webapp.py:121 +msgid "it" +msgstr "IT" + +#: searx/webapp.py:122 msgid "news" msgstr "новини" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "карта" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "наука" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "преди {minutes} минута(минути)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "преди {hours} час(ове), {minutes} минута(минути)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Страницата зарежда (сек)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Брой резултати" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Грешки" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Поправи HTTP връзки на HTTPS, ако е възможно" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Търси при избор на категория" @@ -105,7 +135,7 @@ msgstr "Търси веднага при избрана категория. Из msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" +msgstr "Показва IP-то ви и др. инфо, ако търсенето е \"ip\" или \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -115,6 +145,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +257,8 @@ msgstr "Метод" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Безопасно търсене" @@ -260,31 +316,30 @@ msgid "Red" msgstr "Червено" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Използвани търсачки в момента " #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Име на търсачка" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Категория" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +347,16 @@ msgstr "Позволи" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Забрани" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,43 +364,43 @@ msgid "" msgstr "Тези настройки се съхраняват във вашите бисквитки. Това ни позволява да не съхраняваме тази информация за вас." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Тези бисквитки служат за ваше удобство. Ние не ги използваме, за да Ви следим." +msgstr "Тези бисквитки служат за ваше удобство. Ние не ги използваме, за да ви следим." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "запази" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Върни първоначалните" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "назад" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Търси URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Свали резултатите" @@ -357,19 +411,19 @@ msgstr "Отговори" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Предложения" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "предишна страница" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "следваща страница" @@ -405,13 +459,13 @@ msgstr "Лийчър" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "магнитна връзка" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "торент файл" @@ -419,18 +473,37 @@ msgstr "торент файл" msgid "Click on the magnifier to perform search" msgstr "Кликнете лупичката, за да изпълните търсене" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "кеширана" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -448,17 +521,17 @@ msgid "General" msgstr "Общи" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Търсачки" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Добавки" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Бисквитки" @@ -493,36 +566,46 @@ msgstr "Филтрирай съдържание" msgid "Change searx layout" msgstr "Промени оформлението на searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Пряк път" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Средно време" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Макс. време" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Това е списък на бисквитки с техните стойности, които searx съхранява на вашия компютър." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Име на бисквитката" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Стойност" @@ -530,7 +613,7 @@ msgstr "Стойност" msgid "Search results" msgstr "Резултати от търсенето" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Връзки" @@ -539,18 +622,26 @@ msgstr "Връзки" msgid "Start search" msgstr "Започни търсене" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Покажи филтрите за търсене" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Скрий филтрите за търсене" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "статистики" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/de/LC_MESSAGES/messages.mo b/sources/searx/translations/de/LC_MESSAGES/messages.mo index 7d34512..41b91a9 100644 Binary files a/sources/searx/translations/de/LC_MESSAGES/messages.mo and b/sources/searx/translations/de/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/de/LC_MESSAGES/messages.po b/sources/searx/translations/de/LC_MESSAGES/messages.po index 2ba9cc5..0b12358 100644 --- a/sources/searx/translations/de/LC_MESSAGES/messages.po +++ b/sources/searx/translations/de/LC_MESSAGES/messages.po @@ -15,89 +15,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:07+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 18:40+0000\n" "Last-Translator: Thomas Pointhuber\n" "Language-Team: German (http://www.transifex.com/asciimoo/searx/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "Dateien" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "Allgemein" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "Musik" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "Soziale Medien" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "Bilder" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "Videos" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "IT" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "Neuigkeiten" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "Karte" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "Wissenschaft" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Ladezeit (sek)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Trefferanzahl" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Punkte" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Punkte pro Treffer" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Fehler" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "DOAI umschreiben" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Vermeidet Bezahlschranken durch die Weiterleitung zu der Open-Access Version falls möglich" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Wandelt wenn möglich HTTP Links in HTTPS Links um" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Undendliches Scrollen" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Lädt automatisch die nächste Seite wenn das Ende der aktuellen Seite erreicht wurde" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Öffne Links in einem neuen Browser Tab" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Links werden normalerweise im gleichen Fenster geöffnet. Dieses Plugin überschreibt dieses Verhalten und öffnet Links in einem neuen Browser Tab bzw Fenster.\n(es wird JavaScript benötigt)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Starte Suche wenn Kategorie angeklickt wird" @@ -122,6 +151,32 @@ msgstr "Tracker-URL entferner" msgid "Remove trackers arguments from the returned URL" msgstr "Entferne Tracker Argumente von den URLs" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Vim angelehnte Tastenkombinationen" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navigiere in der Ergebnisseite mit Vim ähnlichen Tastataurkombinationen (es wird JavaScript benötigt).\nDrücke \"h\" auf der Start bzw. Ergebnisseite um eine Hifefenster anzuzeigen" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "Seite nicht gefunden" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Gehe zu %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "Suchseite" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -208,8 +263,8 @@ msgstr "Methode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Sichere Suche (SafeSearch)" @@ -267,31 +322,30 @@ msgid "Red" msgstr "Rot" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Aktuell benutzte Suchmaschinen" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Suchmaschinenname" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Kategorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -299,17 +353,16 @@ msgstr "Erlauben" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blockieren" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -317,8 +370,8 @@ msgid "" msgstr "Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, damit wir keine Ihrer persönlichen Daten speichern müssen." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -326,34 +379,34 @@ msgid "" msgstr "Diese Cookies dienen einzig Ihrem Komfort. Wir verwenden sie nicht, um Sie zu überwachen." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "Speichern" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Zurücksetzen" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "Zurück" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Such-URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Ergebnisse herunterladen" @@ -364,19 +417,19 @@ msgstr "Antworten" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Vorschläge" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "vorherige Seite" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "nächste Seite" @@ -412,13 +465,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "Magnet Link" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "Torrent" @@ -426,18 +479,37 @@ msgstr "Torrent" msgid "Click on the magnifier to perform search" msgstr "klicke auf die Lupe, um die Suche zu starten" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "Ergebniss in neuem Tab" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "Ein" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "Aus" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "Im Cache" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Experteneinstellungen" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "eine privatsphären-respektierende, hackbare Metasuchmaschine" @@ -455,17 +527,17 @@ msgid "General" msgstr "Allgemein" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Suchmaschinen" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Erweiterungen" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -500,36 +572,46 @@ msgstr "Inhalte filtern" msgid "Change searx layout" msgstr "ändere das Aussehen von searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "wähle das Aussehen des Design" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Aussehen" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Abkürzung" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "mittlere Zeit" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "max. Zeit" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Diese Liste zeigt alle Daten welche searx auf deinem Computer speichert." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Mit dieser Liste können Sie die Transparenz von searx bewerten" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Cookie Name" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Wert" @@ -537,7 +619,7 @@ msgstr "Wert" msgid "Search results" msgstr "Suchergebnisse" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Links" @@ -546,18 +628,26 @@ msgstr "Links" msgid "Start search" msgstr "Suche starten" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Suchfilter anzeigen" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Suchfilter verstecken" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "Statistiken" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "Jederzeit" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "Letzter Tag" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "Letzte Woche" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "Letztes Monat" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/el_GR/LC_MESSAGES/messages.mo b/sources/searx/translations/el_GR/LC_MESSAGES/messages.mo index 385bcbc..2da4ee0 100644 Binary files a/sources/searx/translations/el_GR/LC_MESSAGES/messages.mo and b/sources/searx/translations/el_GR/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/el_GR/LC_MESSAGES/messages.po b/sources/searx/translations/el_GR/LC_MESSAGES/messages.po index 73b49e2..5d62b3c 100644 --- a/sources/searx/translations/el_GR/LC_MESSAGES/messages.po +++ b/sources/searx/translations/el_GR/LC_MESSAGES/messages.po @@ -8,89 +8,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Greek (Greece) (http://www.transifex.com/asciimoo/searx/language/el_GR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "αρχεία" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "γενικά" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "μουσική" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "κοινωνικά δίκτυα" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "εικόνες" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "νέα" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "χάρτης" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Αριθμός αποτελεσμάτων" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Λάθη" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -115,6 +144,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +256,8 @@ msgstr "Μέθοδος" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "" @@ -260,31 +315,30 @@ msgid "Red" msgstr "Κόκκινο" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Κατηγορία" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "αποθήκευση" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "πίσω" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "" @@ -357,19 +410,19 @@ msgstr "Απαντήσεις" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Προτάσεις" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "προηγούμενη σελίδα" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "επόμενη σελίδα" @@ -405,13 +458,13 @@ msgstr "" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "" @@ -419,18 +472,37 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -448,17 +520,17 @@ msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -493,36 +565,46 @@ msgstr "" msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -530,7 +612,7 @@ msgstr "" msgid "Search results" msgstr "Αποτελέσματα αναζήτησης" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Σύνδεσμοι" @@ -539,18 +621,26 @@ msgstr "Σύνδεσμοι" msgid "Start search" msgstr "Έναρξη αναζήτησης" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Προβολή φίλτρων αναζήτησης" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Απόκρυψη φίλτρων αναζήτησης" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "στατιστικά" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/en/LC_MESSAGES/messages.mo b/sources/searx/translations/en/LC_MESSAGES/messages.mo index e852afc..48bf062 100644 Binary files a/sources/searx/translations/en/LC_MESSAGES/messages.mo and b/sources/searx/translations/en/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/eo/LC_MESSAGES/messages.mo b/sources/searx/translations/eo/LC_MESSAGES/messages.mo index d9d1d5f..fcddb7d 100644 Binary files a/sources/searx/translations/eo/LC_MESSAGES/messages.mo and b/sources/searx/translations/eo/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/eo/LC_MESSAGES/messages.po b/sources/searx/translations/eo/LC_MESSAGES/messages.po index 51323c2..861b0d3 100644 --- a/sources/searx/translations/eo/LC_MESSAGES/messages.po +++ b/sources/searx/translations/eo/LC_MESSAGES/messages.po @@ -3,94 +3,123 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# juanda097 , 2015 +# juanda097 , 2015-2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Esperanto (http://www.transifex.com/asciimoo/searx/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "dosieroj" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "ĝenerala" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "muziko" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "sociaj retservoj" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "bildoj" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videoj" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "novaĵoj" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "mapo" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "scienco" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Nombro de rezultoj" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Poentaroj" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Poentaroj por unu rezulto" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Eraroj" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Reverki HTTP ligiloj HTTP se eble" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -115,6 +144,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -196,15 +251,15 @@ msgstr "" #: searx/templates/oscar/preferences.html:85 #: searx/templates/pix-art/preferences.html:30 msgid "Method" -msgstr "" +msgstr "Metodo" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" -msgstr "" +msgstr " SekuraSerĉo" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:67 @@ -260,31 +315,30 @@ msgid "Red" msgstr "Ruĝa" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" -msgstr "" +msgstr " Aktuale uzitajn serĉilojn" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" -msgstr "" +msgstr " Motoro nomo" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Kategorio" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "Permesi" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloko" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Deŝuto rezultoj" @@ -357,21 +410,21 @@ msgstr "Respondoj" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" -msgstr "" +msgstr " antaŭa paĝo" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" -msgstr "" +msgstr " sekvanta paĝo" #: searx/templates/courgette/search.html:3 #: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 @@ -405,13 +458,13 @@ msgstr "" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "" @@ -419,18 +472,37 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -445,20 +517,20 @@ msgstr "" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:25 msgid "General" -msgstr "" +msgstr "Ĝenerala" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" -msgstr "" +msgstr "Motoroj" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -493,36 +565,46 @@ msgstr "" msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -530,27 +612,35 @@ msgstr "" msgid "Search results" msgstr "Serĉrezultoj" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "" #: searx/templates/oscar/search.html:6 #: searx/templates/oscar/search_full.html:11 msgid "Start search" -msgstr "" - -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "" +msgstr "Komenco serĉo" #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "statistiko" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/es/LC_MESSAGES/messages.mo b/sources/searx/translations/es/LC_MESSAGES/messages.mo index 1afc725..49c156f 100644 Binary files a/sources/searx/translations/es/LC_MESSAGES/messages.mo and b/sources/searx/translations/es/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/es/LC_MESSAGES/messages.po b/sources/searx/translations/es/LC_MESSAGES/messages.po index de6c0a4..332ffc6 100644 --- a/sources/searx/translations/es/LC_MESSAGES/messages.po +++ b/sources/searx/translations/es/LC_MESSAGES/messages.po @@ -7,94 +7,125 @@ # Alejandro León Aznar, 2014 # Alejandro León Aznar, 2014-2015 # juanda097 , 2016 +# marc, 2016 # Oscar Carrero , 2015 +# wefwefew ewfewfewf , 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-02-24 23:02+0000\n" -"Last-Translator: juanda097 \n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Spanish (http://www.transifex.com/asciimoo/searx/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "Archivos" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "General" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "Música" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "Medios sociales" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "Imágenes" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "Vídeos" -#: searx/webapp.py:120 -msgid "it" -msgstr "TIC" - #: searx/webapp.py:121 -msgid "news" -msgstr "noticias" +msgid "it" +msgstr "Informática" #: searx/webapp.py:122 -msgid "map" -msgstr "mapa" +msgid "news" +msgstr "Noticias" #: searx/webapp.py:123 -msgid "science" -msgstr "ciencia" +msgid "map" +msgstr "Mapa" -#: searx/webapp.py:415 +#: searx/webapp.py:124 +msgid "science" +msgstr "Ciencia" + +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "hace {hours} hora(s) y {minutes} minuto(s)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Tiempo de carga (segundos)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Puntuaciones" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Puntuaciones por resultado" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Errores" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Cambiar los enlaces HTTP a HTTPS si es posible" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Abrir los enlaces del resultado en una nueva pestaña del navegador" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Los resultados se abren en la misma ventana por defecto. Este plugin sobrescribe el comportamiento por defecto para abrir enlaces en nuevas pestañas / ventanas. (es necesario JavaScript)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Buscar en la categoría seleccionada" @@ -119,6 +150,32 @@ msgstr "Eliminador de URL rastreadora" msgid "Remove trackers arguments from the returned URL" msgstr "Eliminar los argumentos de los rastreadores en la URL devuelta" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Teclas de acceso rápido como-Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navegar por los resultados de búsqueda con las teclas de acceso rápido como-Vim (es necesario JavaScript). Pulse la tecla \"h\" en la página principal o en el resultado para obtener ayuda." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -205,8 +262,8 @@ msgstr "Método" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Búsqueda segura" @@ -264,31 +321,30 @@ msgid "Red" msgstr "Rojo" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Motores de búsqueda actualmente en uso" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nombre del motor de búsqueda" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categoría" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -296,17 +352,16 @@ msgstr "Permitir" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloquear" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -314,8 +369,8 @@ msgid "" msgstr "Esta configuración se guarda en sus cookies, lo que nos permite no almacenar dicha información sobre usted." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -323,34 +378,34 @@ msgid "" msgstr "Estas cookies son para su propia comodidad, no las utilizamos para rastrearle." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "Guardar" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Restablecer configuración por defecto" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "Atrás" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL de la búsqueda" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Descargar resultados" @@ -361,19 +416,19 @@ msgstr "Respuestas" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Sugerencias" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "Página anterior" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "Página siguiente" @@ -409,13 +464,13 @@ msgstr "Descargador" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "magnet link (enlace sin archivo)" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "archivo torrent" @@ -423,18 +478,37 @@ msgstr "archivo torrent" msgid "Click on the magnifier to perform search" msgstr "Haz clic en la lupa para realizar la búsqueda" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "en caché" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Creado por" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "un metabuscador hackable que respeta la privacidad" @@ -452,17 +526,17 @@ msgid "General" msgstr "General" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Motores" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Plugins" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -497,36 +571,46 @@ msgstr "Filtro de contenido" msgid "Change searx layout" msgstr "Cambiar aspecto de searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Elige un estilo para este tema" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Estilo" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Atajo" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Tiempo promedio" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Tiempo máximo" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Esta es la lista de cookies y sus valores que searx está almacenando en tu ordenador." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Con esa lista puedes valorar la transparencia de searx." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Nombre de la cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Valor" @@ -534,7 +618,7 @@ msgstr "Valor" msgid "Search results" msgstr "Buscar" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Enlaces" @@ -543,18 +627,26 @@ msgstr "Enlaces" msgid "Start search" msgstr "Comenzar búsqueda" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Mostrar filtros de búsqueda" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Ocultar filtros de búsqueda" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "estadísitcas" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/fr/LC_MESSAGES/messages.mo b/sources/searx/translations/fr/LC_MESSAGES/messages.mo index d33c51b..c21b841 100644 Binary files a/sources/searx/translations/fr/LC_MESSAGES/messages.mo and b/sources/searx/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/fr/LC_MESSAGES/messages.po b/sources/searx/translations/fr/LC_MESSAGES/messages.po index 77ccaa2..3a28437 100644 --- a/sources/searx/translations/fr/LC_MESSAGES/messages.po +++ b/sources/searx/translations/fr/LC_MESSAGES/messages.po @@ -13,89 +13,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:31+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 17:58+0000\n" "Last-Translator: Cqoicebordel \n" "Language-Team: French (http://www.transifex.com/asciimoo/searx/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "fichiers" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "général" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "musique" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "réseaux sociaux" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "images" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "vidéos" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "informatique" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "actus" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "carte" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "science" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "il y a {hours} heure(s), {minutes} minute(s)" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Chargement de la page (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Nombre de résultats" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Score" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Score par résultat" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Erreurs" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "Utiliser DOAI" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Contourne les verrous payants de certaines publications scientifiques en redirigeant vers la version ouverte de ces papiers si elle est disponible." + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Réécrire les liens HTTP en HTTPS si possible" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Défilement infini" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Charge automatiquement la page suivante quand vous arriver en bas de la page" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Ouvrir les liens de résultats dans un nouvel onglet" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Les résultats sont ouvert dans la même fenêtre par défaut. Cette extension change le comportement par défaut pour ouvrir les liens dans des nouveaux onglets ou fenêtres (Javascript est nécessaire)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Lancer la recherche lors du choix d'une catégorie" @@ -120,6 +149,32 @@ msgstr "Nettoyeur d'URL de suivis" msgid "Remove trackers arguments from the returned URL" msgstr "Retire les arguments utilisés pour vous pister des URL retournées" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Raccourcis comme Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Parcourez les résultats de recherche avec des raccourcis clavier similaires à Vim (Javascript est nécessaire. Appuyez sur \"h\" dans la fenêtre principale de résultats pour afficher de l'aide." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "Page non trouvée" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Aller à %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "la page d'accueil" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -206,8 +261,8 @@ msgstr "Méthode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Recherche sécurisée" @@ -265,31 +320,30 @@ msgid "Red" msgstr "Rouge" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Moteurs de recherche actuellement utilisés" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nom du moteur" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Catégorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -297,17 +351,16 @@ msgstr "Autoriser" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloquer" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -315,8 +368,8 @@ msgid "" msgstr "Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas collecter vos données." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -324,34 +377,34 @@ msgid "" msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utilisons pas pour vous espionner." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "enregistrer" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Remettre les valeurs par défaut" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "retour" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL de recherche" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Télécharger les résultats" @@ -362,19 +415,19 @@ msgstr "Réponses" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Suggestions" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "page précédente" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "page suivante" @@ -410,13 +463,13 @@ msgstr "Téléchargeurs" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "lien magnet" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "fichier torrent" @@ -424,18 +477,37 @@ msgstr "fichier torrent" msgid "Click on the magnifier to perform search" msgstr "Cliquez sur la loupe pour effectuer une recherche" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "Résultats dans de nouveaux onglets" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "On" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "Off" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "en cache" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Paramètres avancés" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "un meta-moteur de recherche hackable et respectueux de la vie privée" @@ -453,17 +525,17 @@ msgid "General" msgstr "Général" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Moteurs" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Plugins" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -498,36 +570,46 @@ msgstr "Filtrer le contenu" msgid "Change searx layout" msgstr "Modifier l'affichage de searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Choisir un style pour ce thème" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Style" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Raccourcis" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Temps moy." -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Temps max" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "C'est une liste de cookies et de leurs valeurs que searx enregistre sur votre ordinateur." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Avec cette liste, vous pouvez juger de la transparence de searx." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Nom du cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Valeur" @@ -535,7 +617,7 @@ msgstr "Valeur" msgid "Search results" msgstr "Résultats de recherche" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Liens" @@ -544,18 +626,26 @@ msgstr "Liens" msgid "Start search" msgstr "Lancer une recherche" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Afficher les filtres de recherche" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Cacher les filtres de recherche" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "statistiques" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "N'importe quand" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "Dernières 24h" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "Semaine précédente" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "Mois précédent" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 @@ -586,7 +676,7 @@ msgstr "Information !" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "il n'y a pas de cookies définit pour le moment." +msgstr "il n'y a pas de cookies définis pour le moment." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " diff --git a/sources/searx/translations/he/LC_MESSAGES/messages.mo b/sources/searx/translations/he/LC_MESSAGES/messages.mo index 4458e0f..743ed6b 100644 Binary files a/sources/searx/translations/he/LC_MESSAGES/messages.mo and b/sources/searx/translations/he/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/he/LC_MESSAGES/messages.po b/sources/searx/translations/he/LC_MESSAGES/messages.po index 753d25d..1983074 100644 --- a/sources/searx/translations/he/LC_MESSAGES/messages.po +++ b/sources/searx/translations/he/LC_MESSAGES/messages.po @@ -12,112 +12,167 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-03-01 15:21+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-05 18:36+0000\n" "Last-Translator: GenghisKhan \n" "Language-Team: Hebrew (http://www.transifex.com/asciimoo/searx/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "קבצים" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "כללי" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "מוזיקה" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "מדיה חברתית" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "תמונות" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "סרטונים" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "IT" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "חדשות" -#: searx/webapp.py:122 -msgid "map" -msgstr "מפה" - #: searx/webapp.py:123 +msgid "map" +msgstr "מפות" + +#: searx/webapp.py:124 msgid "science" msgstr "מדע" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "לפני {minutes} דקות" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "לפני {hours} שעות, {minutes} דקות" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "עומס עמוד (שניות)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "מספר תוצאות" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "דירוג" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "דירוג לכל תוצאה" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "שגיאות" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "שכתוב DOAI" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" -msgstr "שכתב קישורי HTTP לקישורי HTTPS כאשר אפשר" +msgstr "שכתוב קישורי HTTP לקישורי HTTPS כאשר ניתן" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "גלילה אינסופית" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "טען אוטומטית עמוד הלאה כאשר גוללים לתחתית של עמוד נוכחי" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "פתח קישורי תוצאה בכרטיסיות דפדפן חדשות" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "תוצאות נפתחות בתוך אותו חלון באופן שגרתי. תוסף זה משכתב את ההתנהגות השגרתית כדי לפתוח קישורים בתוך כרטיסיות/חלונות חדשים. (JavaScript נדרש)" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "חפש בעת בחירת קטגוריה" +msgstr "חיפוש בעת בחירת קטגוריה" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "בצע חיפוש כאשר קטגוריה נבחרת. נטרל כדי לבחור קטגוריות מרובות. (מצריך JavaScript)" +msgstr "ביצוע חיפוש כאשר קטגוריה נבחרת. יש לנטרל את תוסף זה כדי לבחור קטגוריות מרובות. (מצריך JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "מציגה כתובת IP המשוייכת לך אם השאילתא היא \"ip\" וגם סוכן משתמש אם שאילתא מכילה \"user agent\"." +msgstr "הצגת כתובת IP המשוייכת לך אם השאילתא היא \"ip\" וגם סוכן משתמש אם השאילתא מכילה \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" -msgstr "מסיר URL גשש" +msgstr "הסרת Tracker URL" #: searx/plugins/tracker_url_remover.py:27 msgid "Remove trackers arguments from the returned URL" -msgstr "הסר ארגומנטים מאתרים מתוך URL מוחזר" +msgstr "הסרת ארגומנטים מאתרים מתוך URL מוחזר" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "מקשים חמים Vim-like" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "ניווט בתוצאות בעזרת מקשים חמים Vim-like (JavaScript נדרש). לחיצה על קליד \"h\" במסך ראשי או תוצאות תציג דו שיח עזרה." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "עמוד לא נמצא" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "עבור אל %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -205,8 +260,8 @@ msgstr "שיטה" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "חיפוש בטוח" @@ -233,7 +288,7 @@ msgstr "בלי" #: searx/templates/oscar/preferences.html:104 #: searx/templates/pix-art/preferences.html:39 msgid "Themes" -msgstr "מוטיבים" +msgstr "עיצובים" #: searx/templates/courgette/preferences.html:83 msgid "Color" @@ -264,31 +319,30 @@ msgid "Red" msgstr "אדום" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "מנועי חיפוש בשימוש עתה" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "שם מנוע" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "קטגוריה" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -296,17 +350,16 @@ msgstr "התר" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "חסום" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -314,8 +367,8 @@ msgid "" msgstr "הגדרות אלו מאוחסנות בתוך העוגיות שלך, אלו מאפשרות לנו לא לאחסן את מידע זה אודותייך." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -323,34 +376,34 @@ msgid "" msgstr "עוגיות אלו משרתות את נוחותך הבלעדית, אנחנו לא משתמשים בהן כדי לעקוב אחריך." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "שמור" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "אפס ברירות מחדל" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "חזור" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "קישור חיפוש" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "הורד תוצאות" @@ -361,19 +414,19 @@ msgstr "תשובות" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "הצעות" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "עמוד קודם" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "עמוד הבא" @@ -409,13 +462,13 @@ msgstr "יונקים" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "קישור magnet" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "קובץ torrent" @@ -423,18 +476,37 @@ msgstr "קובץ torrent" msgid "Click on the magnifier to perform search" msgstr "לחצו על הזכוכית מגדלת כדי לבצע חיפוש" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "תוצאות בכרטיסיות חדשות" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "מוטמן" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "הגדרות מתקדמות" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "מופעל באמצעות" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "מנוע מטא-חיפוש גמיש, ומכבד פרטיות" @@ -444,7 +516,7 @@ msgstr "בית" #: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 msgid "Toggle navigation" -msgstr "Toggle ניווט" +msgstr "החלף ניווט" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:25 @@ -452,17 +524,17 @@ msgid "General" msgstr "כללי" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "מנועים" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "תוספים" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "עוגיות" @@ -480,53 +552,63 @@ msgstr "מציאת דברים בזמן הקלדה" #: searx/templates/oscar/preferences.html:77 msgid "Proxying image results through searx" -msgstr "שלוף תוצאות תמונה דרך searx" +msgstr "שליפת (מבעד Proxy) תוצאות תמונה דרך searx" #: searx/templates/oscar/preferences.html:86 msgid "" "Change how forms are submited, learn more about request methods" -msgstr "שינוי האופן בו טפסים נשלחים, למדו עוד אודות שיטות בקשה (request methods)" +msgstr "שינוי האופן בו טפסים נשלחים, למדו עוד אודות שיטות בקשה (request methods)" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" -msgstr "סנן תוכן" +msgstr "סינון תוכן" #: searx/templates/oscar/preferences.html:105 msgid "Change searx layout" msgstr "שינוי ממשק searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "בחר סגנון עבור עיצוב זה" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "סגנון" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "קיצור דרך" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "זמן ממוצע" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "זמן מירבי" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "זוהי רשימה של עוגיות וערכיהן אשר searx מאחסנת על המחשב שלך." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "בעזרת רשימה זו, באפשרותך לגשת אל searx transparency." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "שם עוגייה" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "ערך" @@ -534,7 +616,7 @@ msgstr "ערך" msgid "Search results" msgstr "תוצאות חיפוש" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "קישורים" @@ -543,18 +625,26 @@ msgstr "קישורים" msgid "Start search" msgstr "התחל חיפוש" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "הצג מסנני חיפוש" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "הסתר מסנני חיפוש" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "סטטיסטיקות" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "כל עת" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "יום אחרון" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "שבוע אחרון" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "חודש אחרון" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/hu/LC_MESSAGES/messages.mo b/sources/searx/translations/hu/LC_MESSAGES/messages.mo index b418c48..bf67cae 100644 Binary files a/sources/searx/translations/hu/LC_MESSAGES/messages.mo and b/sources/searx/translations/hu/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/hu/LC_MESSAGES/messages.po b/sources/searx/translations/hu/LC_MESSAGES/messages.po index ba2978e..906b69b 100644 --- a/sources/searx/translations/hu/LC_MESSAGES/messages.po +++ b/sources/searx/translations/hu/LC_MESSAGES/messages.po @@ -5,96 +5,126 @@ # Translators: # Adam Tauber , 2014-2016 # FIRST AUTHOR , 2014 +# Noémi Ványi , 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-02-06 08:36+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:42+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: Hungarian (http://www.transifex.com/asciimoo/searx/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "fájlok" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "általános" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "zene" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "közösségi média" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "képek" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videók" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "hírek" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "térkép" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "tudomány" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} perce" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} óra, {minutes} perce" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Válaszidők (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Találatok száma" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Pontszámok" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Pontszámok találatonként" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Hibák" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "Szabad publikációs oldalak" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Publikácós linkeknél szabad forrás használat, amennyiben lehetséges" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "HTTP linkek lecserélése HTTPS-re" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Végtelenített találatok" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "További találatok automatikus betöltése" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Találatok megnyitása új lapon" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "A találatok az aktuális oldalon nyílnak meg alapértelmezetten. Ez a plugin megváltoztatja ezt a működést és új lapra nyitja meg a találatokat. (ez a funkció JavaScript-et igényel)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "Azonnal keresés kategória választással" +msgstr "Azonnali keresés kategória választással" #: searx/plugins/search_on_category_select.py:19 msgid "" @@ -116,6 +146,32 @@ msgstr "Tracker URL eltávolítás" msgid "Remove trackers arguments from the returned URL" msgstr "Felhasználó követéshez használt találati URL paraméterek eltávolítása" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Vim típusú billentyűzetes navigáció" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navigálj néhány gombnyomással a találatok között. Aktiválás után a \"h\" betű lenyomásával jeleníthető meg részletes segítség a használatról. (Ez a funkció JavaScript-et igényel)" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "Az oldal nem található" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Vissza a %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "kereső oldalra" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +258,8 @@ msgstr "Method" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Felnőtt tartalom szűrés" @@ -250,7 +306,7 @@ msgstr "Zöld" #: searx/templates/courgette/preferences.html:89 msgid "Cyan" -msgstr "Türkisz" +msgstr "Türkiz" #: searx/templates/courgette/preferences.html:90 msgid "Orange" @@ -261,31 +317,30 @@ msgid "Red" msgstr "Piros" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Jelenleg használt keresők" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Kereső neve" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Kategória" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,17 +348,16 @@ msgstr "Engedélyezés" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Tiltás" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -311,8 +365,8 @@ msgid "" msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -320,34 +374,34 @@ msgid "" msgstr "Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a felhasználók követésére." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "mentés" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Alapbeállítások visszaállítása" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "vissza" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Keresési URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Találatok letöltése" @@ -358,19 +412,19 @@ msgstr "Válaszok" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Javaslatok" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "előző oldal" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "következő oldal" @@ -406,13 +460,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "magnet link" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "torrent fájl" @@ -420,18 +474,37 @@ msgstr "torrent fájl" msgid "Click on the magnifier to perform search" msgstr "A nagyítóra kattintva indítható a keresés" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "Eredmények új tabon" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "On" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "Off" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "tárolt" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Keresés beállításai" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Az oldalt kiszolgálja: " -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "egy privátszféra tisztelő, könnyen módosítható metakereső" @@ -449,17 +522,17 @@ msgid "General" msgstr "Általános" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" -msgstr "Kereső motorok" +msgstr "Keresőmotorok" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Pluginek" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Sütik" @@ -494,36 +567,46 @@ msgstr "Tartalom szűrés" msgid "Change searx layout" msgstr "Megjelenés" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Válassz megjelenést ehhez a témához" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Megjelenés" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Rövidítés" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Átlag idő" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Maximális idő" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Searx által használt sütik listája." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Ez a lista a kereső transzparenciáját hivatott megmutatni." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Süti név" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Érték" @@ -531,7 +614,7 @@ msgstr "Érték" msgid "Search results" msgstr "Keresési eredmények" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Linkek" @@ -540,18 +623,26 @@ msgstr "Linkek" msgid "Start search" msgstr "Keresés indítása" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Keresési szűrők megjelenítése" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Keresési szűrők elrejtése" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "statisztikák" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "Bármikor" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "Legutóbbi nap" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "Legutóbbi hét" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "Legutóbbi hónap" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/it/LC_MESSAGES/messages.mo b/sources/searx/translations/it/LC_MESSAGES/messages.mo index 756f41f..9b303e2 100644 Binary files a/sources/searx/translations/it/LC_MESSAGES/messages.mo and b/sources/searx/translations/it/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/it/LC_MESSAGES/messages.po b/sources/searx/translations/it/LC_MESSAGES/messages.po index 672d1e0..7ad36c8 100644 --- a/sources/searx/translations/it/LC_MESSAGES/messages.po +++ b/sources/searx/translations/it/LC_MESSAGES/messages.po @@ -10,89 +10,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Italian (http://www.transifex.com/asciimoo/searx/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "documenti" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "generale" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "musica" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "social media" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "immagini" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "video" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "notizie" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "mappe" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "di {minutes} minuti fa" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "di {ore} h e {minutes} minuti fa" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr " Caricamento della pagina (secondi)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Risultati ottenuti" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Punteggio" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Punteggio per risultato" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Errori" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -117,6 +146,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -203,8 +258,8 @@ msgstr "Metodo" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Ricerca rassicurato" @@ -262,31 +317,30 @@ msgid "Red" msgstr "Rosso" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Motori di ricerca attualmente in uso" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nome del motore" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categoria" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -294,17 +348,16 @@ msgstr "Autorizza" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blocca" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -312,8 +365,8 @@ msgid "" msgstr "Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non conservare dati su di te." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -321,34 +374,34 @@ msgid "" msgstr "I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie per sorvegliarti." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "salva" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Azzerare default" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "indietro" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL della ricerca" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Scarica i risultati" @@ -359,19 +412,19 @@ msgstr "Riposte" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Suggerimenti" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "pagina precedente" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "pagina successiva" @@ -407,13 +460,13 @@ msgstr "" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "" @@ -421,18 +474,37 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -450,17 +522,17 @@ msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -495,36 +567,46 @@ msgstr "" msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -532,7 +614,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "" @@ -541,18 +623,26 @@ msgstr "" msgid "Start search" msgstr "" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/ja/LC_MESSAGES/messages.mo b/sources/searx/translations/ja/LC_MESSAGES/messages.mo index e8bb56e..3be04b7 100644 Binary files a/sources/searx/translations/ja/LC_MESSAGES/messages.mo and b/sources/searx/translations/ja/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/ja/LC_MESSAGES/messages.po b/sources/searx/translations/ja/LC_MESSAGES/messages.po index 0015835..9d0dc7e 100644 --- a/sources/searx/translations/ja/LC_MESSAGES/messages.po +++ b/sources/searx/translations/ja/LC_MESSAGES/messages.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Akio Nishimura , 2016 # Thomas Pointhuber, 2014-2015 # FIRST AUTHOR , 2014,2016 # Lucas Phillips , 2015 @@ -13,89 +14,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-02-14 00:11+0000\n" -"Last-Translator: Akio Nishimura \n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Japanese (http://www.transifex.com/asciimoo/searx/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "ファイル" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "一般" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "音楽" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "ソーシャルメディア" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "画像" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "動画" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "情報技術" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "お知らせ" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "地図" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "学問" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes}分前" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours}時間と{minutes}分前" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "ページ読み込み時間 (秒)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "通知の数" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "スコア" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "検索結果当たりスコア" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "エラー" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "可能ならばHTTPリンクをHTTPSリンクに書き換える" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "検索結果のリンクを新しいタブで開く" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "デフォルトでは結果は同じウィンドウで開きます。このプラグインはデフォルトの動作を書き換えて新しいタブ/ウィンドウで開くようにします。(JavaScriptが必要です)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "カテゴリ選択したら検索を実行" @@ -120,6 +150,32 @@ msgstr "トラッカーURLリムーバー" msgid "Remove trackers arguments from the returned URL" msgstr "返されたURLからトラッカー引数を消去します。" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Vim風のホットキー" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "検索結果をVim風のホットキーで操作します(JavaScriptが必要)。メインページまたは検索結果ページで\"h\"キーを押してヘルプを表示します。" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -206,8 +262,8 @@ msgstr "方法" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "安全な検索" @@ -265,31 +321,30 @@ msgid "Red" msgstr "赤" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "現在使用中の検索エンジン" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "検索エンジン名" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "カテゴリー" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -297,17 +352,16 @@ msgstr "許可する" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "禁止する" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -315,8 +369,8 @@ msgid "" msgstr "これらの設定はあなたのクッキーに保存されますが、これはサーバーがあなたの情報の保存するわけではありません。" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -324,34 +378,34 @@ msgid "" msgstr "クッキーはあなたが便利に使えるようにするために使うのであって、サーバーはあなたを追跡するためにクッキーを使うことはありません。" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "保存" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "デフォルト設定に戻す" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "戻る" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URLを検索する" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "ダウンロードするファイル形式" @@ -362,19 +416,19 @@ msgstr "回答" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "提案" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "前のページ" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "次のページ" @@ -410,13 +464,13 @@ msgstr "リーチャー" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "マグネットリンク" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "トレントファイル" @@ -424,18 +478,37 @@ msgstr "トレントファイル" msgid "Click on the magnifier to perform search" msgstr "検索を実行するには虫めがねをクリックしてください" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "キャッシュ" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "提供:" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "プライバシー保護を重視した、ハッカブルなメタサーチエンジン" @@ -453,17 +526,17 @@ msgid "General" msgstr "一般設定" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "検索エンジン" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "プラグイン" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "クッキー" @@ -498,36 +571,46 @@ msgstr "コンテンツをフィルタリングする" msgid "Change searx layout" msgstr "searxのレイアウトの変更" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "このテーマのスタイルを選択" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "スタイル" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "ショートカット" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "平均時間" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "最大時間" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "これはクッキーのリストで、これらの値はあなたのコンピュータに保存されています。" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "このリストによって、あなたはsearxの透明性を評価できます。" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "クッキー名" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "値" @@ -535,7 +618,7 @@ msgstr "値" msgid "Search results" msgstr "検索結果" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "リンク" @@ -544,18 +627,26 @@ msgstr "リンク" msgid "Start search" msgstr "検索を開始" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "サーチフィルタを表示" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "サーチフィルタを隠す" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "統計" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/nl/LC_MESSAGES/messages.mo b/sources/searx/translations/nl/LC_MESSAGES/messages.mo index bd55e44..744d55e 100644 Binary files a/sources/searx/translations/nl/LC_MESSAGES/messages.mo and b/sources/searx/translations/nl/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/nl/LC_MESSAGES/messages.po b/sources/searx/translations/nl/LC_MESSAGES/messages.po index b04ede2..945bc2c 100644 --- a/sources/searx/translations/nl/LC_MESSAGES/messages.po +++ b/sources/searx/translations/nl/LC_MESSAGES/messages.po @@ -9,89 +9,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-31 11:35+0000\n" -"Last-Translator: Nathan Follens\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Dutch (http://www.transifex.com/asciimoo/searx/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "bestanden" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "algemeen" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "muziek" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "social media" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "afbeeldingen" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "video's" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "nieuws" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "kaart" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "wetenschap" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} min geleden" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} uur, {minutes} min geleden" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Pagina laadt (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Aantal zoekresultaten" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Scores" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Scores per zoekresultaat" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Fouten" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Herschrijf HTTP-koppelingen naar HTTPS, indien mogelijk" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Open koppelingen in nieuwe tabbladen" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Resultaten worden standaard in hetzelfde venster geopend. Deze plug-in overschrijft het standaardgedrag zodat koppelingen in nieuwe tabbladen/vensters geopend worden. (JavaScript vereist)" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Zoeken bij selecteren van categorie" @@ -116,6 +145,32 @@ msgstr "Tracker-URL verwijderaar" msgid "Remove trackers arguments from the returned URL" msgstr "Verwijdert trackerargumenten van de gekregen URL" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Sneltoetsen als in Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Blader door zoekresultaten met sneltoetsen zoals die in Vim (JavaScript vereist). Druk op \"h\" op de hoofdpagina of de pagina met resultaten voor hulp." + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +257,8 @@ msgstr "Methode" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "SafeSearch" @@ -261,31 +316,30 @@ msgid "Red" msgstr "Rood" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Momenteel gebruikte zoekmachines" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Naam zoekmachine" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,17 +347,16 @@ msgstr "Toestaan" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blokkeren" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -311,8 +364,8 @@ msgid "" msgstr "Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets over jou te bewaren." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -320,34 +373,34 @@ msgid "" msgstr "Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies niet om je te volgen." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "bewaren" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Standaardinstellingen herstellen" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "terug" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Zoek URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Downloaden zoekresultaten" @@ -358,19 +411,19 @@ msgstr "Antwoorden" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Suggesties" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "vorige pagina" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "volgende pagina" @@ -406,13 +459,13 @@ msgstr "Ophaler" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "magneetlink" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "torrentbestand" @@ -420,18 +473,37 @@ msgstr "torrentbestand" msgid "Click on the magnifier to perform search" msgstr "Klik op het vergrootglas om te zoeken" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "gecached" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "een privacy eerbiedigende, aanpasbare metazoekmachine" @@ -449,17 +521,17 @@ msgid "General" msgstr "Algemeen" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Zoekmachines" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Plugins" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -494,36 +566,46 @@ msgstr "Filteren content" msgid "Change searx layout" msgstr "Wijzig searx layout" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "Kies een stijl voor dit thema" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "Stijl" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Snelkoppeling" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Gem. duur" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Max. duur" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Dit is de lijst van cookies en hun waarden die searx op je computer opslaat." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Met deze lijst kan je de openheid van searx beoordelen." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Cookienaam" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Waarde" @@ -531,7 +613,7 @@ msgstr "Waarde" msgid "Search results" msgstr "Zoekresultaten" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Links" @@ -540,18 +622,26 @@ msgstr "Links" msgid "Start search" msgstr "Start zoeken" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Toon zoekfilters" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Verberg zoekfilters" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "stats" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/pt/LC_MESSAGES/messages.mo b/sources/searx/translations/pt/LC_MESSAGES/messages.mo index acf83eb..73a2c48 100644 Binary files a/sources/searx/translations/pt/LC_MESSAGES/messages.mo and b/sources/searx/translations/pt/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/pt_BR/LC_MESSAGES/messages.mo b/sources/searx/translations/pt_BR/LC_MESSAGES/messages.mo index 325b8f2..17b267b 100644 Binary files a/sources/searx/translations/pt_BR/LC_MESSAGES/messages.mo and b/sources/searx/translations/pt_BR/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/pt_BR/LC_MESSAGES/messages.po b/sources/searx/translations/pt_BR/LC_MESSAGES/messages.po index 8580ff5..96d1a73 100644 --- a/sources/searx/translations/pt_BR/LC_MESSAGES/messages.po +++ b/sources/searx/translations/pt_BR/LC_MESSAGES/messages.po @@ -8,89 +8,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/asciimoo/searx/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "Arquivos" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "geral" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "áudio" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "rede social" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "imagens" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "vídeos" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "códigos" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "notícias" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "mapas" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutos} minuto(s) atrás" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{horas} hora(s), {minutos} minuto(s) atrás" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Carregamento da página (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Pontuações" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Pontuações por resultado" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Erros" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Redirecionar conexões HTTP para HTTPS, se possível" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Pesquisar na categoria selecionada" @@ -115,6 +144,32 @@ msgstr "Remover Tracker da url" msgid "Remove trackers arguments from the returned URL" msgstr "Remover argumentos de url retornáveis" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +256,8 @@ msgstr "Método" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Busca Segura" @@ -260,31 +315,30 @@ msgid "Red" msgstr "Vermelho" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Serviço de busca usado atualmente" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Nome do serviço" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categoria" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "Ativo" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Bloqueado" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "Essas configurações são armazenadas em seus cookies, nos não armazenamos nenhum dado a seu respeito." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "Estes cookies servem ao seu único propósito, nós não usamos esses cookies para rastreá-lo." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "salvar" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Redefinir configurações" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "voltar" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Buscar URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Resultados para download" @@ -357,19 +410,19 @@ msgstr "Perguntas" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Sugestões" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "Página anterior" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "Próxima página" @@ -405,13 +458,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "Link magnético" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "Arquivo torrent" @@ -419,18 +472,37 @@ msgstr "Arquivo torrent" msgid "Click on the magnifier to perform search" msgstr "Clique na lupa para executar a busca" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "em cache" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Distribuído por" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "um mecanismo de metabusca que respeita a sua privacidade" @@ -448,17 +520,17 @@ msgid "General" msgstr "Geral" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Buscadores" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Complementos" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookies" @@ -493,36 +565,46 @@ msgstr "Filtrar conteúdo" msgid "Change searx layout" msgstr "Alterar interface do searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "Atalhos" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "Avg.tempo" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "Tempo máximo" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "Esta é a lista de cookies que searx está armazenando em seu computador." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "Com essa lista, você pode avaliar a transparência do searx." -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "Nome do cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "Valor" @@ -530,7 +612,7 @@ msgstr "Valor" msgid "Search results" msgstr "Procurar resultados" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Links" @@ -539,18 +621,26 @@ msgstr "Links" msgid "Start search" msgstr "Iniciar busca" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Mostrar filtros de busca" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Ocultar filtros de busca" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "estatísticas" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/ro/LC_MESSAGES/messages.mo b/sources/searx/translations/ro/LC_MESSAGES/messages.mo index 25cbf25..41e282b 100644 Binary files a/sources/searx/translations/ro/LC_MESSAGES/messages.mo and b/sources/searx/translations/ro/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/ro/LC_MESSAGES/messages.po b/sources/searx/translations/ro/LC_MESSAGES/messages.po index 9abe0fb..950f59f 100644 --- a/sources/searx/translations/ro/LC_MESSAGES/messages.po +++ b/sources/searx/translations/ro/LC_MESSAGES/messages.po @@ -8,89 +8,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Romanian (http://www.transifex.com/asciimoo/searx/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "fișiere" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "general" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "muzică" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "rețele sociale" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "imagini" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videouri" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "el(ea)" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "știri" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "hartă" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} minut(e) în urmă" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} oră(e), {minutes} minut(e) în urmă" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Încărcarea paginilor (sec)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Numărul de rezultate" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Scoruri" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Scoruri per rezultat" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Erori" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Rescrie legăturile HTTP cu HTTPS dacă e posibil" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "Căutare în categoria selectată" @@ -115,6 +144,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -201,8 +256,8 @@ msgstr "Metodă" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "CăutareSigură" @@ -260,31 +315,30 @@ msgid "Red" msgstr "Roșu" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Motoarele de căutare folosite curent" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Numele motorului" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Categorie" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -292,17 +346,16 @@ msgstr "Permite" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Blochează" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -310,8 +363,8 @@ msgid "" msgstr "Aceste setări sunt stocate în cookie-urile d-voastră, aceasta ne permite să nu stocăm aceste date despre d-voastră." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -319,34 +372,34 @@ msgid "" msgstr "Aceste cookie-uri servesc doar pentru confortul d-voastră, noi nu stocăm aceste cookie-uri pentru a vă urmări." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "salvează" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Resetează valorile implicite" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "înapoi" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "URL de căutare" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Descarcă rezultate" @@ -357,19 +410,19 @@ msgstr "Răspunsuri" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Sugestii" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "pagina anterioară" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "pagina următoare" @@ -405,13 +458,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "legătură magnet" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "fișier torrent" @@ -419,18 +472,37 @@ msgstr "fișier torrent" msgid "Click on the magnifier to perform search" msgstr "Apăsați pe lupă pentru a executa căutarea" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "stocat temporar" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Motorizat de" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "un meta-motor de căutare care respectă confidențialitatea" @@ -448,17 +520,17 @@ msgid "General" msgstr "General" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Motoare" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Module" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -493,36 +565,46 @@ msgstr "Filtrează conținutul" msgid "Change searx layout" msgstr "Schimbă aspectul lui searx" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -530,7 +612,7 @@ msgstr "" msgid "Search results" msgstr "Rezultatele căutării" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Legături" @@ -539,18 +621,26 @@ msgstr "Legături" msgid "Start search" msgstr "Pornește căutarea" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Arată filtrele căutării" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Ascunde filtrele căutării" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "statistici" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/ru/LC_MESSAGES/messages.mo b/sources/searx/translations/ru/LC_MESSAGES/messages.mo index b3777d0..6e49e08 100644 Binary files a/sources/searx/translations/ru/LC_MESSAGES/messages.mo and b/sources/searx/translations/ru/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/ru/LC_MESSAGES/messages.po b/sources/searx/translations/ru/LC_MESSAGES/messages.po index 2319625..4ef57cf 100644 --- a/sources/searx/translations/ru/LC_MESSAGES/messages.po +++ b/sources/searx/translations/ru/LC_MESSAGES/messages.po @@ -5,108 +5,138 @@ # Translators: # dimqua , 2015 # dimqua , 2015 +# Дмитрий Михирев , 2016 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Russian (http://www.transifex.com/asciimoo/searx/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "файлы" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "общие" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "музыка" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "соцсети" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "картинки" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "видео" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "IT" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "новости" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "карты" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "наука" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} минут назад" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} час, {minutes} минут назад" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Время загрузки (сек)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Число результатов" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Попаданий" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Попаданий за результат" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Ошибок" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "По возможности заменять в ссылках HTTP на HTTPS" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" msgstr "" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "" +msgstr "Искать при выборе категории" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" +msgstr "Выполнять поиск сразу при выборе категории. Отключить выбор нескольких категорий. (Требуется JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" +msgstr "Показывает IP-адрес при запросе \"ip\" и user-agent при запросе \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -116,6 +146,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -145,7 +201,7 @@ msgstr "Опции" #: searx/templates/oscar/preferences.html:36 #: searx/templates/oscar/preferences.html:38 msgid "Default categories" -msgstr "Категории по-умолчанию" +msgstr "Категории по умолчанию" #: searx/templates/courgette/preferences.html:13 #: searx/templates/default/preferences.html:14 @@ -172,7 +228,7 @@ msgstr "Язык интерфейса" #: searx/templates/default/preferences.html:35 #: searx/templates/oscar/preferences.html:65 msgid "Autocomplete" -msgstr "Авто-подсказки" +msgstr "Автодополнение" #: searx/templates/courgette/preferences.html:45 #: searx/templates/default/preferences.html:46 @@ -202,8 +258,8 @@ msgstr "Метод" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Безопасный поиск" @@ -238,7 +294,7 @@ msgstr "Цвет" #: searx/templates/courgette/preferences.html:86 msgid "Blue (default)" -msgstr "Синий (по-умолчанию)" +msgstr "Синий (по умолчанию)" #: searx/templates/courgette/preferences.html:87 msgid "Violet" @@ -261,31 +317,30 @@ msgid "Red" msgstr "Красный" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Используемые поисковые движки" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Имя движка" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Категория" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,61 +348,60 @@ msgstr "Разрешить" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Блокировать" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " "data about you." -msgstr "Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить эти сведения о Вас." +msgstr "Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить эти сведения о вас." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Данные cookies применяются для вашего удобства, мы не используем их, чтобы отслеживать Вас." +msgstr "Данные cookies применяются для вашего удобства, мы не используем их чтобы отслеживать вас." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "сохранить" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" -msgstr "" +msgstr "Восстановить настройки по умолчанию" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "назад" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Ссылка на поиск" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Загрузить результаты" @@ -358,19 +412,19 @@ msgstr "Ответы" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Предложения" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "предыдущая стр." #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "следующая стр. " @@ -406,13 +460,13 @@ msgstr "Личер" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "магнет-ссылка" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "торрент-файл" @@ -420,18 +474,37 @@ msgstr "торрент-файл" msgid "Click on the magnifier to perform search" msgstr "Нажмите на лупу, чтобы выполнить поиск" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "в архиве" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Используется" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "свободный движок метапоиска, уважающий вашу приватность" @@ -449,19 +522,19 @@ msgid "General" msgstr "Общие" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Движки" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" -msgstr "" +msgstr "Плагины" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" -msgstr "" +msgstr "Cookies" #: searx/templates/oscar/preferences.html:45 msgid "What language do you prefer for search?" @@ -494,44 +567,54 @@ msgstr "Использовать ли фильтр контента" msgid "Change searx layout" msgstr "Изменить тему сайта" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" -msgstr "" +msgstr "Ускоритель" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" -msgstr "" +msgstr "Среднее время" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" -msgstr "" +msgstr "Максимальное время" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "" +msgstr "Это список cookies и их значений, которые searx хранит на вашем компьютере." -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" -msgstr "" +msgstr "Имя cookie" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" -msgstr "" +msgstr "Значение" #: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Результаты поиска" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Ссылки" @@ -540,18 +623,26 @@ msgstr "Ссылки" msgid "Start search" msgstr "Начать поиск" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Показать фильтры поиска" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Скрыть фильтры поиска" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "статистика" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 @@ -578,11 +669,11 @@ msgstr "Пожалуйста включите JavaScript, чтобы испол #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" -msgstr "" +msgstr "Информация!" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "" +msgstr "в данный момент cookies не установлены." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -596,7 +687,7 @@ msgstr "Сожалеем!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "результатов не найдено. Попробуйте другой запрос или выберете больше категорий." +msgstr "результатов не найдено. Попробуйте другой запрос или выберите больше категорий." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -656,19 +747,19 @@ msgstr "Байт" #: searx/templates/oscar/result_templates/torrent.html:10 msgid "kiB" -msgstr "Кбайт" +msgstr "КиБ" #: searx/templates/oscar/result_templates/torrent.html:11 msgid "MiB" -msgstr "Мбайт" +msgstr "МиБ" #: searx/templates/oscar/result_templates/torrent.html:12 msgid "GiB" -msgstr "Гбайт" +msgstr "ГиБ" #: searx/templates/oscar/result_templates/torrent.html:13 msgid "TiB" -msgstr "Тбайт" +msgstr "ТиБ" #: searx/templates/oscar/result_templates/torrent.html:15 msgid "Number of Files" @@ -684,4 +775,4 @@ msgstr "скрыть видео" #: searx/templates/pix-art/results.html:28 msgid "Load more..." -msgstr "" +msgstr "Загрузить ещё…" diff --git a/sources/searx/translations/tr/LC_MESSAGES/messages.mo b/sources/searx/translations/tr/LC_MESSAGES/messages.mo index 7b785fa..012e4c1 100644 Binary files a/sources/searx/translations/tr/LC_MESSAGES/messages.mo and b/sources/searx/translations/tr/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/tr/LC_MESSAGES/messages.po b/sources/searx/translations/tr/LC_MESSAGES/messages.po index eb9fe8f..cabb3f6 100644 --- a/sources/searx/translations/tr/LC_MESSAGES/messages.po +++ b/sources/searx/translations/tr/LC_MESSAGES/messages.po @@ -3,95 +3,124 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# Caner Başaran , 2014-2015 +# Caner Başaran , 2014-2016 # FIRST AUTHOR , 2014 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 15:06+0000\n" -"Last-Translator: Thomas Pointhuber\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-04 16:41+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Turkish (http://www.transifex.com/asciimoo/searx/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "dosyalar" -#: searx/webapp.py:115 +#: searx/webapp.py:116 msgid "general" msgstr "genel" -#: searx/webapp.py:116 +#: searx/webapp.py:117 msgid "music" msgstr "müzik" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "sosyal medya" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "görseller" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "videolar" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "bilişim" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "haberler" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "harita" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" -msgstr "" +msgstr "bilim" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes} dakika() önce" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} saat(), {minutes} dakika() önce" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Yüklenen sayfa (sn)" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "Sonuç sayısı" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Hatalar" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Mümkünse HTTP bağlantıları HTTPS olarak düzelt" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "Bağlantıları yeni sekmede aç" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "" @@ -116,6 +145,32 @@ msgstr "" msgid "Remove trackers arguments from the returned URL" msgstr "" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +257,8 @@ msgstr "Sorgu gönderim yöntemi" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "Güvenli Arama" @@ -261,31 +316,30 @@ msgid "Red" msgstr "Kırmızı" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "Şu anda kullanılan arama motorları" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "Motor adı" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "Türü" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,17 +347,16 @@ msgstr "İzin ver" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "Engelle" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " @@ -311,8 +364,8 @@ msgid "" msgstr "Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda veri saklamak için değildir." #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -320,34 +373,34 @@ msgid "" msgstr "Bu çerezler size kolaylık sağlar. Sizi takip etmek için kullanılmaz." #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "kaydet" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "Varsayılanları sıfırla" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "geri" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "Arama Bağlantısı" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "Arama sonuçlarını indir" @@ -358,19 +411,19 @@ msgstr "" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "Öneriler" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "önceki sayfa" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "sonraki sayfa" @@ -406,13 +459,13 @@ msgstr "Sömürenler" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "mıknatıs bağlantı" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "torrent dosyası" @@ -420,18 +473,37 @@ msgstr "torrent dosyası" msgid "Click on the magnifier to perform search" msgstr "Arama yapmak için büyütece tıklayın" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "önbellek" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Gücümün kaynağı" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta arama motoru" @@ -449,17 +521,17 @@ msgid "General" msgstr "Genel" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "Motorlar" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "Eklentiler" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "" @@ -494,36 +566,46 @@ msgstr "İçeriyi süz" msgid "Change searx layout" msgstr "searx yerleşim düzenini değiştir" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." msgstr "" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." msgstr "" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "" @@ -531,7 +613,7 @@ msgstr "" msgid "Search results" msgstr "Arama sonuçları" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "Bağlantılar" @@ -540,18 +622,26 @@ msgstr "Bağlantılar" msgid "Start search" msgstr "Aramayı başlat" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "Arama süzgeçlerini göster" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "Arama süzgeçlerini gizle" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "istatistikler" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/translations/zh_CN/LC_MESSAGES/messages.mo b/sources/searx/translations/zh_CN/LC_MESSAGES/messages.mo index 0cd5edd..3d80c81 100644 Binary files a/sources/searx/translations/zh_CN/LC_MESSAGES/messages.mo and b/sources/searx/translations/zh_CN/LC_MESSAGES/messages.mo differ diff --git a/sources/searx/translations/zh_CN/LC_MESSAGES/messages.po b/sources/searx/translations/zh_CN/LC_MESSAGES/messages.po index c790356..beda94e 100644 --- a/sources/searx/translations/zh_CN/LC_MESSAGES/messages.po +++ b/sources/searx/translations/zh_CN/LC_MESSAGES/messages.po @@ -9,89 +9,118 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-01-21 16:05+0100\n" -"PO-Revision-Date: 2016-01-21 16:25+0000\n" +"POT-Creation-Date: 2016-09-04 18:36+0200\n" +"PO-Revision-Date: 2016-09-05 09:42+0000\n" "Last-Translator: wenke\n" "Language-Team: Chinese (China) (http://www.transifex.com/asciimoo/searx/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.2.0\n" +"Generated-By: Babel 2.3.4\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: searx/webapp.py:114 +#: searx/webapp.py:115 msgid "files" msgstr "文件" -#: searx/webapp.py:115 -msgid "general" -msgstr "一般" - #: searx/webapp.py:116 +msgid "general" +msgstr "全部" + +#: searx/webapp.py:117 msgid "music" msgstr "音乐" -#: searx/webapp.py:117 +#: searx/webapp.py:118 msgid "social media" msgstr "社交媒体" -#: searx/webapp.py:118 +#: searx/webapp.py:119 msgid "images" msgstr "图片" -#: searx/webapp.py:119 +#: searx/webapp.py:120 msgid "videos" msgstr "视频" -#: searx/webapp.py:120 +#: searx/webapp.py:121 msgid "it" msgstr "it" -#: searx/webapp.py:121 +#: searx/webapp.py:122 msgid "news" msgstr "新闻" -#: searx/webapp.py:122 +#: searx/webapp.py:123 msgid "map" msgstr "地图" -#: searx/webapp.py:123 +#: searx/webapp.py:124 msgid "science" msgstr "学术" -#: searx/webapp.py:415 +#: searx/webapp.py:423 msgid "{minutes} minute(s) ago" msgstr "{minutes}分钟之前" -#: searx/webapp.py:417 +#: searx/webapp.py:425 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours}小时{minutes}分钟之前" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "页面加载 （秒）" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88 msgid "Number of results" msgstr "结果数" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "得分" -#: searx/engines/__init__.py:197 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "每个结果等分" -#: searx/engines/__init__.py:201 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "错误" +#: searx/plugins/doai_rewrite.py:7 +msgid "DOAI rewrite" +msgstr "DOAI改写" + +#: searx/plugins/doai_rewrite.py:8 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + #: searx/plugins/https_rewrite.py:29 msgid "Rewrite HTTP links to HTTPS if possible" msgstr "如果可能的话重定向HTTP链接到HTTPS" +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "无限滚动" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "滚动到当前页面底部时自动加载下一页" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:122 +msgid "Open result links on new browser tabs" +msgstr "在新标签页打开搜索链接" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "搜索结果默认在原窗口打开。这个插件使其在新标签页/窗口打开。（需要启用JavaScript ）" + #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" msgstr "搜索类别选择" @@ -100,13 +129,13 @@ msgstr "搜索类别选择" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "如果选中一个类别立即搜索。禁用选择多个类别功能。（JavaScript 启用）" +msgstr "选中一个类别立即搜索。禁用可以选择多个类别搜索。（JavaScript 启用）" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "搜索“ip”显示你的ip和搜索内容包括“user agent”显示你的user agent。" +msgstr "搜索“ip”显示你的ip以及搜索内容含有“user agent”显示你的user agent。" #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -116,6 +145,32 @@ msgstr "移除跟踪链接" msgid "Remove trackers arguments from the returned URL" msgstr "从返回的链接中移除跟踪参数" +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "类vim快捷键" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "使用类vim快捷键浏览搜索结果（JavaScript启用）。按“h”键获取帮助。" + +#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +msgid "Page not found" +msgstr "未找到网页" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "返回%(search_page)s。" + +#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +msgid "search page" +msgstr "搜索页面" + #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 #: searx/templates/courgette/results.html:5 @@ -202,8 +257,8 @@ msgstr "方法" #: searx/templates/courgette/preferences.html:63 #: searx/templates/default/preferences.html:64 #: searx/templates/oscar/preferences.html:94 -#: searx/templates/oscar/preferences.html:144 -#: searx/templates/oscar/preferences.html:150 +#: searx/templates/oscar/preferences.html:160 +#: searx/templates/oscar/preferences.html:166 msgid "SafeSearch" msgstr "安全搜索" @@ -261,31 +316,30 @@ msgid "Red" msgstr "红色" #: searx/templates/courgette/preferences.html:96 -#: searx/templates/default/preferences.html:84 +#: searx/templates/default/preferences.html:93 #: searx/templates/pix-art/preferences.html:49 msgid "Currently used search engines" msgstr "目前使用的搜索引擎" #: searx/templates/courgette/preferences.html:100 -#: searx/templates/default/preferences.html:88 -#: searx/templates/oscar/preferences.html:142 -#: searx/templates/oscar/preferences.html:152 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:158 +#: searx/templates/oscar/preferences.html:168 #: searx/templates/pix-art/preferences.html:53 msgid "Engine name" msgstr "搜索引擎名称" #: searx/templates/courgette/preferences.html:101 -#: searx/templates/default/preferences.html:89 +#: searx/templates/default/preferences.html:98 msgid "Category" msgstr "类别" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:113 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:101 -#: searx/templates/oscar/macros.html:71 -#: searx/templates/oscar/preferences.html:141 -#: searx/templates/oscar/preferences.html:153 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:157 +#: searx/templates/oscar/preferences.html:169 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:64 msgid "Allow" @@ -293,61 +347,60 @@ msgstr "允许" #: searx/templates/courgette/preferences.html:102 #: searx/templates/courgette/preferences.html:114 -#: searx/templates/default/preferences.html:90 -#: searx/templates/default/preferences.html:102 -#: searx/templates/oscar/macros.html:70 +#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:111 #: searx/templates/pix-art/preferences.html:54 #: searx/templates/pix-art/preferences.html:65 msgid "Block" msgstr "阻止" #: searx/templates/courgette/preferences.html:122 -#: searx/templates/default/preferences.html:110 -#: searx/templates/oscar/preferences.html:235 +#: searx/templates/default/preferences.html:119 +#: searx/templates/oscar/preferences.html:257 #: searx/templates/pix-art/preferences.html:73 msgid "" "These settings are stored in your cookies, this allows us not to store this " "data about you." -msgstr "这些设置保存你的cookie，这代表我们不能储存你的数据。" +msgstr "这些设置保存在你的cookie，我们不能保存你的数据。" #: searx/templates/courgette/preferences.html:124 -#: searx/templates/default/preferences.html:112 -#: searx/templates/oscar/preferences.html:237 +#: searx/templates/default/preferences.html:121 +#: searx/templates/oscar/preferences.html:259 #: searx/templates/pix-art/preferences.html:75 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "这些cookie是为了让你更加方便，我们不会使用这些cookie跟踪你。" +msgstr "这些cookie是为了让你更加方便，我们不会使用这些cookie追踪你。" #: searx/templates/courgette/preferences.html:127 -#: searx/templates/default/preferences.html:115 -#: searx/templates/oscar/preferences.html:240 +#: searx/templates/default/preferences.html:124 +#: searx/templates/oscar/preferences.html:262 #: searx/templates/pix-art/preferences.html:78 msgid "save" msgstr "保存" #: searx/templates/courgette/preferences.html:128 -#: searx/templates/default/preferences.html:116 -#: searx/templates/oscar/preferences.html:242 +#: searx/templates/default/preferences.html:125 +#: searx/templates/oscar/preferences.html:264 msgid "Reset defaults" msgstr "恢复默认" #: searx/templates/courgette/preferences.html:129 -#: searx/templates/default/preferences.html:117 -#: searx/templates/oscar/preferences.html:241 +#: searx/templates/default/preferences.html:126 +#: searx/templates/oscar/preferences.html:263 #: searx/templates/pix-art/preferences.html:79 msgid "back" msgstr "返回" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:13 -#: searx/templates/oscar/results.html:110 +#: searx/templates/oscar/results.html:124 msgid "Search URL" msgstr "搜索链接" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:17 -#: searx/templates/oscar/results.html:115 +#: searx/templates/oscar/results.html:129 msgid "Download results" msgstr "下载结果" @@ -358,19 +411,19 @@ msgstr "回答" #: searx/templates/courgette/results.html:42 #: searx/templates/default/results.html:43 -#: searx/templates/oscar/results.html:90 +#: searx/templates/oscar/results.html:104 msgid "Suggestions" msgstr "搜索建议" #: searx/templates/courgette/results.html:70 #: searx/templates/default/results.html:81 -#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66 msgid "previous page" msgstr "上一页" #: searx/templates/courgette/results.html:81 #: searx/templates/default/results.html:92 -#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75 msgid "next page" msgstr "下一页" @@ -406,13 +459,13 @@ msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/default/result_templates/torrent.html:9 -#: searx/templates/oscar/macros.html:21 +#: searx/templates/oscar/macros.html:24 msgid "magnet link" msgstr "磁力链接" #: searx/templates/courgette/result_templates/torrent.html:10 #: searx/templates/default/result_templates/torrent.html:10 -#: searx/templates/oscar/macros.html:22 +#: searx/templates/oscar/macros.html:25 msgid "torrent file" msgstr "种子文件" @@ -420,18 +473,37 @@ msgstr "种子文件" msgid "Click on the magnifier to perform search" msgstr "点击放大镜执行搜索" +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:121 +msgid "Results on new tabs" +msgstr "在新标签页打开搜索结果" + +#: searx/templates/default/preferences.html:87 +#: searx/templates/oscar/preferences.html:125 +msgid "On" +msgstr "开" + +#: searx/templates/default/preferences.html:88 +#: searx/templates/oscar/preferences.html:126 +msgid "Off" +msgstr "关" + #: searx/templates/default/result_templates/code.html:3 #: searx/templates/default/result_templates/default.html:3 #: searx/templates/default/result_templates/map.html:9 -#: searx/templates/oscar/macros.html:20 +#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46 msgid "cached" msgstr "缓存" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "高级设置" + +#: searx/templates/oscar/base.html:82 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:78 +#: searx/templates/oscar/base.html:82 msgid "a privacy-respecting, hackable metasearch engine" msgstr "一个尊重隐私，可再开发的元搜索引擎" @@ -449,17 +521,17 @@ msgid "General" msgstr "常规" #: searx/templates/oscar/preferences.html:18 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/oscar/preferences.html:142 msgid "Engines" msgstr "搜索引擎" #: searx/templates/oscar/preferences.html:19 -#: searx/templates/oscar/preferences.html:187 +#: searx/templates/oscar/preferences.html:207 msgid "Plugins" msgstr "插件" #: searx/templates/oscar/preferences.html:20 -#: searx/templates/oscar/preferences.html:210 +#: searx/templates/oscar/preferences.html:232 msgid "Cookies" msgstr "Cookie" @@ -484,7 +556,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "更改请求方法，了解更多请求方法相关" +msgstr "更改请求方法，深入了解请求方法" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -494,36 +566,46 @@ msgstr "过滤内容" msgid "Change searx layout" msgstr "改变searx布局" -#: searx/templates/oscar/preferences.html:143 -#: searx/templates/oscar/preferences.html:151 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Choose style for this theme" +msgstr "选择这个主题的样式" + +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/oscar/preferences.html:119 +msgid "Style" +msgstr "样式" + +#: searx/templates/oscar/preferences.html:159 +#: searx/templates/oscar/preferences.html:167 msgid "Shortcut" msgstr "快捷键" -#: searx/templates/oscar/preferences.html:145 -#: searx/templates/oscar/preferences.html:149 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:165 msgid "Avg. time" msgstr "平均时间" -#: searx/templates/oscar/preferences.html:146 -#: searx/templates/oscar/preferences.html:148 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:164 msgid "Max time" msgstr "最大时间" -#: searx/templates/oscar/preferences.html:213 +#: searx/templates/oscar/preferences.html:235 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "这是searx保存在你的电脑上的cookie列表。" +msgstr "这里展示了searx保存在你的电脑上的cookie。" -#: searx/templates/oscar/preferences.html:214 +#: searx/templates/oscar/preferences.html:236 msgid "With that list, you can assess searx transparency." -msgstr "有了这个列表，你可以评价searx透明度。" +msgstr "有了这个列表，你可以评估searx透明度。" -#: searx/templates/oscar/preferences.html:219 +#: searx/templates/oscar/preferences.html:241 msgid "Cookie name" msgstr "cookie名称" -#: searx/templates/oscar/preferences.html:220 +#: searx/templates/oscar/preferences.html:242 msgid "Value" msgstr "值" @@ -531,7 +613,7 @@ msgstr "值" msgid "Search results" msgstr "搜索结果" -#: searx/templates/oscar/results.html:105 +#: searx/templates/oscar/results.html:119 msgid "Links" msgstr "链接" @@ -540,18 +622,26 @@ msgstr "链接" msgid "Start search" msgstr "开始搜索" -#: searx/templates/oscar/search_full.html:15 -msgid "Show search filters" -msgstr "显示搜索过滤器" - -#: searx/templates/oscar/search_full.html:15 -msgid "Hide search filters" -msgstr "隐藏搜索过滤器" - #: searx/templates/oscar/stats.html:2 msgid "stats" msgstr "统计" +#: searx/templates/oscar/time-range.html:3 +msgid "Anytime" +msgstr "时间不限" + +#: searx/templates/oscar/time-range.html:6 +msgid "Last day" +msgstr "过去一天内" + +#: searx/templates/oscar/time-range.html:9 +msgid "Last week" +msgstr "过去一周内" + +#: searx/templates/oscar/time-range.html:12 +msgid "Last month" +msgstr "过去一个月内" + #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 diff --git a/sources/searx/utils.py b/sources/searx/utils.py index b297582..b3806d3 100644 --- a/sources/searx/utils.py +++ b/sources/searx/utils.py @@ -9,20 +9,21 @@ from HTMLParser import HTMLParser from random import choice from searx.version import VERSION_STRING +from searx.languages import language_codes from searx import settings from searx import logger logger = logger.getChild('utils') -ua_versions = ('33.0', - '34.0', - '35.0', - '36.0', - '37.0', - '38.0', - '39.0', - '40.0') +ua_versions = ('40.0', + '41.0', + '42.0', + '43.0', + '44.0', + '45.0', + '46.0', + '47.0') ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64', @@ -63,7 +64,7 @@ def highlight_content(content, query): regex_parts = [] for chunk in query.split(): if len(chunk) == 1: - regex_parts.append(u'\W+{0}\W+'.format(re.escape(chunk))) + regex_parts.append(u'\\W+{0}\\W+'.format(re.escape(chunk))) else: regex_parts.append(u'{0}'.format(re.escape(chunk))) query_regex = u'({0})'.format('|'.join(regex_parts)) @@ -74,6 +75,7 @@ def highlight_content(content, query): class HTMLTextExtractor(HTMLParser): + def __init__(self): HTMLParser.__init__(self) self.result = [] @@ -205,7 +207,13 @@ def format_date_by_locale(date, locale_string): if locale_string == 'all': locale_string = settings['ui']['default_locale'] or 'en_US' - return format_date(date, locale=locale_string) + # to avoid crashing if locale is not supported by babel + try: + formatted_date = format_date(date, locale=locale_string) + except: + formatted_date = format_date(date, "YYYY-MM-dd") + + return formatted_date def dict_subset(d, properties): @@ -230,3 +238,35 @@ def list_get(a_list, index, default=None): return a_list[index] else: return default + + +def get_torrent_size(filesize, filesize_multiplier): + try: + filesize = float(filesize) + + if filesize_multiplier == 'TB': + filesize = int(filesize * 1024 * 1024 * 1024 * 1024) + elif filesize_multiplier == 'GB': + filesize = int(filesize * 1024 * 1024 * 1024) + elif filesize_multiplier == 'MB': + filesize = int(filesize * 1024 * 1024) + elif filesize_multiplier == 'KB': + filesize = int(filesize * 1024) + except: + filesize = None + + return filesize + + +def is_valid_lang(lang): + is_abbr = (len(lang) == 2) + if is_abbr: + for l in language_codes: + if l[0][:2] == lang.lower(): + return (True, l[0][:2], l[1].lower()) + return False + else: + for l in language_codes: + if l[1].lower() == lang.lower(): + return (True, l[0][:2], l[1].lower()) + return False diff --git a/sources/searx/version.py b/sources/searx/version.py index 7f254df..e32307b 100644 --- a/sources/searx/version.py +++ b/sources/searx/version.py @@ -18,7 +18,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. # version of searx VERSION_MAJOR = 0 -VERSION_MINOR = 9 +VERSION_MINOR = 10 VERSION_BUILD = 0 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR, diff --git a/sources/searx/webapp.py b/sources/searx/webapp.py index e60050e..f76281a 100644 --- a/sources/searx/webapp.py +++ b/sources/searx/webapp.py @@ -48,7 +48,7 @@ from flask import ( Flask, request, render_template, url_for, Response, make_response, redirect, send_from_directory ) -from flask.ext.babel import Babel, gettext, format_date, format_decimal +from flask_babel import Babel, gettext, format_date, format_decimal from flask.json import jsonify from searx import settings, searx_dir from searx.engines import ( @@ -320,6 +320,8 @@ def render(template_name, override_theme=None, **kwargs): kwargs['instance_name'] = settings['general']['instance_name'] + kwargs['results_on_new_tab'] = request.preferences.get_value('results_on_new_tab') + kwargs['scripts'] = set() for plugin in request.user_plugins: for script in plugin.js_dependencies: @@ -338,7 +340,11 @@ def render(template_name, override_theme=None, **kwargs): def pre_request(): # merge GET, POST vars preferences = Preferences(themes, categories.keys(), engines, plugins) - preferences.parse_cookies(request.cookies) + try: + preferences.parse_cookies(request.cookies) + except: + # TODO throw error message to the user + logger.warning('Invalid config') request.preferences = preferences request.form = dict(request.form.items()) @@ -380,18 +386,18 @@ def index(): plugins.call('post_search', request, locals()) - for result in search.result_container.get_ordered_results(): + results = search.result_container.get_ordered_results() + + for result in results: plugins.call('on_result', request, locals()) if not search.paging and engines[result['engine']].paging: search.paging = True if search.request_data.get('format', 'html') == 'html': - if 'content' in result: - result['content'] = highlight_content(result['content'], - search.query.encode('utf-8')) # noqa - result['title'] = highlight_content(result['title'], - search.query.encode('utf-8')) + if 'content' in result and result['content']: + result['content'] = highlight_content(result['content'][:1024], search.query.encode('utf-8')) + result['title'] = highlight_content(result['title'], search.query.encode('utf-8')) else: if result.get('content'): result['content'] = html_to_text(result['content']).strip() @@ -418,16 +424,20 @@ def index(): else: result['publishedDate'] = format_date(result['publishedDate']) + number_of_results = search.result_container.results_number() + if number_of_results < search.result_container.results_length(): + number_of_results = 0 + if search.request_data.get('format') == 'json': return Response(json.dumps({'query': search.query, - 'number_of_results': search.result_container.number_of_results, - 'results': search.result_container.get_ordered_results()}), + 'number_of_results': number_of_results, + 'results': results}), mimetype='application/json') elif search.request_data.get('format') == 'csv': csv = UnicodeWriter(cStringIO.StringIO()) keys = ('title', 'url', 'content', 'host', 'engine', 'score') csv.writerow(keys) - for row in search.result_container.get_ordered_results(): + for row in results: row['host'] = row['parsed_url'].netloc csv.writerow([row.get(key, '') for key in keys]) csv.stream.seek(0) @@ -438,21 +448,23 @@ def index(): elif search.request_data.get('format') == 'rss': response_rss = render( 'opensearch_response_rss.xml', - results=search.result_container.get_ordered_results(), + results=results, q=search.request_data['q'], - number_of_results=search.result_container.number_of_results, + number_of_results=number_of_results, base_url=get_base_url() ) return Response(response_rss, mimetype='text/xml') return render( 'results.html', - results=search.result_container.get_ordered_results(), + results=results, q=search.request_data['q'], selected_categories=search.categories, paging=search.paging, - number_of_results=format_decimal(search.result_container.number_of_results), + number_of_results=format_decimal(number_of_results), pageno=search.pageno, + advanced_search=search.is_advanced, + time_range=search.time_range, base_url=get_base_url(), suggestions=search.result_container.suggestions, answers=search.result_container.answers, @@ -693,6 +705,7 @@ def config(): return jsonify({'categories': categories.keys(), 'engines': [{'name': engine_name, 'categories': engine.categories, + 'shortcut': engine.shortcut, 'enabled': not engine.disabled} for engine_name, engine in engines.items()], 'plugins': [{'name': plugin.name, @@ -706,12 +719,18 @@ def config(): 'default_theme': settings['ui']['default_theme']}) +@app.errorhandler(404) +def page_not_found(e): + return render('404.html') + + def run(): app.run( debug=settings['general']['debug'], use_debugger=settings['general']['debug'], port=settings['server']['port'], - host=settings['server']['bind_address'] + host=settings['server']['bind_address'], + threaded=True ) @@ -734,6 +753,7 @@ class ReverseProxyPathFix(object): :param app: the WSGI application ''' + def __init__(self, app): self.app = app diff --git a/sources/tests/robot/test_basic.robot b/sources/tests/robot/test_basic.robot index 4a20d0b..a455eea 100644 --- a/sources/tests/robot/test_basic.robot +++ b/sources/tests/robot/test_basic.robot @@ -9,9 +9,14 @@ Front page Page Should Contain about Page Should Contain preferences +404 page + Go To http://localhost:11111/no-such-page + Page Should Contain Page not found + Page Should Contain Go to search page + About page Click Element link=about - Page Should Contain Why use Searx? + Page Should Contain Why use searx? Page Should Contain Element link=search engines Preferences page diff --git a/sources/tests/unit/engines/test_dailymotion.py b/sources/tests/unit/engines/test_dailymotion.py index 4c31ff5..368b3a7 100644 --- a/sources/tests/unit/engines/test_dailymotion.py +++ b/sources/tests/unit/engines/test_dailymotion.py @@ -62,7 +62,7 @@ class TestDailymotionEngine(SearxTestCase): self.assertEqual(results[0]['content'], 'Description') self.assertIn('x2fit7q', results[0]['embedded']) - json = """ + json = r""" {"toto":[ {"id":200,"name":"Artist Name", "link":"http:\/\/www.dailymotion.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_deezer.py b/sources/tests/unit/engines/test_deezer.py index ad09d2a..cfef852 100644 --- a/sources/tests/unit/engines/test_deezer.py +++ b/sources/tests/unit/engines/test_deezer.py @@ -27,7 +27,7 @@ class TestDeezerEngine(SearxTestCase): response = mock.Mock(text='{"data": []}') self.assertEqual(deezer.response(response), []) - json = """ + json = r""" {"data":[ {"id":100, "title":"Title of track", "link":"https:\/\/www.deezer.com\/track\/1094042","duration":232, @@ -45,7 +45,7 @@ class TestDeezerEngine(SearxTestCase): self.assertEqual(results[0]['content'], 'Artist Name • Album Title • Title of track') self.assertTrue('100' in results[0]['embedded']) - json = """ + json = r""" {"data":[ {"id":200,"name":"Artist Name", "link":"https:\/\/www.deezer.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_deviantart.py b/sources/tests/unit/engines/test_deviantart.py index 78a3913..75c59f7 100644 --- a/sources/tests/unit/engines/test_deviantart.py +++ b/sources/tests/unit/engines/test_deviantart.py @@ -10,6 +10,7 @@ class TestDeviantartEngine(SearxTestCase): query = 'test_query' dicto = defaultdict(dict) dicto['pageno'] = 0 + dicto['time_range'] = '' params = deviantart.request(query, dicto) self.assertTrue('url' in params) self.assertTrue(query in params['url']) @@ -28,44 +29,13 @@ class TestDeviantartEngine(SearxTestCase): self.assertEqual(deviantart.response(response), []) html = """ -
- - - - - - - Test - - - - - - - Title of image - - - - 5 years ago - - in Animation - -
- - 9 Comments -
- - More Like This - - - +
+ + + + + Title of image
""" response = mock.Mock(text=html) @@ -73,7 +43,7 @@ class TestDeviantartEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 1) self.assertEqual(results[0]['title'], 'Title of image') - self.assertEqual(results[0]['url'], 'http://url.of.result/2nd.part.of.url') + self.assertEqual(results[0]['url'], 'https://url.of.image') self.assertNotIn('content', results[0]) self.assertEqual(results[0]['thumbnail_src'], 'https://url.of.thumbnail') diff --git a/sources/tests/unit/engines/test_digbt.py b/sources/tests/unit/engines/test_digbt.py new file mode 100644 index 0000000..867188e --- /dev/null +++ b/sources/tests/unit/engines/test_digbt.py @@ -0,0 +1,59 @@ +from collections import defaultdict +import mock +from searx.engines import digbt +from searx.testing import SearxTestCase + + +class TestDigBTEngine(SearxTestCase): + + def test_request(self): + query = 'test_query' + dicto = defaultdict(dict) + dicto['pageno'] = 0 + params = digbt.request(query, dicto) + self.assertIn('url', params) + self.assertIn(query, params['url']) + self.assertIn('digbt.org', params['url']) + + def test_response(self): + self.assertRaises(AttributeError, digbt.response, None) + self.assertRaises(AttributeError, digbt.response, []) + self.assertRaises(AttributeError, digbt.response, '') + self.assertRaises(AttributeError, digbt.response, '[]') + + response = mock.Mock(content='') + self.assertEqual(digbt.response(response), []) + + html = """ +
{{ attribute.label }}{{ attribute.label }}{{ attribute.image.alt }}{{ attribute.value }}{{ attribute.value }}
{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} + {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} + {{ search_engine.name }} {{ shortcuts[search_engine.name] }} {{ shortcuts[search_engine.name] }} {{ search_engine.name }}{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} + {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} +
+ +
+
+ The Big Bang Theory + 4 hours ago +
+
+
    +
  • The Big Bang Theory 2.9 GB
    • +
  • ....
    • +
+
+
+ Files: 1 Size: 2.9 GB Downloads: 1 Updated: 4 hours ago +     + + magnet-link + +     +
+
+ """ + response = mock.Mock(content=html) + results = digbt.response(response) + self.assertEqual(type(results), list) + self.assertEqual(len(results), 1) + self.assertEqual(results[0]['title'], 'The Big Bang Theory') + self.assertEqual(results[0]['url'], 'https://digbt.org/The-Big-Bang-Theory-d2.html') + self.assertEqual(results[0]['content'], 'The Big Bang Theory 2.9 GB ....') + self.assertEqual(results[0]['filesize'], 3113851289) + self.assertEqual(results[0]['magnetlink'], 'magnet:?xt=urn:btih:a&dn=The+Big+Bang+Theory') diff --git a/sources/tests/unit/engines/test_duckduckgo.py b/sources/tests/unit/engines/test_duckduckgo.py index 8f99dc9..cb866d3 100644 --- a/sources/tests/unit/engines/test_duckduckgo.py +++ b/sources/tests/unit/engines/test_duckduckgo.py @@ -11,16 +11,13 @@ class TestDuckduckgoEngine(SearxTestCase): query = 'test_query' dicto = defaultdict(dict) dicto['pageno'] = 1 - dicto['language'] = 'fr_FR' + dicto['language'] = 'de_CH' + dicto['time_range'] = '' params = duckduckgo.request(query, dicto) self.assertIn('url', params) self.assertIn(query, params['url']) self.assertIn('duckduckgo.com', params['url']) - self.assertIn('fr-fr', params['url']) - - dicto['language'] = 'all' - params = duckduckgo.request(query, dicto) - self.assertIn('en-us', params['url']) + self.assertIn('ch-de', params['url']) def test_response(self): self.assertRaises(AttributeError, duckduckgo.response, None) diff --git a/sources/tests/unit/engines/test_flickr.py b/sources/tests/unit/engines/test_flickr.py index 8b39e92..2d7472a 100644 --- a/sources/tests/unit/engines/test_flickr.py +++ b/sources/tests/unit/engines/test_flickr.py @@ -27,7 +27,7 @@ class TestFlickrEngine(SearxTestCase): response = mock.Mock(text='{"data": []}') self.assertEqual(flickr.response(response), []) - json = """ + json = r""" { "photos": { "page": 1, "pages": "41001", "perpage": 100, "total": "4100032", "photo": [ { "id": "15751017054", "owner": "66847915@N08", @@ -55,7 +55,7 @@ class TestFlickrEngine(SearxTestCase): self.assertTrue('Owner' in results[0]['content']) self.assertTrue('Description' in results[0]['content']) - json = """ + json = r""" { "photos": { "page": 1, "pages": "41001", "perpage": 100, "total": "4100032", "photo": [ { "id": "15751017054", "owner": "66847915@N08", @@ -79,7 +79,7 @@ class TestFlickrEngine(SearxTestCase): self.assertTrue('Owner' in results[0]['content']) self.assertTrue('Description' in results[0]['content']) - json = """ + json = r""" { "photos": { "page": 1, "pages": "41001", "perpage": 100, "total": "4100032", "photo": [ { "id": "15751017054", "owner": "66847915@N08", @@ -103,7 +103,7 @@ class TestFlickrEngine(SearxTestCase): self.assertTrue('Owner' in results[0]['content']) self.assertTrue('Description' in results[0]['content']) - json = """ + json = r""" { "photos": { "page": 1, "pages": "41001", "perpage": 100, "total": "4100032", "photo": [ { "id": "15751017054", "owner": "66847915@N08", @@ -130,7 +130,7 @@ class TestFlickrEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 0) - json = """ + json = r""" {"toto":[ {"id":200,"name":"Artist Name", "link":"http:\/\/www.flickr.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_flickr_noapi.py b/sources/tests/unit/engines/test_flickr_noapi.py index 3b337a2..42f38f9 100644 --- a/sources/tests/unit/engines/test_flickr_noapi.py +++ b/sources/tests/unit/engines/test_flickr_noapi.py @@ -316,7 +316,7 @@ class TestFlickrNoapiEngine(SearxTestCase): self.assertEqual(len(results), 0) # garbage test - json = """ + json = r""" {"toto":[ {"id":200,"name":"Artist Name", "link":"http:\/\/www.flickr.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_google.py b/sources/tests/unit/engines/test_google.py index 37a83ca..8e73e2a 100644 --- a/sources/tests/unit/engines/test_google.py +++ b/sources/tests/unit/engines/test_google.py @@ -19,6 +19,7 @@ class TestGoogleEngine(SearxTestCase): dicto = defaultdict(dict) dicto['pageno'] = 1 dicto['language'] = 'fr_FR' + dicto['time_range'] = '' params = google.request(query, dicto) self.assertIn('url', params) self.assertIn(query, params['url']) diff --git a/sources/tests/unit/engines/test_google_images.py b/sources/tests/unit/engines/test_google_images.py index 5f184e0..493741c 100644 --- a/sources/tests/unit/engines/test_google_images.py +++ b/sources/tests/unit/engines/test_google_images.py @@ -11,10 +11,10 @@ class TestGoogleImagesEngine(SearxTestCase): dicto = defaultdict(dict) dicto['pageno'] = 1 dicto['safesearch'] = 1 + dicto['time_range'] = '' params = google_images.request(query, dicto) self.assertIn('url', params) self.assertIn(query, params['url']) - self.assertIn('safe=active', params['url']) dicto['safesearch'] = 0 params = google_images.request(query, dicto) @@ -26,33 +26,17 @@ class TestGoogleImagesEngine(SearxTestCase): self.assertRaises(AttributeError, google_images.response, '') self.assertRaises(AttributeError, google_images.response, '[]') - response = mock.Mock(text='
') - self.assertEqual(google_images.response(response), []) - - html = """ -
- -
-
- Image result for south -
-
504 × 598 - clker.com -
-
- -
- {"id":"bQWQ9wz9loJmjM:","isu":"clker.com","ity":"png","md":"/search?tbs\u003dsbi:AMhZZit7u1mHyop9pQisu-5idR-8W_1Itvwc3afChmsjQYPx_1yYMzBvUZgtkcGoojqekKZ-6n_1rjX9ySH0OWA_1eO5OijFY6BBDw_1GApr6xxb1bXJcBcj-DiguMoXWW7cZSG7MRQbwnI5SoDZNXcv_1xGszy886I7NVb_1oRKSliTHtzqbXAxhvYreM","msu":"/search?q\u003dsouth\u0026biw\u003d1364\u0026bih\u003d235\u0026tbm\u003disch\u0026tbs\u003dsimg:CAQSEgltBZD3DP2WgiG-U42R4G0RFw","oh":598,"os":"13KB","ow":504,"pt":"South Arrow Clip Art at Clker.com - vector clip art online ...","rid":"vlONkeBtERfDuM","s":"Download this image as:","sc":1,"si":"/search?q\u003dsouth\u0026biw\u003d1364\u0026bih\u003d235\u0026tbm\u003disch\u0026tbs\u003dsimg:CAESEgltBZD3DP2WgiG-U42R4G0RFw","th":245,"tu":"https://thumbnail.url/","tw":206,"ru":"a","ou":"b"} -
-
-
-
- """ # noqa + html = r""" +["rg_s",["dom","\u003Cstyle\u003E.rg_kn,.rg_s{}.rg_bx{display:-moz-inline-box;display:inline-block;margin-top:0;margin-right:12px;margin-bottom:12px;margin-left:0;overflow:hidden;position:relative;vertical-align:top;z-index:1}.rg_meta{display:none}.rg_l{display:inline-block;height:100%;position:absolute;text-decoration:none;width:100%}.rg_l:focus{outline:0}.rg_i{border:0;color:rgba(0,0,0,0);display:block;-webkit-touch-callout:none;}.rg_an,.rg_anbg,.rg_ilm,.rg_ilmbg{right:0;bottom:0;box-sizing:border-box;-moz-box-sizing:border-box;color:#fff;font:normal 11px arial,sans-serif;line-height:100%;white-space:nowrap;width:100%}.rg_anbg,.rg_ilmbg{background:rgba(51,51,51,0.8);margin-left:0;padding:2px 4px;position:absolute}.rg_ilmn{bottom:0;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rg_ilm{display:none}#rg_s.rg_kn .rg_l:focus .rg_ilm{display:block}.rg_kn .rg_bx:hover .rg_ilm,.rg_bx:hover .rg_anbg{display:none}.rg_bx:hover .rg_ilm,.rg_anbg,.rg_kn .rg_bx:hover .rg_anbg{display:block}\u003C\/style\u003E\u003Cdiv eid=\"qlKuV-T3BoqksAHMnaroAw\" id=\"isr_scm_0\" style=\"display:none\"\u003E\u003C\/div\u003E\u003Cdiv data-cei=\"qlKuV-T3BoqksAHMnaroAw\" class=\"rg_add_chunk\"\u003E\u003C!--m--\u003E\u003Cdiv class=\"rg_di rg_bx rg_el ivg-i\" data-ved=\"0ahUKEwjk9PCm-7zOAhUKEiwKHcyOCj0QMwgCKAAwAA\"\u003E\u003Ca jsaction=\"fire.ivg_o;mouseover:str.hmov;mouseout:str.hmou\" class=\"rg_l\" style=\"background:rgb(170,205,240)\"\u003E\u003Cimg data-sz=\"f\" name=\"5eykIeMjmCk7xM:\" src=\"https:\/\/encrypted-tbn0.gstatic.com\/images?q=tbn\" class=\"rg_i rg_ic\" alt=\"Image result for south\" jsaction=\"load:str.tbn\" onload=\"google.aft\u0026\u0026google.aft(this)\"\u003E\u003Cdiv class=\"_aOd rg_ilm\"\u003E\u003Cdiv class=\"rg_ilmbg\"\u003E\u003Cspan class=\"rg_ilmn\"\u003E 566\u0026nbsp;\u0026#215;\u0026nbsp;365 - en.wikipedia.org \u003C\/span\u003E\u003C\/div\u003E\u003C\/div\u003E\u003C\/a\u003E\u003Cdiv class=\"rg_meta\"\u003E{\"id\":\"5eykIeMjmCk7xM:\",\"isu\":\"en.wikipedia.org\",\"itg\":false,\"ity\":\"png\",\"oh\":365,\"ou\":\"https:\/\/upload.wikimedia.org\/wikipedia\/commons\/e\/e4\/Us_south_census.png\",\"ow\":566,\"pt\":\"Southern United States - Wikipedia, the free encyclopedia\",\"rid\":\"cErfE02-v-VcAM\",\"ru\":\"https:\/\/en.wikipedia.org\/wiki\/Southern_United_States\",\"s\":\"The Southern United States as defined by the United States Census Bureau.\",\"sc\":1,\"th\":180,\"tu\":\"https:\/\/encrypted-tbn0.gstatic.com\/images?q\\u003dtbn\",\"tw\":280}\u003C\/div\u003E\u003C\/div\u003E\u003C!--n--\u003E\u003C!--m--\u003E\u003Cdiv class=\"rg_di rg_bx rg_el ivg-i\" data-ved=\"0ahUKEwjk9PCm-7zOAhUKEiwKHcyOCj0QMwgDKAEwAQ\"\u003E\u003Ca jsaction=\"fire.ivg_o;mouseover:str.hmov;mouseout:str.hmou\" class=\"rg_l\" style=\"background:rgb(249,252,249)\"\u003E\u003Cimg data-sz=\"f\" name=\"eRjGCc0cFyVkKM:\" src=\"https:\/\/encrypted-tbn2.gstatic.com\/images?q=tbn:ANd9GcSI7SZlbDwdMCgGXzJkpwgdn9uL41xUJ1IiIcKs0qW43_Yp0EhEsg\" class=\"rg_i rg_ic\" alt=\"Image result for south\" jsaction=\"load:str.tbn\" onload=\"google.aft\u0026\u0026google.aft(this)\"\u003E\u003Cdiv class=\"_aOd rg_ilm\"\u003E\u003Cdiv class=\"rg_ilmbg\"\u003E\u003Cspan class=\"rg_ilmn\"\u003E 2000\u0026nbsp;\u0026#215;\u0026nbsp;1002 - commons.wikimedia.org \u003C\/span\u003E\u003C\/div\u003E\u003C\/div\u003E\u003C\/a\u003E\u003Cdiv class=\"rg_meta\"\u003E{\"id\":\"eRjGCc0cFyVkKM:\",\"isu\":\"commons.wikimedia.org\",\"itg\":false,\"ity\":\"png\",\"oh\":1002,\"ou\":\"https:\/\/upload.wikimedia.org\/wikipedia\/commons\/thumb\/8\/84\/South_plate.svg\/2000px-South_plate.svg.png\",\"ow\":2000,\"pt\":\"File:South plate.svg - Wikimedia Commons\",\"rid\":\"F8TVsT2GBLb6RM\",\"ru\":\"https:\/\/commons.wikimedia.org\/wiki\/File:South_plate.svg\",\"s\":\"This image rendered as PNG in other widths: 200px, 500px, 1000px, 2000px.\",\"sc\":1,\"th\":159,\"tu\":\"https:\/\/encrypted-tbn2.gstatic.com\/images?q\\u003dtbn:ANd9GcSI7SZlbDwdMCgGXzJkpwgdn9uL41xUJ1IiIcKs0qW43_Yp0EhEsg\",\"tw\":317}\u003C\/div\u003E\u003C\/div\u003E\u003C!--n--\u003E\u003C\/div\u003E"]]""" # noqa response = mock.Mock(text=html) results = google_images.response(response) self.assertEqual(type(results), list) - self.assertEqual(len(results), 1) - self.assertEqual(results[0]['title'], u'South Arrow Clip Art at Clker.com - vector clip art online ...') - self.assertEqual(results[0]['url'], 'a') - self.assertEqual(results[0]['thumbnail_src'], 'https://thumbnail.url/') - self.assertEqual(results[0]['img_src'], 'b') - self.assertEqual(results[0]['content'], 'Download this image as:') + self.assertEqual(len(results), 2) + self.assertEqual(results[0]['title'], u'Southern United States - Wikipedia, the free encyclopedia') + self.assertEqual(results[0]['url'], 'https://en.wikipedia.org/wiki/Southern_United_States') + self.assertEqual(results[0]['img_src'], + 'https://upload.wikimedia.org/wikipedia/commons/e/e4/Us_south_census.png') + self.assertEqual(results[0]['content'], + 'The Southern United States as defined by the United States Census Bureau.') + self.assertEqual(results[0]['thumbnail_src'], + 'https://encrypted-tbn0.gstatic.com/images?q=tbn') diff --git a/sources/tests/unit/engines/test_ina.py b/sources/tests/unit/engines/test_ina.py new file mode 100644 index 0000000..109a959 --- /dev/null +++ b/sources/tests/unit/engines/test_ina.py @@ -0,0 +1,64 @@ +from collections import defaultdict +import mock +from searx.engines import ina +from searx.testing import SearxTestCase + + +class TestInaEngine(SearxTestCase): + + def test_request(self): + query = 'test_query' + dicto = defaultdict(dict) + dicto['pageno'] = 0 + params = ina.request(query, dicto) + self.assertTrue('url' in params) + self.assertTrue(query in params['url']) + self.assertTrue('ina.fr' in params['url']) + + def test_response(self): + self.assertRaises(AttributeError, ina.response, None) + self.assertRaises(AttributeError, ina.response, []) + self.assertRaises(AttributeError, ina.response, '') + self.assertRaises(AttributeError, ina.response, '[]') + + response = mock.Mock(text='{}') + self.assertEqual(ina.response(response), []) + + response = mock.Mock(text='{"data": []}') + self.assertEqual(ina.response(response), []) + + json = """ + {"content":"\\t
\\n\\t\\n\ + \\n
\\n\ +
\\n\ + \\t\\t\\t\\t\\n\ + \\"Conf\\u00e9rence\\n\ + \\t\\t\\t\\t\\t<\\/a>\\n\ + \\t\\t\\t\\t\\t
\\n\\t\\t\\t\\t\\t\\t

\\n\ + \\t\\t\\t\\t\\t\\t\\t\ + Conf\\u00e9rence de presse du G\\u00e9n\\u00e9ral de Gaulle <\\/a>\\n\ + <\\/h3>\\n\ +
\\n27\\/11\\/1967<\\/span>\\n\ + 29321 vues<\\/span>\\n\ + 01h 33m 07s<\\/span>\\n\ + <\\/div>\\n\ +

VERSION INTEGRALE DE LA CONFERENCE DE PRESSE DU GENERAL DE GAULLE . \ + - PA le Pr\\u00e9sident DE GAULLE : il ouvre les bras et s'assied. DP journalis...<\\/p>\\n\ + <\\/div>\\n<\\/div>\\n" + } + """ + response = mock.Mock(text=json) + results = ina.response(response) + self.assertEqual(type(results), list) + self.assertEqual(len(results), 1) + self.assertEqual(results[0]['title'], u'Conf\xe9rence de presse du G\xe9n\xe9ral de Gaulle') + self.assertEqual(results[0]['url'], + 'https://www.ina.fr/video/CAF89035682/conference-de-presse-du-general-de-gaulle-video.html') + self.assertEqual(results[0]['content'], + u"VERSION INTEGRALE DE LA CONFERENCE DE PRESSE DU GENERAL DE GAULLE ." + u" - PA le Pr\u00e9sident DE GAULLE : il ouvre les bras et s'assied. DP journalis...") diff --git a/sources/tests/unit/engines/test_mediawiki.py b/sources/tests/unit/engines/test_mediawiki.py index 63f7da6..b863727 100644 --- a/sources/tests/unit/engines/test_mediawiki.py +++ b/sources/tests/unit/engines/test_mediawiki.py @@ -118,7 +118,7 @@ class TestMediawikiEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 0) - json = """ + json = r""" {"toto":[ {"id":200,"name":"Artist Name", "link":"http:\/\/www.mediawiki.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_mixcloud.py b/sources/tests/unit/engines/test_mixcloud.py index a2ea47c..9c79a47 100644 --- a/sources/tests/unit/engines/test_mixcloud.py +++ b/sources/tests/unit/engines/test_mixcloud.py @@ -55,7 +55,7 @@ class TestMixcloudEngine(SearxTestCase): self.assertEqual(results[0]['content'], 'User') self.assertTrue('http://www.mixcloud.com/user/this-is-the-url/' in results[0]['embedded']) - json = """ + json = r""" {"toto":[ {"id":200,"name":"Artist Name", "link":"http:\/\/www.mixcloud.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_scanr_structures.py b/sources/tests/unit/engines/test_scanr_structures.py new file mode 100644 index 0000000..a7b9e91 --- /dev/null +++ b/sources/tests/unit/engines/test_scanr_structures.py @@ -0,0 +1,175 @@ +from collections import defaultdict +import mock +from searx.engines import scanr_structures +from searx.testing import SearxTestCase + + +class TestScanrStructuresEngine(SearxTestCase): + + def test_request(self): + query = 'test_query' + dicto = defaultdict(dict) + dicto['pageno'] = 1 + params = scanr_structures.request(query, dicto) + self.assertIn('url', params) + self.assertIn(query, params['data']) + self.assertIn('scanr.enseignementsup-recherche.gouv.fr', params['url']) + + def test_response(self): + self.assertRaises(AttributeError, scanr_structures.response, None) + self.assertRaises(AttributeError, scanr_structures.response, []) + self.assertRaises(AttributeError, scanr_structures.response, '') + self.assertRaises(AttributeError, scanr_structures.response, '[]') + + response = mock.Mock(text='{}') + self.assertEqual(scanr_structures.response(response), []) + + response = mock.Mock(text='{"data": []}') + self.assertEqual(scanr_structures.response(response), []) + + json = u""" + { + "request": + { + "query":"test_query", + "page":1, + "pageSize":20, + "sortOrder":"RELEVANCY", + "sortDirection":"ASC", + "searchField":"ALL", + "from":0 + }, + "total":2471, + "results":[ + { + "id":"200711886U", + "label":"Laboratoire d'Informatique de Grenoble", + "kind":"RNSR", + "publicEntity":true, + "address":{"city":"Grenoble","departement":"38"}, + "logo":"/static/logos/200711886U.png", + "acronym":"LIG", + "type":{"code":"UR","label":"Unit\xe9 de recherche"}, + "level":2, + "institutions":[ + { + "id":"193819125", + "label":"Grenoble INP", + "acronym":"IPG", + "code":"UMR 5217" + }, + { + "id":"130021397", + "label":"Universit\xe9 de Grenoble Alpes", + "acronym":"UGA", + "code":"UMR 5217" + }, + { + "id":"180089013", + "label":"Centre national de la recherche scientifique", + "acronym":"CNRS", + "code":"UMR 5217" + }, + { + "id":"180089047", + "label":"Institut national de recherche en informatique et en automatique", + "acronym":"Inria", + "code":"UMR 5217" + } + ], + "highlights":[ + { + "type":"projects", + "value":"linguicielles d\xe9velopp\xe9s jusqu'ici par le GETALP\ + du LIG en tant que prototypes op\xe9rationnels.\ +\\r\\nDans le contexte" + }, + { + "type":"acronym", + "value":"LIG" + }, + { + "type":"websiteContents", + "value":"S\xe9lection\\nListe structures\\nD\xe9tail\\n\ + Accueil\\n200711886U : LIG\ + Laboratoire d'Informatique de Grenoble Unit\xe9 de recherche"}, + { + "type":"publications", + "value":"de noms. Nous avons d'abord d\xe9velopp\xe9 LOOV \ + (pour Lig Overlaid OCR in Vid\xe9o), \ + un outil d'extraction des" + } + ] + }, + { + "id":"199511665F", + "label":"Laboratoire Bordelais de Recherche en Informatique", + "kind":"RNSR", + "publicEntity":true, + "address":{"city":"Talence","departement":"33"}, + "logo":"/static/logos/199511665F.png", + "acronym":"LaBRI", + "type":{"code":"UR","label":"Unit\xe9 de recherche"}, + "level":2, + "institutions":[ + { + "id":"130006356", + "label":"Institut polytechnique de Bordeaux", + "acronym":"IPB", + "code":"UMR 5800" + }, + { + "id":"130018351", + "label":"Universit\xe9 de Bordeaux", + "acronym":null, + "code":"UMR 5800" + }, + { + "id":"180089013", + "label":"Centre national de la recherche scientifique", + "acronym":"CNRS", + "code":"UMR 5800" + }, + { + "id":"180089047", + "label":"Institut national de recherche en informatique et en automatique", + "acronym":"Inria", + "code":"UMR 5800" + } + ], + "highlights":[ + { + "type":"websiteContents", + "value":"Samia Kerdjoudj\\n2016-07-05\\nDouble-exponential\ + and triple-exponential bounds for\ + choosability problems parameterized" + }, + { + "type":"publications", + "value":"de cam\xe9ras install\xe9es dans les lieux publiques \ + a tripl\xe9 en 2009, passant de 20 000 \ + \xe0 60 000. Malgr\xe9 le" + } + ] + } + ] + } + """ + response = mock.Mock(text=json) + results = scanr_structures.response(response) + self.assertEqual(type(results), list) + self.assertEqual(len(results), 2) + self.assertEqual(results[0]['title'], u"Laboratoire d'Informatique de Grenoble") + self.assertEqual(results[0]['url'], 'https://scanr.enseignementsup-recherche.gouv.fr/structure/200711886U') + self.assertEqual(results[0]['content'], + u"linguicielles d\xe9velopp\xe9s jusqu'ici par le GETALP " + u"du LIG en tant que prototypes " + u"op\xe9rationnels. Dans le contexte") + self.assertEqual(results[1]['img_src'], + 'https://scanr.enseignementsup-recherche.gouv.fr//static/logos/199511665F.png') + self.assertEqual(results[1]['content'], + "Samia Kerdjoudj 2016-07-05 Double-exponential and" + " triple-exponential bounds for " + "choosability problems parameterized") + self.assertEqual(results[1]['url'], 'https://scanr.enseignementsup-recherche.gouv.fr/structure/199511665F') + self.assertEqual(results[1]['title'], u"Laboratoire Bordelais de Recherche en Informatique") diff --git a/sources/tests/unit/engines/test_searchcode_code.py b/sources/tests/unit/engines/test_searchcode_code.py index c0ac202..955aea1 100644 --- a/sources/tests/unit/engines/test_searchcode_code.py +++ b/sources/tests/unit/engines/test_searchcode_code.py @@ -63,7 +63,7 @@ class TestSearchcodeCodeEngine(SearxTestCase): self.assertEqual(results[0]['repository'], 'https://repo') self.assertEqual(results[0]['code_language'], 'cpp') - json = """ + json = r""" {"toto":[ {"id":200,"name":"Artist Name", "link":"http:\/\/www.searchcode_code.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_searchcode_doc.py b/sources/tests/unit/engines/test_searchcode_doc.py index b9dcf38..7228613 100644 --- a/sources/tests/unit/engines/test_searchcode_doc.py +++ b/sources/tests/unit/engines/test_searchcode_doc.py @@ -61,7 +61,7 @@ class TestSearchcodeDocEngine(SearxTestCase): self.assertIn('test', results[0]['content']) self.assertIn('Description', results[0]['content']) - json = """ + json = r""" {"toto":[ {"id":200,"name":"Artist Name", "link":"http:\/\/www.searchcode_doc.com\/artist\/1217","type":"artist"} diff --git a/sources/tests/unit/engines/test_wikidata.py b/sources/tests/unit/engines/test_wikidata.py new file mode 100644 index 0000000..ec5f52e --- /dev/null +++ b/sources/tests/unit/engines/test_wikidata.py @@ -0,0 +1,504 @@ +# -*- coding: utf-8 -*- +from json import loads +from lxml.html import fromstring +from collections import defaultdict +import mock +from searx.engines import wikidata +from searx.testing import SearxTestCase + + +class TestWikidataEngine(SearxTestCase): + + def test_request(self): + query = 'test_query' + dicto = defaultdict(dict) + dicto['language'] = 'all' + params = wikidata.request(query, dicto) + self.assertIn('url', params) + self.assertIn(query, params['url']) + self.assertIn('wikidata.org', params['url']) + self.assertIn('en', params['url']) + + dicto['language'] = 'es_ES' + params = wikidata.request(query, dicto) + self.assertIn(query, params['url']) + self.assertIn('es', params['url']) + + # successful cases are not tested here to avoid sending additional requests + def test_response(self): + self.assertRaises(AttributeError, wikidata.response, None) + self.assertRaises(AttributeError, wikidata.response, []) + self.assertRaises(AttributeError, wikidata.response, '') + self.assertRaises(AttributeError, wikidata.response, '[]') + + response = mock.Mock(content='', search_params={"language": "all"}) + self.assertEqual(wikidata.response(response), []) + + def test_getDetail(self): + response = {} + results = wikidata.getDetail(response, "Q123", "en", "en-US") + self.assertEqual(results, []) + + title_html = '

Test
' + html = """ + + """ + response = {"parse": {"displaytitle": title_html, "text": html}} + + results = wikidata.getDetail(response, "Q123", "en", "en-US") + self.assertEqual(len(results), 1) + self.assertEqual(results[0]['url'], 'https://en.wikipedia.org/wiki/Test') + + title_html = """ +
+
+ Test + English +
+
+ """ + html = """ +
+
+ Description + English +
+ +
+ +
+
+ """ + response = {"parse": {"displaytitle": title_html, "text": html}} + + results = wikidata.getDetail(response, "Q123", "yua", "yua_MX") + self.assertEqual(len(results), 2) + self.assertEqual(results[0]['title'], 'Official website') + self.assertEqual(results[0]['url'], 'https://officialsite.com') + + self.assertEqual(results[1]['infobox'], 'Test') + self.assertEqual(results[1]['id'], None) + self.assertEqual(results[1]['content'], 'Description') + self.assertEqual(results[1]['attributes'], []) + self.assertEqual(results[1]['urls'][0]['title'], 'Official website') + self.assertEqual(results[1]['urls'][0]['url'], 'https://officialsite.com') + self.assertEqual(results[1]['urls'][1]['title'], 'Wikipedia (en)') + self.assertEqual(results[1]['urls'][1]['url'], 'https://en.wikipedia.org/wiki/Test') + + def test_add_image(self): + image_src = wikidata.add_image(fromstring("
")) + self.assertEqual(image_src, None) + + html = u""" +
+
+
+ + image + +
+
+
+
+ +
+
+ +
+
+
+
+
+ """ + html_etree = fromstring(html) + + image_src = wikidata.add_image(html_etree) + self.assertEqual(image_src, + "https://commons.wikimedia.org/wiki/Special:FilePath/image.png?width=500&height=400") + + html = u""" +
+
+
+ + icon + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ + logo + +
+
+
+
+ +
+
+ +
+
+
+
+
+ """ + html_etree = fromstring(html) + + image_src = wikidata.add_image(html_etree) + self.assertEqual(image_src, + "https://commons.wikimedia.org/wiki/Special:FilePath/logo.png?width=500&height=400") + + def test_add_attribute(self): + html = u""" +
+
+
+ + country of citizenship + +
+
+
+
+ +
+
+ +
+
+
+
+
+ """ + attributes = [] + html_etree = fromstring(html) + + wikidata.add_attribute(attributes, html_etree, "Fail") + self.assertEqual(attributes, []) + + wikidata.add_attribute(attributes, html_etree, "P27") + self.assertEqual(len(attributes), 1) + self.assertEqual(attributes[0]["label"], "Country of citizenship") + self.assertEqual(attributes[0]["value"], "United Kingdom") + + html = u""" +
+
+
+ + date of birth + +
+
+
+
+ +
+
+
+
+ 27 January 1832 + + Gregorian + +
+
+
+
+
+
+
+ """ + attributes = [] + html_etree = fromstring(html) + wikidata.add_attribute(attributes, html_etree, "P569", date=True) + self.assertEqual(len(attributes), 1) + self.assertEqual(attributes[0]["label"], "Date of birth") + self.assertEqual(attributes[0]["value"], "27 January 1832") + + html = u""" +
+
+
+ + head of government + +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+ """ + attributes = [] + html_etree = fromstring(html) + wikidata.add_attribute(attributes, html_etree, "P6") + self.assertEqual(len(attributes), 1) + self.assertEqual(attributes[0]["label"], "Head of government") + self.assertEqual(attributes[0]["value"], "Old Prime Minister, Actual Prime Minister") + + attributes = [] + html_etree = fromstring(html) + wikidata.add_attribute(attributes, html_etree, "P6", trim=True) + self.assertEqual(len(attributes), 1) + self.assertEqual(attributes[0]["value"], "Actual Prime Minister") + + def test_add_url(self): + html = u""" +
+ +
+ """ + urls = [] + html_etree = fromstring(html) + wikidata.add_url(urls, html_etree, 'P856') + self.assertEquals(len(urls), 1) + self.assertIn({'title': 'Official website', 'url': 'https://searx.me/'}, urls) + urls = [] + results = [] + wikidata.add_url(urls, html_etree, 'P856', 'custom label', results=results) + self.assertEquals(len(urls), 1) + self.assertEquals(len(results), 1) + self.assertIn({'title': 'custom label', 'url': 'https://searx.me/'}, urls) + self.assertIn({'title': 'custom label', 'url': 'https://searx.me/'}, results) + + html = u""" + + """ + urls = [] + html_etree = fromstring(html) + wikidata.add_url(urls, html_etree, 'P856') + self.assertEquals(len(urls), 2) + self.assertIn({'title': 'Official website', 'url': 'http://www.worldofwarcraft.com'}, urls) + self.assertIn({'title': 'Official website', 'url': 'http://eu.battle.net/wow/en/'}, urls) + + def test_get_imdblink(self): + html = u""" +
+
+ +
+
+ """ + html_etree = fromstring(html) + imdblink = wikidata.get_imdblink(html_etree, 'https://www.imdb.com/') + + html = u""" +
+
+ +
+
+ """ + html_etree = fromstring(html) + imdblink = wikidata.get_imdblink(html_etree, 'https://www.imdb.com/') + self.assertIn('https://www.imdb.com/name/nm4915994', imdblink) + + def test_get_geolink(self): + html = u""" +
+
+
+
+ 60°N, 40°E +
+
+
+
+ """ + html_etree = fromstring(html) + geolink = wikidata.get_geolink(html_etree) + self.assertIn('https://www.openstreetmap.org/', geolink) + self.assertIn('lat=60&lon=40', geolink) + + html = u""" +
+
+
+
+ 34°35'59"S, 58°22'55"W +
+
+
+
+ """ + html_etree = fromstring(html) + geolink = wikidata.get_geolink(html_etree) + self.assertIn('https://www.openstreetmap.org/', geolink) + self.assertIn('lat=-34.59', geolink) + self.assertIn('lon=-58.38', geolink) + + def test_get_wikilink(self): + html = """ +
+
+ +
+
+ +
+
+ """ + html_etree = fromstring(html) + wikilink = wikidata.get_wikilink(html_etree, 'nowiki') + self.assertEqual(wikilink, None) + wikilink = wikidata.get_wikilink(html_etree, 'enwiki') + self.assertEqual(wikilink, 'https://en.wikipedia.org/wiki/Test') + wikilink = wikidata.get_wikilink(html_etree, 'arwiki') + self.assertEqual(wikilink, 'https://ar.wikipedia.org/wiki/Test') + wikilink = wikidata.get_wikilink(html_etree, 'enwikiquote') + self.assertEqual(wikilink, 'https://en.wikiquote.org/wiki/Test') diff --git a/sources/tests/unit/engines/test_wolframalpha_noapi.py b/sources/tests/unit/engines/test_wolframalpha_noapi.py index 068c1be..a8f7347 100644 --- a/sources/tests/unit/engines/test_wolframalpha_noapi.py +++ b/sources/tests/unit/engines/test_wolframalpha_noapi.py @@ -28,7 +28,7 @@ class TestWolframAlphaNoAPIEngine(SearxTestCase): request = Request(headers={'Referer': referer_url}) # test failure - json = ''' + json = r''' {"queryresult" : { "success" : false, "error" : false, @@ -42,7 +42,7 @@ class TestWolframAlphaNoAPIEngine(SearxTestCase): self.assertEqual(wolframalpha_noapi.response(response), []) # test basic case - json = ''' + json = r''' {"queryresult" : { "success" : true, "error" : false, @@ -143,7 +143,7 @@ class TestWolframAlphaNoAPIEngine(SearxTestCase): self.assertEqual('Wolfram|Alpha', results[1]['title']) # test calc - json = """ + json = r""" {"queryresult" : { "success" : true, "error" : false, diff --git a/sources/tests/unit/engines/test_yahoo.py b/sources/tests/unit/engines/test_yahoo.py index 11ef9db..1226f92 100644 --- a/sources/tests/unit/engines/test_yahoo.py +++ b/sources/tests/unit/engines/test_yahoo.py @@ -28,6 +28,7 @@ class TestYahooEngine(SearxTestCase): query = 'test_query' dicto = defaultdict(dict) dicto['pageno'] = 1 + dicto['time_range'] = '' dicto['language'] = 'fr_FR' params = yahoo.request(query, dicto) self.assertIn('url', params) diff --git a/sources/tests/unit/test_plugins.py b/sources/tests/unit/test_plugins.py index 98d39ec..b8a8980 100644 --- a/sources/tests/unit/test_plugins.py +++ b/sources/tests/unit/test_plugins.py @@ -52,23 +52,39 @@ class SelfIPTest(SearxTestCase): request = Mock(user_plugins=store.plugins, remote_addr='127.0.0.1') request.headers.getlist.return_value = [] - ctx = get_search_mock(query='ip') + ctx = get_search_mock(query='ip', pageno=1) store.call('post_search', request, ctx) self.assertTrue('127.0.0.1' in ctx['search'].result_container.answers) + ctx = get_search_mock(query='ip', pageno=2) + store.call('post_search', request, ctx) + self.assertFalse('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 = get_search_mock(query='user-agent') + ctx = get_search_mock(query='user-agent', pageno=1) store.call('post_search', request, ctx) self.assertTrue('Mock' in ctx['search'].result_container.answers) - ctx = get_search_mock(query='user-agent') + ctx = get_search_mock(query='user-agent', pageno=2) + store.call('post_search', request, ctx) + self.assertFalse('Mock' in ctx['search'].result_container.answers) + + ctx = get_search_mock(query='user-agent', pageno=1) store.call('post_search', request, ctx) self.assertTrue('Mock' in ctx['search'].result_container.answers) - ctx = get_search_mock(query='What is my User-Agent?') + ctx = get_search_mock(query='user-agent', pageno=2) + store.call('post_search', request, ctx) + self.assertFalse('Mock' in ctx['search'].result_container.answers) + + ctx = get_search_mock(query='What is my User-Agent?', pageno=1) store.call('post_search', request, ctx) self.assertTrue('Mock' in ctx['search'].result_container.answers) + + ctx = get_search_mock(query='What is my User-Agent?', pageno=2) + store.call('post_search', request, ctx) + self.assertFalse('Mock' in ctx['search'].result_container.answers) diff --git a/sources/tests/unit/test_preferences.py b/sources/tests/unit/test_preferences.py index e418c0a..c173508 100644 --- a/sources/tests/unit/test_preferences.py +++ b/sources/tests/unit/test_preferences.py @@ -4,6 +4,7 @@ from searx.testing import SearxTestCase class PluginStub(object): + def __init__(self, id, default_on): self.id = id self.default_on = default_on @@ -11,6 +12,7 @@ class PluginStub(object): class TestSettings(SearxTestCase): # map settings + def test_map_setting_invalid_initialization(self): with self.assertRaises(MissingArgumentException): setting = MapSetting(3, wrong_argument={'0': 0}) diff --git a/sources/tests/unit/test_webapp.py b/sources/tests/unit/test_webapp.py index 5697017..1762d66 100644 --- a/sources/tests/unit/test_webapp.py +++ b/sources/tests/unit/test_webapp.py @@ -38,6 +38,7 @@ class ViewsTestCase(SearxTestCase): suggestions=set(), infoboxes=[], results=self.test_results, + results_number=lambda: 3, results_length=lambda: len(self.test_results)) webapp.Search.search = search_mock @@ -95,7 +96,7 @@ class ViewsTestCase(SearxTestCase): ) self.assertIn( - '2', + '3', result.data ) diff --git a/sources/utils/fabfile.py b/sources/utils/fabfile.py index 4b356c5..559e2ab 100644 --- a/sources/utils/fabfile.py +++ b/sources/utils/fabfile.py @@ -89,7 +89,7 @@ def init(): sudo('git clone https://github.com/asciimoo/searx') sudo('chown -R {user}:{user} {searx_dir}'.format(user=current_user, searx_dir=searx_dir)) - put(StringIO(uwsgi_file), searx_dir+'/uwsgi.ini') + put(StringIO(uwsgi_file), searx_dir + '/uwsgi.ini') sudo('ln -s {0}/uwsgi.ini /etc/uwsgi/apps-enabled/searx.ini'.format(searx_dir)) run('virtualenv {0}'.format(searx_ve_dir)) diff --git a/sources/utils/fetch_currencies.py b/sources/utils/fetch_currencies.py index cb055dd..716b505 100644 --- a/sources/utils/fetch_currencies.py +++ b/sources/utils/fetch_currencies.py @@ -5,31 +5,31 @@ import unicodedata import string from urllib import urlencode from requests import get - + languages = {'de', 'en', 'es', 'fr', 'hu', 'it', 'nl', 'jp'} - + url_template = 'https://www.wikidata.org/w/api.php?action=wbgetentities&format=json&{query}&props=labels%7Cdatatype%7Cclaims%7Caliases&languages=' + '|'.join(languages) -url_wmflabs_template = 'http://wdq.wmflabs.org/api?q=' -url_wikidata_search_template='http://www.wikidata.org/w/api.php?action=query&list=search&format=json&srnamespace=0&srprop=sectiontitle&{query}' - -wmflabs_queries = [ - 'CLAIM[31:8142]', # all devise +url_wmflabs_template = 'http://wdq.wmflabs.org/api?q=' +url_wikidata_search_template = 'http://www.wikidata.org/w/api.php?action=query&list=search&format=json&srnamespace=0&srprop=sectiontitle&{query}' + +wmflabs_queries = [ + 'CLAIM[31:8142]', # all devise ] - + db = { - 'iso4217' : { - }, - 'names' : { - } + 'iso4217': { + }, + 'names': { + } } def remove_accents(data): return unicodedata.normalize('NFKD', data).lower() - + def normalize_name(name): - return re.sub(' +',' ', remove_accents(name.lower()).replace('-', ' ')) + return re.sub(' +', ' ', remove_accents(name.lower()).replace('-', ' ')) def add_currency_name(name, iso4217): @@ -37,7 +37,6 @@ def add_currency_name(name, iso4217): db_names = db['names'] - if not isinstance(iso4217, basestring): print "problem", name, iso4217 return @@ -52,7 +51,7 @@ def add_currency_name(name, iso4217): if iso4217_set is not None and iso4217 not in iso4217_set: db_names[name].append(iso4217) else: - db_names[name] = [ iso4217 ] + db_names[name] = [iso4217] def add_currency_label(label, iso4217, language): @@ -66,26 +65,26 @@ def get_property_value(data, name): prop = data.get('claims', {}).get(name, {}) if len(prop) == 0: return None - - value = prop[0].get('mainsnak', {}).get('datavalue', {}).get('value', '') + + value = prop[0].get('mainsnak', {}).get('datavalue', {}).get('value', '') if value == '': return None return value - + def parse_currency(data): iso4217 = get_property_value(data, 'P498') - + if iso4217 is not None: unit = get_property_value(data, 'P558') if unit is not None: add_currency_name(unit, iso4217) - + labels = data.get('labels', {}) for language in languages: name = labels.get(language, {}).get('value', None) - if name != None: + if name is not None: add_currency_name(name, iso4217) add_currency_label(name, iso4217, language) @@ -95,22 +94,22 @@ def parse_currency(data): alias = aliases[language][i].get('value', None) add_currency_name(alias, iso4217) - + def fetch_data(wikidata_ids): - url = url_template.format(query=urlencode({'ids' : '|'.join(wikidata_ids)})) + url = url_template.format(query=urlencode({'ids': '|'.join(wikidata_ids)})) htmlresponse = get(url) jsonresponse = json.loads(htmlresponse.content) entities = jsonresponse.get('entities', {}) - + for pname in entities: pvalue = entities.get(pname) parse_currency(pvalue) - - + + def add_q(i): return "Q" + str(i) - - + + def fetch_data_batch(wikidata_ids): while len(wikidata_ids) > 0: if len(wikidata_ids) > 50: @@ -119,35 +118,36 @@ def fetch_data_batch(wikidata_ids): else: fetch_data(wikidata_ids) wikidata_ids = [] - - + + def wdq_query(query): url = url_wmflabs_template + query htmlresponse = get(url) jsonresponse = json.loads(htmlresponse.content) qlist = map(add_q, jsonresponse.get('items', {})) error = jsonresponse.get('status', {}).get('error', None) - if error != None and error != 'OK': + if error is not None and error != 'OK': print "error for query '" + query + "' :" + error fetch_data_batch(qlist) - - + + def wd_query(query, offset=0): qlist = [] - + url = url_wikidata_search_template.format(query=urlencode({'srsearch': query, 'srlimit': 50, 'sroffset': offset})) htmlresponse = get(url) jsonresponse = json.loads(htmlresponse.content) for r in jsonresponse.get('query', {}).get('search', {}): qlist.append(r.get('title', '')) fetch_data_batch(qlist) - -## fetch ## + + +# fetch # for q in wmflabs_queries: wdq_query(q) -# static +# static add_currency_name(u"euro", 'EUR') add_currency_name(u"euros", 'EUR') add_currency_name(u"dollar", 'USD')