From 7937218be66f1fb3eff02bce308a4e5c78ba6672 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Tue, 9 Dec 2014 02:36:53 +0100 Subject: [PATCH 01/62] Use human readable date For DoB and DoD, wikipedia use a non standard ISO format, not easily readable. Now the date is displayed in an human readable form, using the language setting as locale if available. If not, it uses the default locale. --- searx/engines/wikidata.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py index ab799e6ce..bda80cdca 100644 --- a/searx/engines/wikidata.py +++ b/searx/engines/wikidata.py @@ -1,6 +1,9 @@ import json from requests import get from urllib import urlencode +import locale +import time +import dateutil.parser result_count = 1 wikidata_host = 'https://www.wikidata.org' @@ -35,6 +38,16 @@ def response(resp): language = resp.search_params['language'].split('_')[0] if language == 'all': language = 'en' + + try: + locale.setlocale(locale.LC_ALL, str(resp.search_params['language'])) + except: + try: + locale.setlocale(locale.LC_ALL, 'en_US') + except: + pass + pass + url = url_detail.format(query=urlencode({'ids': '|'.join(wikidata_ids), 'languages': language + '|en'})) @@ -164,10 +177,12 @@ def getDetail(jsonresponse, wikidata_id, language): date_of_birth = get_time(claims, 'P569', None) if date_of_birth is not None: + date_of_birth = dateutil.parser.parse(date_of_birth[8:]).strftime(locale.nl_langinfo(locale.D_FMT)) attributes.append({'label': 'Date of birth', 'value': date_of_birth}) date_of_death = get_time(claims, 'P570', None) if date_of_death is not None: + date_of_death = dateutil.parser.parse(date_of_death[8:]).strftime(locale.nl_langinfo(locale.D_FMT)) attributes.append({'label': 'Date of death', 'value': date_of_death}) if len(attributes) == 0 and len(urls) == 2 and len(description) == 0: From 0bfc793194f44cc3c0e6fdeb9dc9c00c448c0324 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:09:02 +0100 Subject: [PATCH 02/62] Add a variable with all the icons of the theme Add for the template a list of available icons in the current theme. --- searx/webapp.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/searx/webapp.py b/searx/webapp.py index 541975573..bb412df69 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -291,6 +291,11 @@ def index(): for engine in result['engines']: if engine in favicons: result['favicon'] = engine + + mypath = searx_dir+"/static/"+get_current_theme_name()+"/img/" + favs=[] + for (dirpath, dirnames, filenames) in os.walk(mypath): + favs.extend(filenames) # TODO, check if timezone is calculated right if 'publishedDate' in result: @@ -344,7 +349,8 @@ def index(): suggestions=search.suggestions, answers=search.answers, infoboxes=search.infoboxes, - theme=get_current_theme_name() + theme=get_current_theme_name(), + favicons=favs ) From 3b88adf8b6782341d83a090ce94fe16328b19062 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:12:37 +0100 Subject: [PATCH 03/62] Use the new way of finding an icon --- searx/templates/oscar/result_templates/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 0f090d862..dd537fd75 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} From 3ffe6014ed491e47e779fa90ae8e7bb1d8eff849 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:13:40 +0100 Subject: [PATCH 04/62] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/images.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 7689f9f58..3bdc13645 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -7,7 +7,7 @@
-

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

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|striptags }}

{{ result.title }} From 002b812cc633a039c5d02dc5dffdac46e6e5af81 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:14:30 +0100 Subject: [PATCH 05/62] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/map.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 343e713c8..7ed629da7 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} From f3f544d5b50e15f5665b26db7fe2e98fb5b5001d Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:15:30 +0100 Subject: [PATCH 06/62] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/torrent.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 1e133e3c4..94e6f22f7 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} From 53a9af39efb0c444bfacd40c440208ba33ee75c4 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Fri, 12 Dec 2014 19:16:29 +0100 Subject: [PATCH 07/62] Use the new way of finding the favicon --- searx/templates/oscar/result_templates/videos.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 06275b86a..977fcf88a 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} From e71b665fd5d62ddc52fda3eca141547bb3540522 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sat, 13 Dec 2014 21:37:28 +0100 Subject: [PATCH 08/62] Load the list of icons only once --- searx/webapp.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index bb412df69..6387a92f4 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -71,6 +71,13 @@ babel = Babel(app) #TODO configurable via settings.yml favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud', 'twitter', 'stackoverflow', 'github', 'deviantart'] + +global_favicons = [] +for indice,theme in enumerate(themes): + global_favicons.append([]) + theme_img_path = searx_dir+"/static/"+theme+"/img/" + for (dirpath, dirnames, filenames) in os.walk(theme_img_path): + global_favicons[indice].extend(filenames) cookie_max_age = 60 * 60 * 24 * 365 * 23 # 23 years @@ -292,11 +299,6 @@ def index(): if engine in favicons: result['favicon'] = engine - mypath = searx_dir+"/static/"+get_current_theme_name()+"/img/" - favs=[] - for (dirpath, dirnames, filenames) in os.walk(mypath): - favs.extend(filenames) - # TODO, check if timezone is calculated right if 'publishedDate' in result: result['pubdate'] = result['publishedDate'].strftime('%Y-%m-%d %H:%M:%S%z') @@ -350,7 +352,7 @@ def index(): answers=search.answers, infoboxes=search.infoboxes, theme=get_current_theme_name(), - favicons=favs + favicons=global_favicons[themes.index(get_current_theme_name())] ) From cfdcbdd9b536ce859d6f4c1690d4b788c1d89463 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 15 Dec 2014 03:21:25 +0100 Subject: [PATCH 09/62] Rework Flickr Engine Everything was redone to use the API. It needs an API key, but it's worth it. Everything works. Title, Image, Content, URL The API allow lots of things. Thumbnails and date will be easy to add when it will be implemented in Searx. Fix asciimoo/searx#126 --- searx/engines/flickr.py | 83 +++++++++++++++++++++++++++-------------- searx/settings.yml | 11 +++--- 2 files changed, 62 insertions(+), 32 deletions(-) diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py index 4ec2841dd..8b60aed1d 100644 --- a/searx/engines/flickr.py +++ b/searx/engines/flickr.py @@ -1,54 +1,83 @@ #!/usr/bin/env python +## Flickr (Images) +# +# @website https://www.flickr.com +# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title, thumbnail, img_src +#More info on api-key : https://www.flickr.com/services/apps/create/ + from urllib import urlencode -#from json import loads +from json import loads from urlparse import urljoin from lxml import html from time import time categories = ['images'] -url = 'https://secure.flickr.com/' -search_url = url+'search/?{query}&page={page}' -results_xpath = '//div[@class="view display-item-tile"]/figure/div' +nb_per_page = 15 +paging = True +api_key= None + + +url = 'https://api.flickr.com/services/rest/?method=flickr.photos.search&api_key={api_key}&{text}&sort=relevance&extras=description%2C+owner_name%2C+url_o%2C+url_z&per_page={nb_per_page}&format=json&nojsoncallback=1&page={page}' +photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' paging = True +def build_flickr_url(user_id, photo_id): + return photo_url.format(userid=user_id,photoid=photo_id) + def request(query, params): - params['url'] = search_url.format(query=urlencode({'text': query}), - page=params['pageno']) - time_string = str(int(time())-3) - params['cookies']['BX'] = '3oqjr6d9nmpgl&b=3&s=dh' - params['cookies']['xb'] = '421409' - params['cookies']['localization'] = 'en-us' - params['cookies']['flrbp'] = time_string +\ - '-3a8cdb85a427a33efda421fbda347b2eaf765a54' - params['cookies']['flrbs'] = time_string +\ - '-ed142ae8765ee62c9ec92a9513665e0ee1ba6776' - params['cookies']['flrb'] = '9' + params['url'] = url.format(text=urlencode({'text': query}), + api_key=api_key, + nb_per_page=nb_per_page, + page=params['pageno']) return params def response(resp): results = [] - dom = html.fromstring(resp.text) - for result in dom.xpath(results_xpath): - img = result.xpath('.//img') + + search_results = loads(resp.text) - if not img: + # return empty array if there are no results + if not 'photos' in search_results: + return [] + + if not 'photo' in search_results['photos']: + return [] + + photos = search_results['photos']['photo'] + + # parse results + for photo in photos: + if 'url_o' in photo: + img_src = photo['url_o'] + elif 'url_z' in photo: + img_src = photo['url_z'] + else: continue - img = img[0] - img_src = 'https:'+img.attrib.get('src') + url = build_flickr_url(photo['owner'], photo['id']) - if not img_src: - continue - - href = urljoin(url, result.xpath('.//a')[0].attrib.get('href')) - title = img.attrib.get('alt', '') - results.append({'url': href, + title = photo['title'] + + content = ''+ photo['ownername'] +'
' + + content = content + ' ' + photo['description']['_content'] + '' + + # append result + results.append({'url': url, 'title': title, 'img_src': img_src, + 'content': content, 'template': 'images.html'}) + + # return results return results diff --git a/searx/settings.yml b/searx/settings.yml index 5e9f11202..b7359b919 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -65,11 +65,12 @@ engines: # categories : files # shortcut : fc - - name : flickr - engine : flickr - categories : images - shortcut : fl - timeout: 3.0 +# api-key required: https://www.flickr.com/services/apps/create/ +# - name : flickr +# engine : flickr +# categories : images +# shortcut : fl +# api_key: 'apikey' # required! - name : general-file engine : generalfile From 0059d08f13b1bf64b3f36ab2cbe89d5fec5d727c Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 15 Dec 2014 03:21:25 +0100 Subject: [PATCH 10/62] Rework Flickr Engine Everything was redone to use the API. It needs an API key, but it's worth it. Everything works. Title, Image, Content, URL The API allow lots of things. Thumbnails and date will be easy to add when it will be implemented in Searx. Fix asciimoo/searx#126 --- searx/engines/flickr.py | 83 +++++++++++++++++++++++++++-------------- searx/settings.yml | 11 +++--- 2 files changed, 62 insertions(+), 32 deletions(-) diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py index 4ec2841dd..8b60aed1d 100644 --- a/searx/engines/flickr.py +++ b/searx/engines/flickr.py @@ -1,54 +1,83 @@ #!/usr/bin/env python +## Flickr (Images) +# +# @website https://www.flickr.com +# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title, thumbnail, img_src +#More info on api-key : https://www.flickr.com/services/apps/create/ + from urllib import urlencode -#from json import loads +from json import loads from urlparse import urljoin from lxml import html from time import time categories = ['images'] -url = 'https://secure.flickr.com/' -search_url = url+'search/?{query}&page={page}' -results_xpath = '//div[@class="view display-item-tile"]/figure/div' +nb_per_page = 15 +paging = True +api_key= None + + +url = 'https://api.flickr.com/services/rest/?method=flickr.photos.search&api_key={api_key}&{text}&sort=relevance&extras=description%2C+owner_name%2C+url_o%2C+url_z&per_page={nb_per_page}&format=json&nojsoncallback=1&page={page}' +photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' paging = True +def build_flickr_url(user_id, photo_id): + return photo_url.format(userid=user_id,photoid=photo_id) + def request(query, params): - params['url'] = search_url.format(query=urlencode({'text': query}), - page=params['pageno']) - time_string = str(int(time())-3) - params['cookies']['BX'] = '3oqjr6d9nmpgl&b=3&s=dh' - params['cookies']['xb'] = '421409' - params['cookies']['localization'] = 'en-us' - params['cookies']['flrbp'] = time_string +\ - '-3a8cdb85a427a33efda421fbda347b2eaf765a54' - params['cookies']['flrbs'] = time_string +\ - '-ed142ae8765ee62c9ec92a9513665e0ee1ba6776' - params['cookies']['flrb'] = '9' + params['url'] = url.format(text=urlencode({'text': query}), + api_key=api_key, + nb_per_page=nb_per_page, + page=params['pageno']) return params def response(resp): results = [] - dom = html.fromstring(resp.text) - for result in dom.xpath(results_xpath): - img = result.xpath('.//img') + + search_results = loads(resp.text) - if not img: + # return empty array if there are no results + if not 'photos' in search_results: + return [] + + if not 'photo' in search_results['photos']: + return [] + + photos = search_results['photos']['photo'] + + # parse results + for photo in photos: + if 'url_o' in photo: + img_src = photo['url_o'] + elif 'url_z' in photo: + img_src = photo['url_z'] + else: continue - img = img[0] - img_src = 'https:'+img.attrib.get('src') + url = build_flickr_url(photo['owner'], photo['id']) - if not img_src: - continue - - href = urljoin(url, result.xpath('.//a')[0].attrib.get('href')) - title = img.attrib.get('alt', '') - results.append({'url': href, + title = photo['title'] + + content = ''+ photo['ownername'] +'
' + + content = content + ' ' + photo['description']['_content'] + '' + + # append result + results.append({'url': url, 'title': title, 'img_src': img_src, + 'content': content, 'template': 'images.html'}) + + # return results return results diff --git a/searx/settings.yml b/searx/settings.yml index b51b37f1c..d2c7a32c9 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -65,11 +65,12 @@ engines: # categories : files # shortcut : fc - - name : flickr - engine : flickr - categories : images - shortcut : fl - timeout: 3.0 +# api-key required: https://www.flickr.com/services/apps/create/ +# - name : flickr +# engine : flickr +# categories : images +# shortcut : fl +# api_key: 'apikey' # required! - name : general-file engine : generalfile From 930f724ec639c167d870d716240ac5d4512beba2 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Tue, 16 Dec 2014 20:40:03 +0100 Subject: [PATCH 11/62] Add an No Api Flickr Engine It uses the webpage json infos to build the results Let the user choose the engine in setting.yml. Noapi active by default + little corrections on Flickr engine --- searx/engines/flickr-noapi.py | 102 ++++++++++++++++++++++++++++++++++ searx/engines/flickr.py | 5 +- searx/settings.yml | 11 ++-- 3 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 searx/engines/flickr-noapi.py diff --git a/searx/engines/flickr-noapi.py b/searx/engines/flickr-noapi.py new file mode 100644 index 000000000..b44affec6 --- /dev/null +++ b/searx/engines/flickr-noapi.py @@ -0,0 +1,102 @@ +#!/usr/bin/env python + +## Flickr (Images) +# +# @website https://www.flickr.com +# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) +# +# @using-api no +# @results HTML +# @stable no +# @parse url, title, thumbnail, img_src + +from urllib import urlencode +from json import loads +from urlparse import urljoin +from lxml import html +import re + +categories = ['images'] + +url = 'https://secure.flickr.com/' +search_url = url+'search/?{query}&page={page}' +photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' +regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL) + +paging = True + +def build_flickr_url(user_id, photo_id): + return photo_url.format(userid=user_id,photoid=photo_id) + + +def request(query, params): + params['url'] = search_url.format(query=urlencode({'text': query}), + page=params['pageno']) + return params + + +def response(resp): + results = [] + + matches = regex.search(resp.text) + + if matches == None: + return results + + match = matches.group(1) + search_results = loads(match) + + if not '_data' in search_results: + return [] + + photos = search_results['_data'] + + for photo in photos: + + # In paged configuration, the first pages' photos are represented by a None object + if photo == None: + continue + + # From the biggest to the lowest format + if 'o' in photo['sizes']: + img_src = photo['sizes']['o']['displayUrl'] + elif 'k' in photo['sizes']: + img_src = photo['sizes']['k']['displayUrl'] + elif 'h' in photo['sizes']: + img_src = photo['sizes']['h']['displayUrl'] + elif 'b' in photo['sizes']: + img_src = photo['sizes']['b']['displayUrl'] + elif 'c' in photo['sizes']: + img_src = photo['sizes']['c']['displayUrl'] + elif 'z' in photo['sizes']: + img_src = photo['sizes']['z']['displayUrl'] + elif 'n' in photo['sizes']: + img_src = photo['sizes']['n']['displayUrl'] + elif 'm' in photo['sizes']: + img_src = photo['sizes']['m']['displayUrl'] + elif 't' in photo['sizes']: + img_src = photo['sizes']['to']['displayUrl'] + elif 'q' in photo['sizes']: + img_src = photo['sizes']['q']['displayUrl'] + elif 's' in photo['sizes']: + img_src = photo['sizes']['s']['displayUrl'] + else: + continue + + url = build_flickr_url(photo['owner']['id'], photo['id']) + + title = photo['title'] + + content = ''+ photo['owner']['username'] +'
' + + if 'description' in photo: + content = content + '' + photo['description'] + '' + + # append result + results.append({'url': url, + 'title': title, + 'img_src': img_src, + 'content': content, + 'template': 'images.html'}) + + return results diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py index 8b60aed1d..2fa5ed7ec 100644 --- a/searx/engines/flickr.py +++ b/searx/engines/flickr.py @@ -13,9 +13,6 @@ from urllib import urlencode from json import loads -from urlparse import urljoin -from lxml import html -from time import time categories = ['images'] @@ -70,7 +67,7 @@ def response(resp): content = ''+ photo['ownername'] +'
' - content = content + ' ' + photo['description']['_content'] + '' + content = content + '' + photo['description']['_content'] + '' # append result results.append({'url': url, diff --git a/searx/settings.yml b/searx/settings.yml index d2c7a32c9..07cd2ac3e 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -65,12 +65,15 @@ engines: # categories : files # shortcut : fc -# api-key required: https://www.flickr.com/services/apps/create/ -# - name : flickr + - name : flickr + categories : images + shortcut : fl +# You can use the engine using the official stable API, but you need an API key +# See : https://www.flickr.com/services/apps/create/ # engine : flickr -# categories : images -# shortcut : fl # api_key: 'apikey' # required! +# Or you can use the html non-stable engine, activated by default + engine : flickr-noapi - name : general-file engine : generalfile From 83d6f366596829f2140f84c73b684bd7f783e93c Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Thu, 18 Dec 2014 16:26:32 +0100 Subject: [PATCH 12/62] Final commit on favicons Definitely remove engine array Change every themes to accomodate that change Tweak of video template of oscar to add link on video thumbnail --- searx/templates/courgette/result_templates/default.html | 4 ++-- searx/templates/courgette/result_templates/map.html | 4 ++-- searx/templates/courgette/result_templates/videos.html | 8 +++----- searx/templates/default/result_templates/default.html | 2 +- searx/templates/default/result_templates/map.html | 4 ++-- searx/templates/default/result_templates/videos.html | 6 ++---- searx/templates/oscar/result_templates/default.html | 2 +- searx/templates/oscar/result_templates/images.html | 2 +- searx/templates/oscar/result_templates/map.html | 2 +- searx/templates/oscar/result_templates/torrent.html | 2 +- searx/templates/oscar/result_templates/videos.html | 4 ++-- searx/webapp.py | 8 -------- 12 files changed, 18 insertions(+), 30 deletions(-) diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html index 734f9066c..3e93eee73 100644 --- a/searx/templates/courgette/result_templates/default.html +++ b/searx/templates/courgette/result_templates/default.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html index 734f9066c..3e93eee73 100644 --- a/searx/templates/courgette/result_templates/map.html +++ b/searx/templates/courgette/result_templates/map.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index 8ceb0b180..2694a9101 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -1,12 +1,10 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %} -

{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

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

{{ result.url }}

-

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index d0e725ac5..0f3e3e6d8 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,5 +1,5 @@
-

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

+

{% 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/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index 78221aa01..f9ba7dcf6 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 233a6c021..16b2d5f30 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,8 +1,6 @@
-

-

{% if result['favicon'] %}{% 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 }} + {{ result.title|striptags }}

{{ result.url }}

-

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index dd537fd75..3c8e6255d 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

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

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 3bdc13645..94627c9b5 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -7,7 +7,7 @@
-

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|striptags }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|striptags }}

{{ result.title }} diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 7ed629da7..a0858c0ce 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

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

{% if result.publishedDate %}{% endif %} diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 94e6f22f7..b6753f704 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

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

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 977fcf88a..2b9568847 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,13 +1,13 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon']~".png" in favicons %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

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

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }}
- {{ result.title|urlencode }} {{ result['favicon'] }} + {{ result.title|striptags }} {{ result.engine }} {% if result.content %}

{{ result.content|safe }}

{% endif %}
diff --git a/searx/webapp.py b/searx/webapp.py index 6387a92f4..ca58d8ea3 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -68,10 +68,6 @@ app.secret_key = settings['server']['secret_key'] babel = Babel(app) -#TODO configurable via settings.yml -favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud', - 'twitter', 'stackoverflow', 'github', 'deviantart'] - global_favicons = [] for indice,theme in enumerate(themes): global_favicons.append([]) @@ -294,10 +290,6 @@ def index(): result['pretty_url'] = u'{0}[...]{1}'.format(*url_parts) else: result['pretty_url'] = result['url'] - - for engine in result['engines']: - if engine in favicons: - result['favicon'] = engine # TODO, check if timezone is calculated right if 'publishedDate' in result: From 550232fc21ff2c3ae9a5de3d8b999de66c96171c Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 22 Dec 2014 01:00:16 +0100 Subject: [PATCH 13/62] SubtitleSeeker Engine Add the subtitleseeker engine. --- searx/engines/subtitleseeker.py | 59 +++++++++++++++++++++++++++++++++ searx/settings.yml | 4 +++ 2 files changed, 63 insertions(+) create mode 100644 searx/engines/subtitleseeker.py diff --git a/searx/engines/subtitleseeker.py b/searx/engines/subtitleseeker.py new file mode 100644 index 000000000..346298300 --- /dev/null +++ b/searx/engines/subtitleseeker.py @@ -0,0 +1,59 @@ +## Subtitleseeker (Video) +# +# @website http://www.subtitleseeker.com +# @provide-api no +# +# @using-api no +# @results HTML +# @stable no (HTML can change) +# @parse url, title, content + +from cgi import escape +from urllib import quote_plus +from lxml import html + +# engine dependent config +categories = ['videos'] +paging = True + +# search-url +url = 'http://www.subtitleseeker.com/' +search_url = url+'search/TITLES/{query}&p={pageno}' + +# specific xpath variables +results_xpath = '//div[@class="boxRows"]' + + +# do search-request +def request(query, params): + params['url'] = search_url.format(query=quote_plus(query), + pageno=params['pageno']) + return params + + +# get response from search-request +def response(resp): + results = [] + + dom = html.fromstring(resp.text) + + # parse results + for result in dom.xpath(results_xpath): + link = result.xpath(".//a")[0] + href = link.attrib.get('href') + title = escape(link.xpath(".//text()")[0]) + + content = result.xpath('.//div[contains(@class,"red")]//text()')[0] + content = content + " - " + content = content + html.tostring(result.xpath('.//div[contains(@class,"grey-web")]')[0], method='text') + + if result.xpath(".//span") != []: + content = content + " - (" + result.xpath(".//span//text()")[0].strip() + ")" + + # append result + results.append({'url': href, + 'title': title, + 'content': escape(content)}) + + # return results + return results diff --git a/searx/settings.yml b/searx/settings.yml index 8cfe3f886..cc7073181 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -127,6 +127,10 @@ engines: engine : searchcode_code shortcut : scc + - name : subtitleseeker + engine : subtitleseeker + shortcut : ss + - name : startpage engine : startpage shortcut : sp From b975418e4ce33aef530f7ad88e100d47d73e4761 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 22 Dec 2014 14:15:59 +0100 Subject: [PATCH 14/62] [fix] flickr engine code cleanup ++ handle missing owner --- searx/engines/flickr-noapi.py | 77 +++++++++++++++-------------------- 1 file changed, 32 insertions(+), 45 deletions(-) diff --git a/searx/engines/flickr-noapi.py b/searx/engines/flickr-noapi.py index b44affec6..522503b53 100644 --- a/searx/engines/flickr-noapi.py +++ b/searx/engines/flickr-noapi.py @@ -1,10 +1,10 @@ #!/usr/bin/env python -## Flickr (Images) -# +# Flickr (Images) +# # @website https://www.flickr.com -# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) -# +# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) +# # @using-api no # @results HTML # @stable no @@ -12,8 +12,6 @@ from urllib import urlencode from json import loads -from urlparse import urljoin -from lxml import html import re categories = ['images'] @@ -22,11 +20,13 @@ url = 'https://secure.flickr.com/' search_url = url+'search/?{query}&page={page}' photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL) +image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's') paging = True + def build_flickr_url(user_id, photo_id): - return photo_url.format(userid=user_id,photoid=photo_id) + return photo_url.format(userid=user_id, photoid=photo_id) def request(query, params): @@ -37,58 +37,45 @@ def request(query, params): def response(resp): results = [] - + matches = regex.search(resp.text) - - if matches == None: + + if matches is None: return results match = matches.group(1) search_results = loads(match) - - if not '_data' in search_results: + + if '_data' not in search_results: return [] - + photos = search_results['_data'] - + for photo in photos: - + # In paged configuration, the first pages' photos are represented by a None object - if photo == None: + if photo is None: continue - + + img_src = None # From the biggest to the lowest format - if 'o' in photo['sizes']: - img_src = photo['sizes']['o']['displayUrl'] - elif 'k' in photo['sizes']: - img_src = photo['sizes']['k']['displayUrl'] - elif 'h' in photo['sizes']: - img_src = photo['sizes']['h']['displayUrl'] - elif 'b' in photo['sizes']: - img_src = photo['sizes']['b']['displayUrl'] - elif 'c' in photo['sizes']: - img_src = photo['sizes']['c']['displayUrl'] - elif 'z' in photo['sizes']: - img_src = photo['sizes']['z']['displayUrl'] - elif 'n' in photo['sizes']: - img_src = photo['sizes']['n']['displayUrl'] - elif 'm' in photo['sizes']: - img_src = photo['sizes']['m']['displayUrl'] - elif 't' in photo['sizes']: - img_src = photo['sizes']['to']['displayUrl'] - elif 'q' in photo['sizes']: - img_src = photo['sizes']['q']['displayUrl'] - elif 's' in photo['sizes']: - img_src = photo['sizes']['s']['displayUrl'] - else: + for image_size in image_sizes: + if image_size in photo['sizes']: + img_src = photo['sizes'][image_size]['displayUrl'] + break + + if not img_src: continue - + + if 'id' not in photo['owner']: + continue + url = build_flickr_url(photo['owner']['id'], photo['id']) title = photo['title'] - - content = ''+ photo['owner']['username'] +'
' - + + content = '' + photo['owner']['username'] + '
' + if 'description' in photo: content = content + '' + photo['description'] + '' @@ -98,5 +85,5 @@ def response(resp): 'img_src': img_src, 'content': content, 'template': 'images.html'}) - + return results From 829948b85df0510e331372bcd60cb31db9c96a5c Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Tue, 23 Dec 2014 01:41:25 +0100 Subject: [PATCH 15/62] Add language support Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... --- searx/engines/subtitleseeker.py | 6 ++++++ searx/settings.yml | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/searx/engines/subtitleseeker.py b/searx/engines/subtitleseeker.py index 346298300..c72f81899 100644 --- a/searx/engines/subtitleseeker.py +++ b/searx/engines/subtitleseeker.py @@ -16,6 +16,8 @@ from lxml import html categories = ['videos'] paging = True +language = "" + # search-url url = 'http://www.subtitleseeker.com/' search_url = url+'search/TITLES/{query}&p={pageno}' @@ -41,6 +43,10 @@ def response(resp): for result in dom.xpath(results_xpath): link = result.xpath(".//a")[0] href = link.attrib.get('href') + + if language is not "": + href = href + language + "/" + title = escape(link.xpath(".//text()")[0]) content = result.xpath('.//div[contains(@class,"red")]//text()')[0] diff --git a/searx/settings.yml b/searx/settings.yml index cc7073181..ed22ad90d 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,13 +1,13 @@ server: - port : 8888 - secret_key : "ultrasecretkey" # change this! - debug : False # Debug mode, only for development + port : 2722 + secret_key : "8f92c98926f04c8cb2a5fdc3bca19f7c" # change this! + debug : True # Debug mode, only for development request_timeout : 2.0 # seconds base_url : False # Set custom base_url. Possible values: False or "https://your.custom.host/location/" themes_path : "" # Custom ui themes path default_theme : default # ui theme https_rewrite : True # Force rewrite result urls. See searx/https_rewrite.py - useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator + useragent_suffix : "Cqcb Style" # suffix of searx_useragent, could contain informations like an email address to the administrator engines: - name : wikipedia @@ -130,6 +130,9 @@ engines: - name : subtitleseeker engine : subtitleseeker shortcut : ss +# The language is an option. You can put any language written in english +# Examples : English, French, German, Hungarian, Chinese... +# language : English - name : startpage engine : startpage From 2ea55b1c6451e77381bd88dd82f635d48ff1b6fe Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Tue, 23 Dec 2014 01:45:39 +0100 Subject: [PATCH 16/62] Add language support Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... (reverted from commit 829948b85df0510e331372bcd60cb31db9c96a5c) --- searx/engines/subtitleseeker.py | 6 ------ searx/settings.yml | 11 ++++------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/searx/engines/subtitleseeker.py b/searx/engines/subtitleseeker.py index c72f81899..346298300 100644 --- a/searx/engines/subtitleseeker.py +++ b/searx/engines/subtitleseeker.py @@ -16,8 +16,6 @@ from lxml import html categories = ['videos'] paging = True -language = "" - # search-url url = 'http://www.subtitleseeker.com/' search_url = url+'search/TITLES/{query}&p={pageno}' @@ -43,10 +41,6 @@ def response(resp): for result in dom.xpath(results_xpath): link = result.xpath(".//a")[0] href = link.attrib.get('href') - - if language is not "": - href = href + language + "/" - title = escape(link.xpath(".//text()")[0]) content = result.xpath('.//div[contains(@class,"red")]//text()')[0] diff --git a/searx/settings.yml b/searx/settings.yml index ed22ad90d..cc7073181 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,13 +1,13 @@ server: - port : 2722 - secret_key : "8f92c98926f04c8cb2a5fdc3bca19f7c" # change this! - debug : True # Debug mode, only for development + port : 8888 + secret_key : "ultrasecretkey" # change this! + debug : False # Debug mode, only for development request_timeout : 2.0 # seconds base_url : False # Set custom base_url. Possible values: False or "https://your.custom.host/location/" themes_path : "" # Custom ui themes path default_theme : default # ui theme https_rewrite : True # Force rewrite result urls. See searx/https_rewrite.py - useragent_suffix : "Cqcb Style" # suffix of searx_useragent, could contain informations like an email address to the administrator + useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator engines: - name : wikipedia @@ -130,9 +130,6 @@ engines: - name : subtitleseeker engine : subtitleseeker shortcut : ss -# The language is an option. You can put any language written in english -# Examples : English, French, German, Hungarian, Chinese... -# language : English - name : startpage engine : startpage From 10e4f6f31631fe51d16b324223525570f3e75850 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Tue, 23 Dec 2014 01:51:07 +0100 Subject: [PATCH 17/62] Add language support Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... --- searx/engines/subtitleseeker.py | 5 +++++ searx/settings.yml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/searx/engines/subtitleseeker.py b/searx/engines/subtitleseeker.py index 346298300..48790a35c 100644 --- a/searx/engines/subtitleseeker.py +++ b/searx/engines/subtitleseeker.py @@ -15,6 +15,7 @@ from lxml import html # engine dependent config categories = ['videos'] paging = True +language = "" # search-url url = 'http://www.subtitleseeker.com/' @@ -41,6 +42,10 @@ def response(resp): for result in dom.xpath(results_xpath): link = result.xpath(".//a")[0] href = link.attrib.get('href') + + if language is not "": + href = href + language + "/" + title = escape(link.xpath(".//text()")[0]) content = result.xpath('.//div[contains(@class,"red")]//text()')[0] diff --git a/searx/settings.yml b/searx/settings.yml index cc7073181..e3fe9b251 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -130,6 +130,9 @@ engines: - name : subtitleseeker engine : subtitleseeker shortcut : ss +# The language is an option. You can put any language written in english +# Examples : English, French, German, Hungarian, Chinese... +# language : English - name : startpage engine : startpage From 3b3921fc593e49c12ff79df1d6b15d01fe481bec Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 24 Dec 2014 21:02:26 +0100 Subject: [PATCH 18/62] [enh] subtitleseeker: better language handling --- searx/engines/subtitleseeker.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/searx/engines/subtitleseeker.py b/searx/engines/subtitleseeker.py index 48790a35c..2f1636f59 100644 --- a/searx/engines/subtitleseeker.py +++ b/searx/engines/subtitleseeker.py @@ -11,6 +11,7 @@ from cgi import escape from urllib import quote_plus from lxml import html +from searx.languages import language_codes # engine dependent config categories = ['videos'] @@ -38,13 +39,22 @@ def response(resp): dom = html.fromstring(resp.text) + search_lang = "" + + if resp.search_params['language'] != 'all': + search_lang = [lc[1] + for lc in language_codes + if lc[0][:2] == resp.search_params['language']][0] + # parse results for result in dom.xpath(results_xpath): link = result.xpath(".//a")[0] href = link.attrib.get('href') if language is not "": - href = href + language + "/" + href = href + language + '/' + elif search_lang: + href = href + search_lang + '/' title = escape(link.xpath(".//text()")[0]) From 61ab5f2693cabf764bf47f1c5e4fd12a13e1f9fe Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 24 Dec 2014 21:15:36 +0100 Subject: [PATCH 19/62] [fix] view tests --- searx/tests/test_webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py index b922a3675..35ae49343 100644 --- a/searx/tests/test_webapp.py +++ b/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '

youtubeFirst Test

', # noqa + '

youtubeSecond Test

', # noqa result.data ) self.assertIn( From 5cfb42350b72fb88d0fad26a0894539de5bbb791 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 25 Dec 2014 11:06:30 +0100 Subject: [PATCH 20/62] [enh] nl, de, fr, hu translation updates --- searx/translations/de/LC_MESSAGES/messages.mo | Bin 5181 -> 5436 bytes searx/translations/de/LC_MESSAGES/messages.po | 92 ++++++------- searx/translations/en/LC_MESSAGES/messages.mo | Bin 4814 -> 5000 bytes searx/translations/es/LC_MESSAGES/messages.mo | Bin 5009 -> 5195 bytes searx/translations/fr/LC_MESSAGES/messages.mo | Bin 5294 -> 5496 bytes searx/translations/fr/LC_MESSAGES/messages.po | 62 ++++----- searx/translations/hu/LC_MESSAGES/messages.mo | Bin 4936 -> 5168 bytes searx/translations/hu/LC_MESSAGES/messages.po | 122 +++++++++-------- searx/translations/it/LC_MESSAGES/messages.mo | Bin 4963 -> 5149 bytes searx/translations/ja/LC_MESSAGES/messages.mo | Bin 4855 -> 5041 bytes searx/translations/nl/LC_MESSAGES/messages.mo | Bin 4926 -> 5198 bytes searx/translations/nl/LC_MESSAGES/messages.po | 126 +++++++++--------- 12 files changed, 191 insertions(+), 211 deletions(-) diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo index 2c65bc1217ffebd49c8bf7b783b5c9138921338e..5914116277dcc5a11ad81dda177c6b54cc109626 100644 GIT binary patch delta 2026 zcmYMze`r-@7{KxO`eSoH-KKLIo4$qahuqmVvT|rCWrEC&+L&n=oZY?m-qX%KXPtAd zi;J@C3et zAL26HU82;TID)M>f!tCv*re3Bnq^SOg&(m7|G)~oiIS+Ctdh8a1DDhqT!GES>swF? z*WXU!rXOJl5hxlpS5gLSeX-^P5;08*fGPWrT>#-Rd zu^%78C-4oF0{%joznCgms%lXRx`RUtuET}63&%ScJjy^?au65cA(TWD#p|yln^s3r z3ObGw_yd&rAEV4ajncu-Q4)NC689|1yl;@&)DI{H{!~u?rA5CNC;W?&;1)`PN@mG< zJxZXvP!hG`V|X{V;z4Y{_wZy)sX3JOPZL}c=1|_57m-`)O(cbys-pig;S?8Ua28i% zz=K+YuVGy7qb#_Ba{pJ9m#d5iyAm5wTE7t`(GDb(dJ?5z2iq_}$@dn@#-_#@NNcB2 zp8YJ!yKoUV;Wd<87t-5N!$23^z^9llb)Z^fwBBVI^R=L5?j&Z zB`n9zS)uK@YL^Mq-mvQR@{gAuSg>%93G&~Tor^8$x>t8~bl=k%ov3K4=sy^J7Gj_`8LC+5oX=iSd z@z~sC+Bfd79wzs8+f7+R1azbG)hoxhCDLKmO(_YLw4IO{`;8xjhNQ0QquL}vNaF^h zzJ+Rgpaa{aLmhZj6==%|v^S)Ot$_Hps|%|GTI%SG%`Ce3jJAVtgW4-WRgdkC1ZwUW zp##$v<|O;=jvCcV05#y7WYYMSo3ql6>Pu^vt1Z#k()I0yom-A$bTaFX$ipzMbRwYa zeq)D)X1LifXWR`sy0A1=X=RLC*pP3s`RFV&ZJ*%UjjpZ9Y<+20C|H%%)t9EYRlP7vPMXm4NtZnB zW|>sGiXan}$HE4^aBRa1$54aC3nxNh7sCrHLx!CLVK@;ll!?xP;P=M@hUEF2=e+#? z|8sJ_?7FyX@p?nqis3WP?|y#gOZ4{tXK%SNe9aJ#N_-q^@M)~VgUHt$;&BhA@Ejh- zMr^4tCWO0@E;EL$7{vx-7R_NAK{}Rk3$CCNoJJ+QfPBpwk9+ZAvHuFHfNMp6MkV|m z32e$(+>I@$I3qk%zU1Vhr{?LR^ug9VH>E0KVm)JD31SywY&!i zQipZ8728qsdr>Fbk1B8+n=z?z@|$BcwBzHbMDJ+;SFsb%U=%OoOW4M?Rlovj{t0Br zoJ19T8h7G(4C58l&dV7r!!4-zL0r^83k^15T2X~`paSkeEf_>C7)D)>r?3=9QR|;U z&6_}SnMqV(an#9Vi{r1M;xD1%zgx}utK%dc3Um&Y=wsA{{0w(tIni3M7e5FX^CT+3 zCW}@04bG3lhf=b=QupbGgLbt0-xJFmqd96&a>XpYiQ;3ZULZx`R+ zzdOO4LIpm9SFuxlC$+=ZGr zSacK>U=o$c;yakZF1&-flpRflh4SV=;fspWK*gB#QrSddqw-iu;rZ%s0^!JGPNaVz z(ziPt35Tnnd$woX&ZqO~tlKjZ^X!1LCmiYP2|v^m>31TJ4)lfnv6`03*=*YNQfYs= z=5~4hh|T2-$7_Ruwq-YAbJj_utrMNi#o{U2Ht+0@y_%i#^8WR$E1_hXIZjk#u5)Dl zY$|8n1haC^6KQuUcF6jxb=yMw++;R46Z0q|WTJENR5G3Mm@`i*&&H>%zfsrhzg{`m zes@3COyq1bX>&1mA(qOR7i=yOo0;)K{>#Cx2c5YYCzi=rXJ&nEDwB?@ z8r7S#Fz2{)-hy>|{X%f6)Y?R$vwk(;->PcxuQohT8Zrm`e;c}+Y}&QXY%VudxG#> diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 1323b4486..9526536f4 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -1,25 +1,28 @@ -# English translations for . +# English translations for PROJECT. # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the project. -# +# This file is distributed under the same license as the PROJECT project. +# # Translators: # pointhi, 2014 +# pointhi, 2014 +# rike, 2014 +# stf , 2014 # stf , 2014 # rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-03-15 18:40+0000\n" -"Last-Translator: pointhi\n" -"Language-Team: German " -"(http://www.transifex.com/projects/p/searx/language/de/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"PO-Revision-Date: 2014-12-25 10:01+0000\n" +"Last-Translator: Adam Tauber \n" +"Language-Team: German (http://www.transifex.com/projects/p/searx/language/de/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -143,11 +146,9 @@ msgstr "Blockieren" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." -msgstr "" -"Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, " -"damit wir keine Ihrer persönlichen Daten speichern müssen." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +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:94 #: searx/templates/default/preferences.html:96 @@ -155,9 +156,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um " -"Sie zu überwachen." +msgstr "Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um Sie zu überwachen." #: searx/templates/courgette/preferences.html:97 #: searx/templates/default/preferences.html:99 @@ -214,35 +213,35 @@ msgstr "Suchmaschinenstatistik" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "klicke auf die Lupe, um die Suche zu starten" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Übersetzung" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Ja" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Nein" #: searx/templates/default/results.html:34 msgid "Answers" -msgstr "" +msgstr "Antworten" #: searx/templates/oscar/base.html:69 msgid "Powered by" -msgstr "" +msgstr "Powered by" #: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "eine privatsphären respektierende, hackbare Metasuchmaschine" +msgstr "eine privatsphären-respektierende, hackbare Metasuchmaschine" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" -msgstr "" +msgstr "Navigation umschalten" #: searx/templates/oscar/navbar.html:15 msgid "home" @@ -260,25 +259,22 @@ msgstr "Suchmaschinen" #: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" -msgstr "Welche Sprache bevorzugst du für die Suche?" +msgstr "welche Sprache bevorzugst du für die Suche?" #: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" -msgstr "Ändere die Sprache des Layouts" +msgstr "ändere die Sprache des Layouts" #: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" -msgstr "finde Sachen während der Eingabe" +msgstr "zeige Vorschläge während der Eingabe an" #: searx/templates/oscar/preferences.html:73 msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" +msgstr "ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -290,9 +286,10 @@ msgstr "Suchergebnisse" #: searx/templates/oscar/results.html:73 msgid "Links" -msgstr "" +msgstr "Links" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Suche starten" @@ -302,7 +299,7 @@ msgstr "Suchfilter anzeigen" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "Suchfilter verstecke" +msgstr "Suchfilter verstecken" #: searx/templates/oscar/stats.html:2 msgid "stats" @@ -318,11 +315,11 @@ msgstr "Schließen" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "Information!" +msgstr "Achtung" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Es sieht so aus als ob das dein erstes mal mit searx ist." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" @@ -330,7 +327,7 @@ msgstr "Warnung!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "Bitte aktiviere JavaScript um alle möglichkeiten dieser Seite zu nutzen." +msgstr "Bitte aktiviere JavaScript, um alle funktionen dieser Seite zu nutzen. " #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -344,13 +341,11 @@ msgstr "Entschuldigung!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen " -"anderen Suchbegriff oder Suche das gewünschte in einer anderen Kategorie." +msgstr "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen anderen Suchbegriff, oder Suche das gewünschte in einer anderen Kategorie. " #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "Gut gemacht!" +msgstr "Gut gemacht" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." @@ -358,7 +353,7 @@ msgstr "Einstellungen wurden erfolgreich gespeichert." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "Verdammt!" +msgstr "Oh nein'" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." @@ -369,7 +364,7 @@ msgstr "Irgendetwas ist falsch gelaufen." #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/oscar/result_templates/videos.html:6 msgid "cached" -msgstr "cached" +msgstr "zwischengelagert" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -393,15 +388,15 @@ msgstr "Details anzeigen" #: searx/templates/oscar/result_templates/map.html:14 msgid "hide details" -msgstr "Details verstecke" +msgstr "Details verstecken" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "" +msgstr "Samenverstreuer" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "" +msgstr "Zecke" # categories - manually added # TODO - automatically add @@ -431,4 +426,3 @@ msgstr "Neuigkeiten" msgid "map" msgstr "Karte" - diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo index ca6febf423461760c3e75d98efb918561543b7c5..0dc3e5d599a0d8ffb2bae6492526caba373040a7 100644 GIT binary patch delta 1603 zcmb`{-%FEG9LMpqsY|D3YEvkyB{+8>v_!fPLMhA$?Z*N`OhVSw;g88Sx-e~KH%19U zmQojiBo$F%qmX_Op-^NfcHxCY8VEt5j40l#;4UH$v?q!`23^wMm=3z&hIFbzkMuNk9B#XC5T6PSx99LDU#HuT~k za?3oyZN|jSb2>Q;EaE0y#dKUl1#%Kqf%9n?GCMF2J=XYMR3cTDM^J(5QTuja3HBjh zbDu^DJjM*-n`d;i@f*~`&tW#cM?KLBt|x|-T(6-ME4Zmd524oAq1H8`?uRiGyD~lW2lWEqUKMc=D$Eya2gfhHEQ1( z)Vz5lH?x3BaM?-yRiba!gkPute^3E3n5AnMYNJ9_ATRoH7kaTD^YI>@vl%mmn!k_D zmH0u_K1WdrG@|aeWKw?x>R@0T&!ApK0WV6Y)`tq`A78%0nFbfW_F;rc5=m3$cW?nh7$ zbQjkX!%D8FkfNGo29;(fuTX(zt?@TuPf67*Z+^{C37LM7CK+Bb%p--{0Y{rA&R2`{1oTt;m?gqnB_^{#H95*$ZWXu`Vx z5*1(?6=2@FUPSHl8I{;7`tb*Pv6}MbYeH9UqCCZA^MnFz?r^6&)*5toG_`bwnnS^e zI~I0#1tZPjNQXNbY>EV06EzNpEw3gVXlf62H^oBXPE#9JMxIJTC=$a%ggWRC6etBD z?GOx!)gkN9V28j{6j4!Fvx8YAM2CV9f*86L%TY+D7KL(LyYhAe|BcnV`Ujm=m@?cB?t z2mPq{RhZU5h#NLxVN@Y?sDPVM3$~*cw4>T%KbGJD)cS7Jyu(N?OQ8xojyjn^XM7YD z|2!)GRUhZC2N@nHP!5&oE~+6PU_E+?7Q#4=xy(9H^B=QVg+E8ddBa5od_;|ZK_yzk z94@0?L6)l2l=&d%uZeR!P*=V~HP14t7XrLU?Iet>wFXqet*AnGp_+1^^Sl>TK%e7j zRKl~UxZ~J_SyY@CX>L?N5fyMA^==nYm48PS@(bHBNQZGK){QDGg<98-T6fABA4B$F zSCFsW;6ezygPLDJHD!8+8&x=u>dJ4<1P@uYV?Qd<8q~s#7{x|ZQzlVOc^g%Ln~UbJ zL~S5~D!2h-*n-X2i)=h?6WpkIuA>rU{tj3cbwoK-A@@)LAEM?zLd}1QYRXrrrhJV$ z(YL613#eDJh$`$W>STWY8Sh{+FGdM`s01PBe*_h16DrXbOkx|>;{>WH3z**>taar_ qD@t6YUH!uYgMIngvJrRwkZ;aap4b*iw6-N$^6@~_{l7V9T)zQWB8r=kLbu!o3(5{jUxATp2$?fa7pJp~PS?&sXI{r~6OGc%Yuo#lHQ7j)Y2 zsp6Z$_gR3R{(icGjo~s!xrJgcM&b!{;xKZVQEp*4f#Y}sm*egbW74n*vv2@uGPiM+ zF+OvjLL3#ZaT$Ka2wXq~3MZ-pCvl_7q+%jw*!5dbi4@uHL_#qgm75Z{ zg^|QJ_b6!Mr>Mn0$5?!UTG0nwN(>8mUchiHpiznLK#i|LjoXiEw=fDjF$ViF8i!H+ zFJTJt%{2$@Q+p5<;20`_%cw29jw|sM#^W4vnvIheosOBP zz$Lbos6)HYer`kU#1Wre=tBiQi8=#gn1gpw6MaM_@C~(+In+)#IGNh=Fx0pR)XLH@ z8MCnvi%<(ajv7B`>pM?D9VhJ$k5QS;Ae&*{Ad54fPyy#r{}YR-gi|;8`XaR zc{}C|>XltY^}B)@dp>KwW9z4 delta 1420 zcmYMzOGwmF6vy#1QnbhvQ9^`Sh$ur3cacU& zLM;-rO)AlV)uI+HTvSGqtumvCsAv&|EsCJ;4=y##{6GKyeVlXd{oi?7ez`2MnCBZd zJ~4i)_)U2A^#8NdZ^qYlaY@6yn285*86HEvc8W_nw&OT-!!7)2$VLcTW5WjQ`{?enMt7MveZ3BMtM&Bx>l458xGaZv$>kRcYs zT=H8pH>$i7RY)AeIDi41K@~QKn)n8D@q_FCiCH{*2$F+2n2l>t<10}+TZ<|%hK1Os ze)3x%H(K#|RH7ku;B_p;F>JyocpO)=Y!%Rp8h;V#vJq6lqgaL$ScUVbmHX-RVFoIG z5EJSMal<047*$9KDqsz2!Vc7gFzR^JV+tNX&5xqS9YJzgGpeu_)XsFd{(e;abEx=( z0rp=FBQz+`I4aR?)PcN<<>)6`2rF^SW3~?!;0u#g_zzT^-&~Y9ovi9FKtfnCj$=9M z6+A~B%J*69zY_a+VcN0)7GVt*U=(#)TW~#|MJ2rDoI)MSY4<#f+JRTjx2S}lQSbZ@ zR$x8{MRCFjZd5=6YUNSXz@w-YbmB^kV;BcfD|&%i@oVQN)VL+rALJyfkRoKUR)XZV z&8R$kP=_+HpBq)!hDzM)1`MGRTt#i^P1k-0OL@MBQC!3`xQP>~LwSvh#!sRa@Bmft zW7H1MVihhS1tzSNKdUOLa&ARU+>P3zdQ>5YUHb{tVQWRLumg1%2a05ozwiVcupX~J)dXo23Q#`4W z)_8l@>Ev8mpEubUc;-p3-nO>7c6;@fWJ%^pZ*n5L;oq1*aMXLHF;J6ym)GI>3+h*Z Aga7~l diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo index 68619732ab12f2ab9a82913cde12b77ef3c0575c..e306e78aa552eac372f2933288abeaad6f095842 100644 GIT binary patch delta 1670 zcmYMze`r-@9LMqJZr-cgt}bWS;hK3GxTg8z-Z3nu)nfUN%+vy>#GvE7&+VSPyJtJQ z*JLd2QVFT{mqj8(Fo;~~A}@(hLqnm`B7Z=Te^iivh0!0;C<*KRsRz28dtT3Z&htFq z@AEz9%&z%kZT0(>1#cRDyZN{C|Ef+`|Nkc9#&DRII4#7(n8eqx0goexndYfC_}ycf0ZFs{Q%DS?kMNqqAO4K4fyYV+UVQoN4Z(JlNpG3?{|E;i!h+*G35 zQ1f@A<_)3lhqxHWu^Erz5Hs<2~DFG z{tz|(9BTX=s)CnL0X|2qdj&P_8j_p&7M0+SjnrQyy6pzsK?V356(GqdU8hhBb)W)u z;nTPgyYLXU;sckcQYs?>j?5{mOJuEiu;d>FI({@grh9#+$Lr4Yrqjo+Hnpzq9}R=7 z-4{kVTlBW%`~yL5!#+O>D}}xn{gR&x!wvbUmPq#0rTdG)XvL0uW0lA&`d%@tj970Z zmmLyBH_nVvR>vvRw+PRkb*gwDV B&lCUv delta 1494 zcmYM!T}V@59LMoz>eM#V1-vX!Y9Swzgaa@1OuMM$#941%a2 zf(UOkx`;%=15rX01O*XP5O`xn=r1&8Io2Y#OdOYC z2bLR?Gku)+xN#A^coUUi6qRrSIm|*{!|Er$Imd}+JcLSgT^%@rtMCqX;43_U)l6Fj44|IBf^?Z%sDejvHIAc&?@=>% z(^-ICRD2)i)ZyoZNtk7*LRO*zhEW5WPy=G9?Xd&%aVKj0Zq##~NG{WbDlCawnXJ=4 zh>Cv!75|!t_1BGC+)$vqs6_Ws8*&oYpqprZY`}4sG22mzW*IF1p!$o*ro;i%gldrx zW*t7oO{mQ`=eV?#^;g0uFRT`~paNx3?`#-(){LPx-vdH#Orn04xhdyl299t~JEpJ?lQ@ml*u-y- z$(#MCacNY-)7XTAxD6j8E0!~VIZ@zwl&=-=IW9si=?dg9bu>)g#83g-P~-NYmi!QE zC5}1$C!Om7)JmLpyo%InM$l_o_=Dj@?`F#Bc#AB8`Gg8Qi%O{FI0(g9hlg=7-l((( z+*L07QDMHTFrMn~&Gy*uiq7TPdp)mRR%k;o)EEs#YORoEdD`~Wx2MjePo=ZR>su22 zsc0~4g(CIVhI(s#FdT}8BRAqD{=k-=L?+moINhB(8Ej6RN~Y79Y&LczlSm(HNM, 2014 +# Cqoicebordel , 2014 +# FIRST AUTHOR , 2014 +# rike, 2014 # rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-09-07 21:24+0000\n" -"Last-Translator: Adam Tauber \n" -"Language-Team: French " -"(http://www.transifex.com/projects/p/searx/language/fr/)\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"PO-Revision-Date: 2014-12-14 21:00+0000\n" +"Last-Translator: Cqoicebordel \n" +"Language-Team: French (http://www.transifex.com/projects/p/searx/language/fr/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -142,11 +145,9 @@ msgstr "Bloquer" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." -msgstr "" -"Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas" -" collecter vos données." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +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:94 #: searx/templates/default/preferences.html:96 @@ -154,9 +155,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Ces cookies existent pour votre confort d'utilisation, nous ne les " -"utilisons pas pour vous espionner." +msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utilisons pas pour vous espionner." #: searx/templates/courgette/preferences.html:97 #: searx/templates/default/preferences.html:99 @@ -213,19 +212,19 @@ msgstr "Statistiques du moteur" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "Cliquez sur la loupe pour effectuer une recherche" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Localisation" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Oui" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Non" #: searx/templates/default/results.html:34 msgid "Answers" @@ -274,10 +273,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" +msgstr "Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -291,7 +287,8 @@ msgstr "Résultats de recherche" msgid "Links" msgstr "Liens" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Lancer une recherche" @@ -329,9 +326,7 @@ msgstr "Attention !" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" -"Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce" -" site." +msgstr "Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce site." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -345,9 +340,7 @@ msgstr "Désolé !" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou " -"changez de catégorie." +msgstr "nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou changez de catégorie." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -432,4 +425,3 @@ msgstr "actus" msgid "map" msgstr "carte" - diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo index 0cbdd85ab88263ab28d50b0204a09278626b8a6b..58fadcdb2d4dbc2e69ebbe51b8d6c1c3c99a6a8a 100644 GIT binary patch delta 2614 zcmZwHYitx%6u|LYO3RxSA4MmeeH#;-UBui*^5jS^@&Q6=yK4%|`?;(S~l-+vq> zk*%>iQ34-CnKy&0@FnD@hB-(ApWsa5t1mc_i7%oo{yUtDKccMYPpl+{PjP)4r{j}6 zltj0qyuT0Sy+bI^J)DI(ti$6t8&9E({{R;gU!CPdGQNb3_**>SZ~$CD@t+&~#$Ll(TM=AtCj#9;+KjMcaU^XoX-#fg;UC{D)XD1rLp`zMe^ ztJ5e6ok5xSBb4!0tc`G6M0S~ z!#LUfSa)T=0o zjJ^8d?G zOyWC8VtG|dnzA=-D1nkF6*+DMuz%AJjqVr)l3-O>JFow65FmNK0XG z#*!H=t*cvGjh6KrT3Slq&sbme(7veXm_g37)u!Ii%P^JQ8yL2wQ_)b6i-toeG|e&^ z+O)3&E{u#0qf(+bFpcKI8#SGWJIe!E-Px(#jcd&(R+2`lTRYlisM@BTXw=c6;r3}K ztJNmMHB)^uX~{PY+YCd?4YQ_Uxe0EjP3{}qk0YtgIu{lF!lK!|`AYQifRXV+&nMYu ztj?%d$vG-bBrWeT# znn9Ou^@OXbvT20c>DGaf>~-xfdV=N%qhc_The?Oz)TW%_ISJDVDGxjEqzKk+ZZHZX zb)92{W{H+TH4~X=h^@2L9<383yje5Uk^L(MB$v_bp1!YCl}g=TSGJ4fC<)bbL$%eR zJ!FHzJB1!=g2!ZPQ*D=ZRVr{#KXq7cmo(tSrlobrhMNg9TvHgGGo0@*vlh$gvS_5c zh7n0^^L$@w!R=7n^xfD#PHgxdi@sZ`p7V85Gf=7%_n|e`zUtYOc9mwIdweS!6~iEx zjE3mrkSbF6^1!ORVMpg(D&`s)z7a2&=xRP1voc?KK>1P0VS`lG3WA)eSh4Rpp-M)@ zZim*E*yByQnD8M+e=tm+V`%8OqK^crIa2-m>Lu%328>m1xNSFLNa;Hl?s|-n#z)09J67 delta 1691 zcmYMyUuaup7{~E9OVh0Bn)TmWaNSJRwHsZ#q;}d?2OX<*)YaK^lx=!*)|{?c(xlx< zI~Jz_-Pn!L%3)I2WCST=SY$3x6r3Ulb%m{^4sZ+OA>4wmU=1EeE^~_8W}LxQoW~|? ztv03|yO1U`hC6Tq8;vQMc^>L%xQMlQ1(l$TO85zKnRRY0c*k$Qk1F72--oD#e;|QP z6_fX3D=N+~Hx+OM8Df&yKz?(A2UVUy6;i+U8#_4%;Lu@GR<^6;Xkg zQH8Fc#$ET@*HJt0rSDx-!k}0JIpp^r^81hY{o_bza~!n;XHYwI9>XgAG7n0ygi3G?wIi#jPxCpd zpsz5A-=WUP6AaSU_BU0Ep>2W6XVt+#^_X3l$)_s!!WTAG#v?xj;)#J+V*g;GuPdI2 z$0M&D?M~W@X(ye}bq`wwdob1;PxN)i2fE|W$9fZk&&DfbTb>IvAIv%D?6ZzJxKPMX zm&cld`=^#_g$n!;Lg|`~$(~ B;%)!{ diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index 3d6fa84f4..dd284ce7e 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -1,24 +1,24 @@ -# English translations for . +# English translations for PROJECT. # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the project. -# +# This file is distributed under the same license as the PROJECT project. +# # Translators: # Adam Tauber , 2014 # FIRST AUTHOR , 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-09-07 21:30+0000\n" +"PO-Revision-Date: 2014-12-22 16:11+0000\n" "Last-Translator: Adam Tauber \n" -"Language-Team: Hungarian " -"(http://www.transifex.com/projects/p/searx/language/hu/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/searx/language/hu/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -93,19 +93,19 @@ msgstr "Felület nyelve" #: searx/templates/default/preferences.html:36 #: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" -msgstr "" +msgstr "Automatikus kiegészítés" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 #: searx/templates/oscar/preferences.html:66 msgid "Method" -msgstr "" +msgstr "Method" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 #: searx/templates/oscar/preferences.html:76 msgid "Themes" -msgstr "" +msgstr "Megjelenés" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:66 @@ -142,8 +142,8 @@ msgstr "Tiltás" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." #: searx/templates/courgette/preferences.html:94 @@ -152,9 +152,7 @@ msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a " -"felhasználók követésére." +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:97 #: searx/templates/default/preferences.html:99 @@ -211,189 +209,190 @@ msgstr "Kereső statisztikák" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "A nagyítóra kattintva indítható a keresés" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Nyelv" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Igen" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Nem" #: searx/templates/default/results.html:34 msgid "Answers" -msgstr "" +msgstr "Válaszok" #: searx/templates/oscar/base.html:69 msgid "Powered by" -msgstr "" +msgstr "Az oldalt kiszolgálja: " #: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" +msgstr "egy privátszféra tisztelő, könnyen módosítható metakereső" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" -msgstr "" +msgstr "Navigáció megjelenítés" #: searx/templates/oscar/navbar.html:15 msgid "home" -msgstr "" +msgstr "főoldal" #: searx/templates/oscar/preferences.html:11 #: searx/templates/oscar/preferences.html:17 msgid "General" -msgstr "" +msgstr "Általános" #: searx/templates/oscar/preferences.html:12 #: searx/templates/oscar/preferences.html:99 msgid "Engines" -msgstr "" +msgstr "Kereső motorok" #: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" -msgstr "" +msgstr "Preferált keresési nyelv" #: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" -msgstr "" +msgstr "Felület nyelve" #: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" -msgstr "" +msgstr "Autómatikus kereső kifejezés kiegészítés" #: searx/templates/oscar/preferences.html:73 msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" +msgstr "Keresés metódusa (bővebben)" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" -msgstr "" +msgstr "Megjelenés" #: searx/templates/oscar/results.html:6 msgid "Search results" -msgstr "" +msgstr "Keresési eredmények" #: searx/templates/oscar/results.html:73 msgid "Links" -msgstr "" +msgstr "Linkek" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" -msgstr "" +msgstr "Keresés indítása" #: searx/templates/oscar/search_full.html:11 msgid "Show search filters" -msgstr "" +msgstr "Keresési szűrők megjelenítése" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "" +msgstr "Keresési szűrők elrejtése" #: searx/templates/oscar/stats.html:2 msgid "stats" -msgstr "" +msgstr "statisztikák" #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 #: searx/templates/oscar/messages/unknow_error.html:5 msgid "Close" -msgstr "" +msgstr "Bezár" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "" +msgstr "Figyelem!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Úgy tűnik először használod a keresőt." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "Figyelem!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" +msgstr "Engedélyezze a javascript-et a teljes funkcionalitás használathoz" #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "" +msgstr "Nincs megjeleníthető adat." #: searx/templates/oscar/messages/no_results.html:7 msgid "Sorry!" -msgstr "" +msgstr "Elnézést!" #: searx/templates/oscar/messages/no_results.html:8 msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" +msgstr "Nincs megjeleníthető találat." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "Siker!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "" +msgstr "Beállítások mentve" #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "Oh!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." -msgstr "" +msgstr "Hiba történt" #: searx/templates/oscar/result_templates/default.html:6 #: searx/templates/oscar/result_templates/map.html:7 #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/oscar/result_templates/videos.html:6 msgid "cached" -msgstr "" +msgstr "tárolt" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" -msgstr "" +msgstr "Kép megjelenítése" #: searx/templates/oscar/result_templates/images.html:22 msgid "View source" -msgstr "" +msgstr "Forrás megtekintése" #: searx/templates/oscar/result_templates/map.html:10 msgid "show map" -msgstr "" +msgstr "Térkép" #: searx/templates/oscar/result_templates/map.html:10 msgid "hide map" -msgstr "" +msgstr "Térkép elrejtése" #: searx/templates/oscar/result_templates/map.html:14 msgid "show details" -msgstr "" +msgstr "Részletek" #: searx/templates/oscar/result_templates/map.html:14 msgid "hide details" -msgstr "" +msgstr "Részletek elrejtése" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "" +msgstr "Seeder" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "" +msgstr "Leecher" # categories - manually added # TODO - automatically add @@ -423,4 +422,3 @@ msgstr "hírek" msgid "map" msgstr "térkép" - diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo index 59799b504c68430f8b965267860e16f157329068..ea25e74d3bdf70fd83a0f7bddb868a4a8b446020 100644 GIT binary patch delta 1603 zcma*nU2Ka{9LMp~S!=5mMJt%>@m38BQ{rNYSRyXWkWFI7mT0EahOJB28x5(DFrgRb zZHNo=wnPwVhy*uCNG1fyA`&Api6z_+H(ti~x17Y4MDz6doO7P@{Qv)Ro~L~uIvdUo zOej2V_-x=?%J)fudVfE=+{SR2-JC|_J}kjQSd87sVR|?fVJ}|98#oc`J;uzy?HI-! za>?An>BeNuT^bV@c#Y%nGmgPwR3a}~m3T5IhD;d-F=WS=p$b`PU585CfQs9S<+ukq z%vDY*;3k%k-`t_0z>iUje};a1fm+cZjueJf^oP-l%ekmRt5NrFK;74bx}HQIW^f#K z;#llP&A*JLD z6*QI8T%3cWa1CZFXw=fsmh8ns>_jEX+3{n@qRnYkK|QFz*HQCtqvqd3?chUHf=8&h zeW-cQk=jf@s=#+%_Fr4{$xir=O7I(%poCfK2T*}#q7sF%4i{n=_u^!{f)`xIJU}Ii z6I_L-P;oLyXmbD+r_0CwYvL&eF5-FAqgcg*(p%evN{~er(2KM28tPHKM9m*UJ>y@f zm(xc_iD#n{m7~TN+wp2t-ny)9G@=5v;55u&Ii5fTdVnKaiCW2XRNw*BmVZFK?H^G) z_XB5PA#ZLKhEXd|SktHivRNA1x`U{f=Nu|P-uCYzi!x793E!apCk9akySPa^5kOs^ zk18-?U2ex~FvR$Jtj7#)(eM8S4Gy!I@_B4#C8~g0RK=TcF2+zVRSqlg2rAKi)cj|t z0$!n3_STLMq2_(D{okmUv54x6^!xYG&=v+!TRa67s0_9BAyk12Pz6=l{%X|xCRBoE zR3YuQztdjdZ#|54T<<~$KVVP+Jd^U3?tm+lXx{E5+njVf=Cnq)wIx~-v6PceI_c#{{R0u_smSy_jvkiN%oZS zN%AY>H}BWe|IfjI8DBfZB?p@^58H4Po zHpER44c9Rjr%(xIQ3; zm{v!W8x~>Zs6t|>fDNb#2T&85P{-p4X5mrP{7%%k<47*+K^1lewKIdRe-st}Dk}a& znEhA7Gz|)rK_z;OI*`w>3IjxoVlB@3%nqXxtuk4K|3<}G=fV^VlT~pdsBvYO!8qy_ zETInNw|w?riT%8=oftyBn_Z}Z&8TvYdus6*L{+Q~jtoPN|6Uqo_Q3RTFM zd!EFAwea`iMhPCG3R!T^iyH$tEYA0sr2i9EVl~^QGtpk^4F@7V?|CrG7wqUy4Gf<3 qmUBk@-m&nKFI2y;vc7SD{T?rt*X#El6(s(R`BnJ9?@gAB`~Cv5YPA9l5m8izc#&zLf+104w&r5`if)8bZ77HoLST`3 z(S;-x(!rJvpx%_AVNnVN7FieGRaX_!$@>0epnss{-TBPSJ2TJo&O5u`a!2!n3#s83 z4WAmmS$v;{srB!3GQt=xbBZDgyD=WmVGIr+ml>jn#_KqYqnL*KB8^#vP3XlwBhgn#SCAc3ip%VCv8XrLxOf@N}gjP`G zV=lU}0)vHADye8ox-cAjQGxnw{{`fs%^)hFA=JXRQR5$?#!sMja1s?@3bpPGYTPW6 zn|Xyw@O>=%uPyp$2mC+<_=5@%&nUIiQ46g`1@dAQu0t<&VJ42?370XCQRBC=xDwxq zT4xt3fg05PLkaA^0yWSvj1KBmr1PS5YS*9w>_$xpAg9)Jq7K&p>THZ4G0iwC&@?LW zOH{&dQHOTX_WwjB;tp~$R7pSu&O|M|77K7YYM~}n0_~^(9jJwSP+Q)IdiUp14>W|! ziD5DAab#1?Z`8bKZpvU16-~@Q4e%mk%m!--lB}slO*oADpYWp+?m->eL3{rWD!~V~ zJ!zf6Jo@KQhxR*iXoIGL=t|%Qg|=`E^#oI>gkE4izCj%-H``N)QK&$hQHQG(m0+3e zuSD(aLECObt$Q3b{xnAF_up*?oL%nVXJox%`-f3Ga@Y1hvh63Rh2~L-ET95>z?Jv~ z^~#djCMA}ERhW%lY(@R4nafl{6Y*)TJb!(Y$7%5d8hxJTx}z=r2EVV(6L37OzP1LZ zt=ZG=t81%o3_VMTbY+w~^>xSmopk}f(_$)ofkx+u+2i!jCw7EpqugQcT3>sAc}h_z kBKE2)x@eQ9sBp{1^`X(YoUs28CN!TISPl^?PZ@Fj1wmH0EC2ui delta 1424 zcmYk*OGs2v9LMqh)tPY`-xE4enictg#GFVfdmtzY)d-FiNd=KTgcf25p=bk@tBM2> zXHg3&R}Dg4kRWPhK~bS(iy~{01W}7HdQh9bKRQsu^?uGhkN^LF?mgbF{!y8F8x4#Z zza)QU{AIHA^zXMlXvSqbxaD9o=HVV(h6j<$j&TcPH%?+NF2`8NYz?kQx-5a^*nv^A zl=admqT?dw;utEy1S;Vaa@jPuQoQf_=TQZ`aehE0{DK6w0E=rehKkd|O$F>lrdSe- z$#0!BRQYLCA${0{!x+IwsKVw@3m32$7v1=G%;(u7NFf$t0al>q*P-5Q1FFCzmf%T^ zlivnuXvY^&iAFSl*RTq2UU^Qm29_LXz4>B0QTvYrb zOlcrSgH2dDs*p-lz>TN{+fWOdP{*ScvvD_SeH&`tJ|vfQq6+Imy_p_2K7@*Y9u@y; zg!iwGG#v^wiAr<}bs+Cx4F-u8!#X_cne9T&f52iDK7)$$l$#28g&Kd4O7syYaS8Pa z(p05GnaStXhGL!2;PinXHVC!L+Bbw}O!8RW7d=M^M` zT}Q3Upbllqr=bdGQKxdzP56b{u}5|-C~%fw70+d;L)nZvl;fxZzM|e(kOys`7*+5J ztj0>L#{?2TW#?$<@LWPA8u>e5+h20^UQ-pFz!k?8ax^^MZ5H^?yS4Vn1Df znD3zHLJU|7|EDyx({-o>aa@Uws84eMmFO@gu?uT(8g(e&Mg4(biRa%9WqYB-iN5Zh whCO5ZD!|ppXdC~WBO6g zm%WW2=S_V=@wb)VLVjPIB(wkjcC;(SqweB$GQ1zoh7ZFTa5v;p&+(cL_re$8oA5L^ zJWZ)?Sb@Fp5y+N$2cD%=Lw&$t9t+>YQ{hoK3;qqo(M-IG<1St-sdL~0*pshc4n@e? zoSUFH-Uh{P6)uMNKpyofFA?xIoQ;3=J_9lQIh5ePf^*@wP$D`ETf*R#%>RZn;VL#o z=mseFw?esh3zYpBcEE8s2kwNYz}-;JzXTWJU%kda6d#10@TdI1A5b#z7ZgV`2vaV0 z!XCH~4#BJ7&G0EG0)B^bz8w`@Rdb;TI+NFV@LV_rUI!b?7+lXlQgR=h3U@+r^hmz` zI3#HGG!#M4K{5O~l=JUGIsYM)41Nm5!DmqH9)xo48;Cab9Tb6wW|DtN(UJVXaVQS{ zf#P5`r)1s<#n2)sj(Xt@un+da`(PK`2VZVe>Hw7cRg7aw)uE*RUdWbu6pD~N9pqmI zFS76kd;>};45#I5$l$r~F(?^$7i#!1lv4c+&wzhI>5;h_#k&Za4khBVp>+TGa2;Hk zuRoA;7ZhQQrx~2i;8`fj_CtbE2lDy1`TPecj(>rR;4#Rfy68A@)C6Cc~BuQ!k6uUi8&aZ&2?|*=S7+#leY=9EU=A6S&4BQGOq6mtiF({Ee2u0|w ze1A_qe+i1Cx1gNc4{v~gapTE5PMWgKrp^6xmru0Me5P&s z@{9HIWdkevn|o)SHLHL5lKy_(f8oGI%O<{_bwOK~-yX+FU?a6U^YId6qIwpFHfnZs zbgx=tYsQ4S99tb&Eef&_MK;pgTX(dJN;dUbmIRCSN~6n(9l3l_+56f+Utbh9Z|hh# z`{4G-Gk*C)beS zMN-{FA}QazHgx2zrpwlAtd^2E_NCCII<9JO^>}P61UM9C&fB)AIp>r+8#l35HN~=v zY^tut0|#VHdpAlp(v~ehR+GepC5z%nZHcLk87WvB21Kr|u_j1$R_j(!OIwg>BNK1;|ilnDx3rXfGeyQ42E1S?J zYNLxPskrjg9rq_{Zq=Z*&AvHZ0Xsorj0?KeW>a#JAw4GWx;M4O^VRC2cXctm!PL!A zF>y67=`j>rk7NtXmCvllcFNmzAW| z9MxK}rEII_yi{>@+>J)M8dojJwjnxkT(Tuwml76iN`Wf{W0IxK=TH5pv8l>}saX13 zN2cydd^}dIu@wrV3kl!RFlRZFZAVhKS{K^@a{*sPw;Hx#CGWoNE|lW^mlfSApmg7f zR$HYu7$s6_iL0C9m=u;2H3CNt0=rmaux8SNN%+p`54n{$qms`;(K%U3m28m?wSgiK zZ@3sKGuexrYIR(|br+^;a$X?-uY5UksrtWFx#_%WuAH~F%S#ha-fB%+SDH`GJ7=(x zkUB{que`v&#*0z^I;wzgBY#3AyoLm} zIwtpFJ1WjNHx;lOdBt+rN`BkRgDPJ@6%yhozJf{o5>?n0)Wq+w6@QGzf5&FpF@kKw zjo5;>quw7t?d(oefjQiS&uEBaoS^Ns0#H}n_1uUc9e;paJ zRaC*Jup7^!hwG@7#~G}{CRF?sRy5Gg1BAYy2dD#i9(yoOw00c8_hM!fr~ucP ztiu05#fgzkiCa*GY>vDO*Jux*KEXQbQ2yM^{wr~k50=3c>f2=TR@{X;6F#bd5-QKQ321O zzSaAf!}E9t#@ROQSWmjT9N!eHUZ}5))lUZDT=8J_O5#{ebtZW^=4FR6*`34L9lc)G z^ODn3{kdRizC2$n^pE>tFq|3mvOD^{AuheQeS39sLvO6D{9I5f+t^}QJWzc0a6SkF zx6<6{K8jzhEtUg!spa{W2MUMg3qjc?ii=@TaN80yb)oO)T_rIx_+J$^<`+UgpII&j z3#FjEm=DQVu&KFBx!@n}v}vCRekSkx2SaxwG3!=RyWMKT(OBTpjh, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-09-09 15:33+0000\n" +"PO-Revision-Date: 2014-12-11 13:50+0000\n" "Last-Translator: André Koot \n" -"Language-Team: Dutch " -"(http://www.transifex.com/projects/p/searx/language/nl/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/searx/language/nl/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -92,19 +92,19 @@ msgstr "Interfacetaal" #: searx/templates/default/preferences.html:36 #: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" -msgstr "" +msgstr "Auto-aanvullen" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 #: searx/templates/oscar/preferences.html:66 msgid "Method" -msgstr "" +msgstr "Methode" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 #: searx/templates/oscar/preferences.html:76 msgid "Themes" -msgstr "" +msgstr "Thema's" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:66 @@ -141,11 +141,9 @@ msgstr "Blokkeren" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." -msgstr "" -"Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets" -" over jou te bewaren." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets over jou te bewaren." #: searx/templates/courgette/preferences.html:94 #: searx/templates/default/preferences.html:96 @@ -153,9 +151,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies " -"niet om je te volgen." +msgstr "Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies niet om je te volgen." #: searx/templates/courgette/preferences.html:97 #: searx/templates/default/preferences.html:99 @@ -212,189 +208,190 @@ msgstr "Zoekmachinestatistieken" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "Klik op het vergrootglas om te zoeken" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Vertaling" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Ja" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Nee" #: searx/templates/default/results.html:34 msgid "Answers" -msgstr "" +msgstr "Antwoorden" #: searx/templates/oscar/base.html:69 msgid "Powered by" -msgstr "" +msgstr "Powered by" #: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" +msgstr "een privacy eerbiedigende, aanpasbare metazoekmachine" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" -msgstr "" +msgstr "Omschakelen navigatie" #: searx/templates/oscar/navbar.html:15 msgid "home" -msgstr "" +msgstr "thuis" #: searx/templates/oscar/preferences.html:11 #: searx/templates/oscar/preferences.html:17 msgid "General" -msgstr "" +msgstr "Algemeen" #: searx/templates/oscar/preferences.html:12 #: searx/templates/oscar/preferences.html:99 msgid "Engines" -msgstr "" +msgstr "Zoekmachines" #: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" -msgstr "" +msgstr "Welke taal wil je gebruiken voor het zoeken?" #: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" -msgstr "" +msgstr "Wijzig de taal van de layout" #: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" -msgstr "" +msgstr "Zoek tijdens het typen" #: searx/templates/oscar/preferences.html:73 msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" +msgstr "Bepaal hoe de formulieren worden ingestuurd, lees meer over request methodes" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" -msgstr "" +msgstr "Wijzig searx layout" #: searx/templates/oscar/results.html:6 msgid "Search results" -msgstr "" +msgstr "Zoekresultaten" #: searx/templates/oscar/results.html:73 msgid "Links" -msgstr "" +msgstr "Links" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" -msgstr "" +msgstr "Start zoeken" #: searx/templates/oscar/search_full.html:11 msgid "Show search filters" -msgstr "" +msgstr "Toon zoekfilters" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "" +msgstr "Verberg zoekfilters" #: searx/templates/oscar/stats.html:2 msgid "stats" -msgstr "" +msgstr "stats" #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 #: searx/templates/oscar/messages/unknow_error.html:5 msgid "Close" -msgstr "" +msgstr "Sluiten" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "" +msgstr "Heads up!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Het lijkt erop dat je searx voor de eerste keer gebruikt." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "Waarschuwing!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" +msgstr "Activeer JavaScript om alle functionaliteit van deze site te gebruiken." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "" +msgstr "Er zijn momenteel geen gegevens beschikbaar." #: searx/templates/oscar/messages/no_results.html:7 msgid "Sorry!" -msgstr "" +msgstr "Sorry!" #: searx/templates/oscar/messages/no_results.html:8 msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" +msgstr "we kregen geen resultaat. Probeer een andere opvraag of zoek in meer categorieën." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "Goed gedaan!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "" +msgstr "Instellingen succesvol opgeslagen." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "Verdraaid!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." -msgstr "" +msgstr "Er ging iets fout." #: searx/templates/oscar/result_templates/default.html:6 #: searx/templates/oscar/result_templates/map.html:7 #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/oscar/result_templates/videos.html:6 msgid "cached" -msgstr "" +msgstr "gecached" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" -msgstr "" +msgstr "Toon afbeelding" #: searx/templates/oscar/result_templates/images.html:22 msgid "View source" -msgstr "" +msgstr "Bekijk bron" #: searx/templates/oscar/result_templates/map.html:10 msgid "show map" -msgstr "" +msgstr "toon kaart" #: searx/templates/oscar/result_templates/map.html:10 msgid "hide map" -msgstr "" +msgstr "verberg kaart" #: searx/templates/oscar/result_templates/map.html:14 msgid "show details" -msgstr "" +msgstr "toon details" #: searx/templates/oscar/result_templates/map.html:14 msgid "hide details" -msgstr "" +msgstr "verberg details" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "" +msgstr "Aanbieder" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "" +msgstr "Ophaler" # categories - manually added # TODO - automatically add @@ -424,4 +421,3 @@ msgstr "nieuws" msgid "map" msgstr "kaart" - From 62a7dc1aaa31227a05d3964ae0bde109a111908e Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 25 Dec 2014 11:11:42 +0100 Subject: [PATCH 21/62] [doc] changelog added --- CHANGELOG.rst | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 CHANGELOG.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 000000000..efdfdde4e --- /dev/null +++ b/CHANGELOG.rst @@ -0,0 +1,26 @@ +0.6.0 +===== + +- Changelog added +- New engines + - Flickr (api) + - Subtitleseeker + - photon + - 500px + - Searchcode + - Searchcode doc + - Kickass torrent +- Precise search request timeout handling +- Better favicon support +- Stricter config parsing +- Translation updates +- Multiple ui fixes +- Flickr (noapi) engine fix +- Pep8 fixes + + +News +~~~~ + +Health status of searx instances and engines: http://stats.searx.oe5tpo.com +(source: https://github.com/pointhi/searx_stats) From fcc394540bded9ef6863d2c3432044db3ee0b102 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 25 Dec 2014 17:56:01 +0100 Subject: [PATCH 22/62] [enh] v0.6.0 --- searx/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/version.py b/searx/version.py index ae07c2b3d..d8888fc98 100644 --- a/searx/version.py +++ b/searx/version.py @@ -18,7 +18,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. # version of searx VERSION_MAJOR = 0 -VERSION_MINOR = 5 +VERSION_MINOR = 6 VERSION_BUILD = 0 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR, From 011c43b485ed66d399aede2ca1366805496ab8b8 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 25 Dec 2014 18:07:22 +0100 Subject: [PATCH 23/62] [doc] list indentation fix --- CHANGELOG.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index efdfdde4e..364f704bf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,13 +3,13 @@ - Changelog added - New engines - - Flickr (api) - - Subtitleseeker - - photon - - 500px - - Searchcode - - Searchcode doc - - Kickass torrent + - Flickr (api) + - Subtitleseeker + - photon + - 500px + - Searchcode + - Searchcode doc + - Kickass torrent - Precise search request timeout handling - Better favicon support - Stricter config parsing From 35dc043c09af342730afed44c6270180f259c955 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sat, 27 Dec 2014 14:43:24 +0100 Subject: [PATCH 24/62] [enh] update translations --- searx/translations/de/LC_MESSAGES/messages.mo | Bin 5436 -> 5402 bytes searx/translations/de/LC_MESSAGES/messages.po | 128 +++++++++--------- searx/translations/en/LC_MESSAGES/messages.mo | Bin 5000 -> 5000 bytes searx/translations/en/LC_MESSAGES/messages.po | 61 ++++----- searx/translations/es/LC_MESSAGES/messages.mo | Bin 5195 -> 5207 bytes searx/translations/es/LC_MESSAGES/messages.po | 71 +++++----- searx/translations/fr/LC_MESSAGES/messages.mo | Bin 5496 -> 5496 bytes searx/translations/fr/LC_MESSAGES/messages.po | 107 ++++++++------- searx/translations/hu/LC_MESSAGES/messages.mo | Bin 5168 -> 5168 bytes searx/translations/hu/LC_MESSAGES/messages.po | 94 ++++++------- searx/translations/it/LC_MESSAGES/messages.mo | Bin 5149 -> 5172 bytes searx/translations/it/LC_MESSAGES/messages.po | 71 +++++----- searx/translations/ja/LC_MESSAGES/messages.mo | Bin 5041 -> 5115 bytes searx/translations/ja/LC_MESSAGES/messages.po | 104 +++++++------- searx/translations/nl/LC_MESSAGES/messages.mo | Bin 5198 -> 5198 bytes searx/translations/nl/LC_MESSAGES/messages.po | 102 +++++++------- 16 files changed, 374 insertions(+), 364 deletions(-) diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo index 5914116277dcc5a11ad81dda177c6b54cc109626..bcfe9dd56290a0156a2f610016a0bd979d74be74 100644 GIT binary patch delta 867 zcmXZZF=$g!6vpwB#5A?W<|U1-i0JK*ilL1)4T@1g6bzz57g0i6c(D%}+O(P%!4484 zA_!tD&!vikE$E^k1iCaX6%?e14n-Vva1wQJ6uS67?VElt=iYnncWzqg$LZH=!TO_s z$lDzv?ILnzr^t4+u^T6mCAp0q_`qLZz-4|f;XW*OitNW(?8gPv{qIoMKVt&_;%*GZ zMB=zNCiTrih625$fNgjQ58?=Fpt~5wdDNg!aTh+vE^Og({DcvVS|VXgqMqA>T0el> z@DS>KIjg?a@H7R&$$2bb5p{w^f8#6EU@NGTtfB^4_t(FpzSJMoKL1enM;LPeJ5ht4 zK!d|bR=Hm1Lz6U68_c05eS&?sghl*-4NP&nPW}S*qBp2P)=(#1NBs+aU=U;6dJ+?; zFFB0bzleISUh)f*{stF0E4Pp#WFGY;o}o_k618y?^@*2#Tc`u9q6YhjI@mYVNq?gT z*g)+YPHyhYO83@>q);2=P%k=#b6CJMe!(6LHfO_&Z5`Qx>``+#mmfOjrJ}tNz6bL| zgWknxPvqK6dAc@HZr+K04F;WQZ!|U*==D}&`CPxTr(82rGUK*uoT^)MTvM^9Or=~i zu47kk8oOF@%9Lvvx!^cgC!DI6vW{?k#L5NEdJnC8A;%f_`r@_~Tsy-(iw4?J3OwEzGB delta 898 zcmXZZT}V@L7{~GdEH&qBn_3q1@()Vcn6eF(92I(_5OkFk2nlENw2s@^XlG_gFobS` zBIwXfF9d-IK@gjGH45^!x`+b1DT3bcYF9xJ)%S7d>T~vgd7j_@+5Koe`uufE<(W^Z zjZUR@DWxuVDb;~XxEF6ATj~M&an;+e;ySc>4{MN&Q8sXBUx4Dy0>uKJ8%!Vs~&p?swk7#K$*Z>l)@iSM!o6z2_?W+lwb{%hy6pDL|1P! zz(JJ81IW3gI^O(HQz!+_p)^Y49keitzp)RG)~>ZaY4axrlcPErPYoyBV}T>>BRUaJ z#S`wCK%btNGi*I=ETqknK4CZ+%d(5b@vLoF`JqhFK2^&FKDM}%!C7}Dn2Kv7@91J$ z&l!%MGp&L)OHSEzv~A?IZI!iS8l|h+a>_$$#?0hQw^O6X?5u+731 xxl}S2+|KaN9WlM={t9ooU%Hn=ON*A1xnvfyX5Pq}rE+b)C*|{9{sYh}g^2(F diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 9526536f4..1639d7898 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -1,54 +1,51 @@ -# English translations for PROJECT. +# English translations for . # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# +# This file is distributed under the same license as the project. +# # Translators: # pointhi, 2014 -# pointhi, 2014 # rike, 2014 # stf , 2014 -# stf , 2014 -# rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-12-25 10:01+0000\n" -"Last-Translator: Adam Tauber \n" -"Language-Team: German (http://www.transifex.com/projects/p/searx/language/de/)\n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"PO-Revision-Date: 2014-12-27 10:30+0000\n" +"Last-Translator: pointhi\n" +"Language-Team: German " +"(http://www.transifex.com/projects/p/searx/language/de/)\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -"Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Ladezeit (sek)" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "Trefferanzahl" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Punkte" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Punkte pro Treffer" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Fehler" @@ -128,63 +125,67 @@ msgstr "Kategorie" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Erlauben" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Blockieren" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store this " -"data about you." -msgstr "Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, damit wir keine Ihrer persönlichen Daten speichern müssen." +"These settings are stored in your cookies, this allows us not to store " +"this data about you." +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:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um Sie zu überwachen." +msgstr "" +"Diese Cookies dienen einzig Ihrem Komfort. Wir verwenden sie nicht, um " +"Sie zu überwachen." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "Speichern" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "Zurück" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "Such-URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" msgstr "Ergebnisse herunterladen" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "Vorschläge" @@ -209,24 +210,12 @@ msgstr "Suche nach..." #: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4 #: searx/templates/oscar/stats.html:5 msgid "Engine stats" -msgstr "Suchmaschinenstatistik" +msgstr "Suchmaschinenstatistiken" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" msgstr "klicke auf die Lupe, um die Suche zu starten" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "Übersetzung" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "Ja" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "Nein" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "Antworten" @@ -274,7 +263,10 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" +msgstr "" +"ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -284,12 +276,11 @@ msgstr "ändere das Aussehen von searx" msgid "Search results" msgstr "Suchergebnisse" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "Links" -#: searx/templates/oscar/search.html:6 -#: searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Suche starten" @@ -315,11 +306,11 @@ msgstr "Schließen" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "Achtung" +msgstr "Achtung!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "Es sieht so aus als ob das dein erstes mal mit searx ist." +msgstr "Es sieht so aus, als ob das erstes mal mit searx arbeitest." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" @@ -327,7 +318,7 @@ msgstr "Warnung!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "Bitte aktiviere JavaScript, um alle funktionen dieser Seite zu nutzen. " +msgstr "Bitte aktiviere JavaScript, um alle Funktionen dieser Seite zu nutzen. " #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -341,11 +332,14 @@ msgstr "Entschuldigung!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen anderen Suchbegriff, oder Suche das gewünschte in einer anderen Kategorie. " +msgstr "" +"Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen " +"anderen Suchbegriff, oder suche das gewünschte in einer anderen " +"Kategorie. " #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "Gut gemacht" +msgstr "Gut gemacht!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." @@ -353,7 +347,7 @@ msgstr "Einstellungen wurden erfolgreich gespeichert." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "Oh nein'" +msgstr "Oh nein!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." @@ -364,7 +358,7 @@ msgstr "Irgendetwas ist falsch gelaufen." #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/oscar/result_templates/videos.html:6 msgid "cached" -msgstr "zwischengelagert" +msgstr "Im Cache" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -392,11 +386,20 @@ msgstr "Details verstecken" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "Samenverstreuer" +msgstr "Seeder" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "Zecke" +msgstr "Leecher" + +msgid "Localization" +msgstr "Übersetzung" + +msgid "Yes" +msgstr "Ja" + +msgid "No" +msgstr "Nein" # categories - manually added # TODO - automatically add @@ -426,3 +429,4 @@ msgstr "Neuigkeiten" msgid "map" msgstr "Karte" + diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo index 0dc3e5d599a0d8ffb2bae6492526caba373040a7..9d746c2b2788519a1ad87fe37f8eefbdd13d9c88 100644 GIT binary patch delta 23 ecmeBB?@-^M!oy{xYh\n" "Language-Team: en \n" @@ -17,31 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "" @@ -121,22 +121,22 @@ msgstr "" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " @@ -144,7 +144,7 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -152,32 +152,32 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" msgstr "" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "" @@ -208,18 +208,6 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" @@ -277,7 +265,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "" @@ -390,6 +378,15 @@ msgstr "" msgid "Leecher" msgstr "" +msgid "Localization" +msgstr "" + +msgid "Yes" +msgstr "" + +msgid "No" +msgstr "" + # categories - manually added # TODO - automatically add msgid "files" diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo index 4413c3c76c31d56d5d02b35e9df7ff3d4f23a619..e737b1cd7042b7779538d6355a895e2eb4d17f08 100644 GIT binary patch delta 824 zcmXZaPe>GT6u|Mfqr29&n`^eR^oKT)T(gmxS;<;Tgt|$8*n}hy9Cfq7rh#1*L}(5z zcqu|WMHC?vM9{wl6Y3C1r@D3M79Biv2!akCf}rnX2ZsIpe((3@{oe04`?>I~@cN4p zzKn@%?Gf1}BGt4=8!jV{+~J2MSw&rcgh_mcPw@?Q;?=z(M{y1dcn{;afxY+v58^iN zM`;&14B2)GrH4V0fNne@E21knPxnV z2GcC+d$~;5JlOz&0|bU}1k0!=T|+JKIPwK*-e$D^6}7SN$Ysb+p4L@E-#$&`NuHb!pUwvZ(QHY{h=m0v2lFQWPIXeeWD<{wQjLW2kkmBbOmH z)Vz8Wzl-EM@_+%KN!C$M{uVWH6U+D!k7FnQoE#1}mg4IP$1$CuyggVdp6<77%Sv9p zWR@$7Ud;<`ndja4N-6JH_MmCorgM^Esd#GbLMnG;#`W`K?!r{1nm^;#rajLOf{|I@ o^==MK2R^k^$(Z3*8};;UBeC^-K9~s_ZJEhfOT~8^a~(g7|8c2dsQ>@~ delta 811 zcmXZaO-NKx6u|NGrbeA{%(2En%5Vh9!FqAuL&|1TK}C@EA+AKoAz!BGOsK?E;7iJO zQDU@c5s}y;1BE9@YoSeTS{1Yj0wEVc;KH5#4|8GQckj99-Fwcx^F9A1zxFj2E;%Bb z^&)j5GTIZosHFld#wYQB|c>5)0klX&^nKL@N;a&B|L$jP#f4nE#NO|BRg1wPFf^}b*SIf zr^9Mz?F0@J=)!Y&5w+8&s2eO;-=OBL*!9n-g?&RVLw+L7$sg1Mcd-@sPz!Etsvc}m z*Dr+(^ngCps~)rqxA7SBNxX_LaT0$cKe=(Rntu!RY09VtS5U9~G48_^G`Nad=r7cR zx2@qn2D-s6>eV@vsRboa<5}E~ZKxY`pl*E9#(mW9PNU|ZMJ@0$>OO-=^D>H>SF!O& zNWL%681Ovu3iZw2qb7dDeq6^ctmU86f_`*A{;tONT>n(gH-&ERxbcihUcct{2lvLN z$I2!5LUAT2u;_KW=8S84a-LT(-eO;>B{LC>7fT~k#D8I^M9AC!ty(UVltaf0YY Z!)z=b%-kuDM49xkvzSe|(c7kt*niDBU6B9) diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index 3503a1cfe..686c0f460 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-09-08 11:01+0000\n" -"Last-Translator: Alejandro León Aznar\n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"PO-Revision-Date: 2014-11-26 20:38+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Spanish " "(http://www.transifex.com/projects/p/searx/language/es/)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -19,31 +19,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "hace {hours} hora(s) y {minutes} minuto(s)" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Tiempo de carga (segundos)" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Puntuaciones" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Puntuaciones por resultado" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Errores" @@ -92,19 +92,19 @@ msgstr "Idioma de la interfaz" #: searx/templates/default/preferences.html:36 #: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" -msgstr "" +msgstr "Autocompletar" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 #: searx/templates/oscar/preferences.html:66 msgid "Method" -msgstr "" +msgstr "Método" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 #: searx/templates/oscar/preferences.html:76 msgid "Themes" -msgstr "" +msgstr "Temas" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:66 @@ -123,22 +123,22 @@ msgstr "Categoría" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Permitir" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Bloquear" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " @@ -148,7 +148,7 @@ msgstr "" "almacenar dicha información sobre usted." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -158,32 +158,32 @@ msgstr "" "rastrearle." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "Guardar" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "Atrás" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "Buscar URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" msgstr "Descargar resultados" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "Sugerencias" @@ -214,18 +214,6 @@ msgstr "Estadísticas del motor de búsqueda" msgid "Click on the magnifier to perform search" msgstr "" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" @@ -283,7 +271,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "" @@ -396,6 +384,15 @@ msgstr "" msgid "Leecher" msgstr "" +msgid "Localization" +msgstr "" + +msgid "Yes" +msgstr "" + +msgid "No" +msgstr "" + # categories - manually added # TODO - automatically add msgid "files" diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo index e306e78aa552eac372f2933288abeaad6f095842..ed0d6a4ecc504db1f8e490db19ef6095df10c467 100644 GIT binary patch delta 23 ecmeyN^+RieG!K`Nu93Ndp^25T, 2014 # Cqoicebordel , 2014 # FIRST AUTHOR , 2014 # rike, 2014 -# rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-26 20:41+0100\n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" "PO-Revision-Date: 2014-12-14 21:00+0000\n" "Last-Translator: Cqoicebordel \n" -"Language-Team: French (http://www.transifex.com/projects/p/searx/language/fr/)\n" +"Language-Team: French " +"(http://www.transifex.com/projects/p/searx/language/fr/)\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -"Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "il y a {hours} heure(s), {minutes} minute(s)" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Chargement de la page (sec)" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "Nombre de résultats" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Score" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Score par résultat" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Erreurs" @@ -127,63 +126,67 @@ msgstr "Catégorie" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Autoriser" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Bloquer" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store this " -"data about you." -msgstr "Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas collecter vos données." +"These settings are stored in your cookies, this allows us not to store " +"this data about you." +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:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utilisons pas pour vous espionner." +msgstr "" +"Ces cookies existent pour votre confort d'utilisation, nous ne les " +"utilisons pas pour vous espionner." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "enregistrer" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "retour" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "URL de recherche" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" msgstr "Télécharger les résultats" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "Suggestions" @@ -214,18 +217,6 @@ msgstr "Statistiques du moteur" msgid "Click on the magnifier to perform search" msgstr "Cliquez sur la loupe pour effectuer une recherche" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "Localisation" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "Oui" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "Non" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "Réponses" @@ -273,7 +264,10 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" +msgstr "" +"Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -283,12 +277,11 @@ msgstr "Modifier l'affichage de searx" msgid "Search results" msgstr "Résultats de recherche" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "Liens" -#: searx/templates/oscar/search.html:6 -#: searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Lancer une recherche" @@ -326,7 +319,9 @@ msgstr "Attention !" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce site." +msgstr "" +"Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce" +" site." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -340,7 +335,9 @@ msgstr "Désolé !" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou changez de catégorie." +msgstr "" +"nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou " +"changez de catégorie." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -397,6 +394,15 @@ msgstr "Sources" msgid "Leecher" msgstr "Téléchargeurs" +msgid "Localization" +msgstr "Localisation" + +msgid "Yes" +msgstr "Oui" + +msgid "No" +msgstr "Non" + # categories - manually added # TODO - automatically add msgid "files" @@ -425,3 +431,4 @@ msgstr "actus" msgid "map" msgstr "carte" + diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo index 58fadcdb2d4dbc2e69ebbe51b8d6c1c3c99a6a8a..69d4257b6a512ca65cf2188090844d48626add32 100644 GIT binary patch delta 23 ecmdm>u|Z>lG!K`Nu93Ndp^25T delta 23 ecmdm>u|Z>lG!K`du92C7k%5(o;bv7HZVmuVYXxus diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index dd284ce7e..d750a5350 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -1,50 +1,50 @@ -# English translations for PROJECT. +# English translations for . # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# +# This file is distributed under the same license as the project. +# # Translators: # Adam Tauber , 2014 # FIRST AUTHOR , 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-26 20:41+0100\n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" "PO-Revision-Date: 2014-12-22 16:11+0000\n" "Last-Translator: Adam Tauber \n" -"Language-Team: Hungarian (http://www.transifex.com/projects/p/searx/language/hu/)\n" +"Language-Team: Hungarian " +"(http://www.transifex.com/projects/p/searx/language/hu/)\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -"Language: hu\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" msgstr "{minutes} perce" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} óra, {minutes} perce" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Válaszidők (sec)" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "Találatok száma" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Pontszámok" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Pontszámok találatonként" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Hibák" @@ -124,63 +124,65 @@ msgstr "Kategória" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Engedélyezés" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Tiltás" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store this " -"data about you." +"These settings are stored in your cookies, this allows us not to store " +"this data about you." msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a felhasználók követésére." +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:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "mentés" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "vissza" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "Keresési URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" msgstr "Találatok letöltése" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "Javaslatok" @@ -211,18 +213,6 @@ msgstr "Kereső statisztikák" msgid "Click on the magnifier to perform search" msgstr "A nagyítóra kattintva indítható a keresés" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "Nyelv" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "Igen" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "Nem" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "Válaszok" @@ -270,7 +260,10 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "Keresés metódusa (bővebben)" +msgstr "" +"Keresés metódusa (bővebben)" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -280,12 +273,11 @@ msgstr "Megjelenés" msgid "Search results" msgstr "Keresési eredmények" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "Linkek" -#: searx/templates/oscar/search.html:6 -#: searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Keresés indítása" @@ -394,6 +386,15 @@ msgstr "Seeder" msgid "Leecher" msgstr "Leecher" +msgid "Localization" +msgstr "Nyelv" + +msgid "Yes" +msgstr "Igen" + +msgid "No" +msgstr "Nem" + # categories - manually added # TODO - automatically add msgid "files" @@ -422,3 +423,4 @@ msgstr "hírek" msgid "map" msgstr "térkép" + diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo index ea25e74d3bdf70fd83a0f7bddb868a4a8b446020..5c102b87133f3c8a8e089279f0a5dbff76cf9105 100644 GIT binary patch delta 847 zcmXZaO=uHA7{>8QYFblMV=OksD6Uv)pe}5-rD{-V{lE{9N>O@Hu$y!>E8VUp8^IFT zizs-ilpcd%6)K1dD~J~_dJ#N%>rp65PaYHxRn-3r1A*Vn?7QzgGn;ntb@A1wWb`7T z)cY+;rIk|k9;Ldlh5dLJyRnU(xPnsm5})E*?8U2FmD-C9EaDQT@Es1|2i$?{DE0p^ zi@jMDsXhk#n90Uvl#Py~te@5E(C`)eO6Hde8CKUL+SeyllU9A z|84yV>oHvECRa04Z9o|oh% zhESf5M+_w48SN#M6I5^zZ{QR@#A#ede(D_Y`D*G4N`M+l;9IyKTiAh5(83jzeO6KG zzoG<)zB7=M{n8I4rWB@83j1&q?$PrBlq)n*uGm6pG>Q`ZC`!OnD1oN*yn<36qV%6f z`rGQhURcltZS68nQuquF{DbnJ*d5`dFM#{s7hpduibzhh;C*9j#!wcrj zlTPTC4cjV>n5B|wk1{L|A6h)0$rr|F9N)O;G%If1IN~&_p63U_*md9WX5(fimFPba z_%~V5lemtW_XKxv8@usrm&kFP#R7(yz!x}(FENK-Q1cHkgMYgu zlpY3YB0YEz^`H^d`B5`}4)x%Q@j7auTiAz99Kpw^b#_r3c!zqCPpEajVI24I2>#53 zB5e%*Ffo9whegU*K)re07@#%~VlS>>7B^A%M<#xQTuwfq9{3ge@ds+dF*fN-)cjf0`g2G< zR~lww*(5wLu40A6bF>VF~`Ehn~;u4B0;^R8VQbB1llwmU9gvMS!a`cmD$V@=%* zyb_Dfm}O5`_ITbNFF6w%7gN32Y9oKDT5QyVMStEe-(I*Mg{ed=HF-Di=lq4nycc-U Y)AUTdrRG\n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"PO-Revision-Date: 2014-11-26 20:38+0000\n" +"Last-Translator: Adam Tauber \n" "Language-Team: Italian " "(http://www.transifex.com/projects/p/searx/language/it/)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -19,31 +19,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" msgstr "di {minutes} minuti fa" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "di {ore} h e {minutes} minuti fa" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr " Caricamento della pagina (secondi)" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "Risultati ottenuti" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Punteggio" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Punteggio per risultato" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Errori" @@ -92,19 +92,19 @@ msgstr "Linguaggio dell'interfaccia" #: searx/templates/default/preferences.html:36 #: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" -msgstr "" +msgstr "Completamento automatico" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 #: searx/templates/oscar/preferences.html:66 msgid "Method" -msgstr "" +msgstr "Metodo" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 #: searx/templates/oscar/preferences.html:76 msgid "Themes" -msgstr "" +msgstr "Grafica" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:66 @@ -123,22 +123,22 @@ msgstr "Categoria" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Autorizza" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Blocca" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " @@ -148,7 +148,7 @@ msgstr "" "conservare dati su di te." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -158,32 +158,32 @@ msgstr "" " sorvegliarti." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "salva" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "indietro" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "URL della ricerca" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" msgstr "Scarica i risultati" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "Suggerimenti" @@ -214,18 +214,6 @@ msgstr "Statistiche dei motori" msgid "Click on the magnifier to perform search" msgstr "" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" @@ -283,7 +271,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "" @@ -396,6 +384,15 @@ msgstr "" msgid "Leecher" msgstr "" +msgid "Localization" +msgstr "" + +msgid "Yes" +msgstr "" + +msgid "No" +msgstr "" + # categories - manually added # TODO - automatically add msgid "files" diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo index b735ed8bcbd415f4f47e1ef04e6eba5e368fa06a..d44ee77a7a2b0aa7e6e5fb7b5ed9d3661b4e30ec 100644 GIT binary patch delta 1094 zcmZ9~Ur19?90%~D;ij88n^=KmH=)#OUY-4Ondpn86@dy7QE;=HP4~}jrX?|VFPK7s zbxAYShfrIlX3e6&5Gn$(2cg$`I&CUN1O-8n_Wj9yh{k1~bAIRie!p|>_Bi)eBzVl%9PZEzc$hg9fu^m5W!gFy($lD|!h zo6AggoBe=LwAWEwq7|fOhl*_W{er#FQG9TBAwH&KQXpun^Glw9OA31Z4x!?_BPN&=JEpKp3PFF#_*IkATPeY5;AlvF>$?XuTC7t&FWDb`lO9e;;c5?8RjxeJs;v7mx$=T5vuka-xO$fc%5zPz uo-}-#9gI!f(N;{Gv>#SAKi;n__i8*GX?Ht4EkQYOHP+P`>%PJMpZ^6suJ!8x delta 889 zcmXZaPe{{Y7{KvY=bX*y=1e`9@avMsTKqPh$&}%63#OY}o7o|dW~{kP7pa9E8X`yq zLGe5E=g>hAiY}Ii4tX-6q7D&w2(eSQu3bukzK_0_eSYuryzlcozxTKO&exsmU#cs& zs+4+PuasRW)!(3$1Ec7|1RlY0l>8;E!z;LkWo*WlMx~D9N$kQAl>PJAfw$3%Ptb#} zkd|t*QB@8aeIy`_cd!=suoZvm_&&-YHus?oD2>}t3j6RBMo{WZqYN;I@*;~Ubyu(& zA7B$cbXN}FXqCXhWH?A-6P@@EGda+I^R(S`GM3A zs$V>`6Znnt%{<(bG-|~xcA)&Ju45ZM-B`3w)Ved-^l*G=%ovYnbBXk*wO1br1^mHY zBWQ+u0zNZfn$AqxpDo-h&6Uct{#bs#5GEPu@dr%588QOB;qE@48MHF4qi4>ZPbQ7g zXew?D#8c5kaxfZ;W#hSA#F@;`78mlxf`6=#p9vdR^Tt3jIe4vfx_qM;v36Wr8!zmu u)z*lo-@043wBcx4s;ZgHU!Jxec|$c*<(Y!D>%Cz8b+%jS=4I<%efU2*1$FZP diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index 5b4d7a1dd..0a329ca09 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -1,49 +1,52 @@ -# Japanese translations for PROJECT. +# English translations for . # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2014. +# This file is distributed under the same license as the project. # +# Translators: +# pointhi, 2014 +# FIRST AUTHOR , 2014 msgid "" msgstr "" -"Project-Id-Version: PROJECT VERSION\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-10-05 16:38+0200\n" -"Last-Translator: FULL NAME \n" -"Language-Team: ja \n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"PO-Revision-Date: 2014-11-26 20:38+0000\n" +"Last-Translator: Adam Tauber \n" +"Language-Team: Japanese " +"(http://www.transifex.com/projects/p/searx/language/ja/)\n" "Plural-Forms: nplurals=1; plural=0\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" -msgstr "" +msgstr "{minutes}分前" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" -msgstr "" +msgstr "{hours}時間と{minutes}分前" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" -msgstr "" +msgstr "エラー" #: searx/templates/courgette/index.html:8 searx/templates/default/index.html:7 #: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16 @@ -72,7 +75,7 @@ msgstr "" #: searx/templates/default/preferences.html:15 #: searx/templates/oscar/preferences.html:30 msgid "Search language" -msgstr "" +msgstr "検索の言語" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 @@ -84,7 +87,7 @@ msgstr "" #: searx/templates/default/preferences.html:26 #: searx/templates/oscar/preferences.html:42 msgid "Interface language" -msgstr "" +msgstr "界面の言語" #: searx/templates/courgette/preferences.html:36 #: searx/templates/default/preferences.html:36 @@ -117,26 +120,26 @@ msgstr "" #: searx/templates/courgette/preferences.html:71 #: searx/templates/default/preferences.html:71 msgid "Category" -msgstr "" +msgstr "カテゴリー" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " @@ -144,7 +147,7 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " @@ -152,32 +155,32 @@ msgid "" msgstr "" #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" -msgstr "" +msgstr "保存" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" -msgstr "" +msgstr "バック" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" -msgstr "" +msgstr "ダウンロードの結果" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "提案" @@ -208,18 +211,6 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" @@ -238,7 +229,7 @@ msgstr "" #: searx/templates/oscar/navbar.html:15 msgid "home" -msgstr "" +msgstr "スタートページ" #: searx/templates/oscar/preferences.html:11 #: searx/templates/oscar/preferences.html:17 @@ -277,7 +268,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "" @@ -390,6 +381,15 @@ msgstr "" msgid "Leecher" msgstr "" +msgid "Localization" +msgstr "" + +msgid "Yes" +msgstr "" + +msgid "No" +msgstr "" + # categories - manually added # TODO - automatically add msgid "files" @@ -398,9 +398,6 @@ msgstr "ファイル" msgid "general" msgstr "ウェブ" -msgid "map" -msgstr "地図" - msgid "music" msgstr "音楽" @@ -419,3 +416,6 @@ msgstr "情報技術" msgid "news" msgstr "ニュース" +msgid "map" +msgstr "地図" + diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo index 1a11f583e209e1f6a9c78f1fc2d6f02c932cfff6..afa9438e1987ad141c07e68f40aaeb2ed611e02f 100644 GIT binary patch delta 23 ecmX@7aZY1{G!K`Nu93Ndp^25T, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-26 20:41+0100\n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" "PO-Revision-Date: 2014-12-11 13:50+0000\n" "Last-Translator: André Koot \n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/searx/language/nl/)\n" +"Language-Team: Dutch " +"(http://www.transifex.com/projects/p/searx/language/nl/)\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -"Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: searx/webapp.py:308 +#: searx/webapp.py:247 msgid "{minutes} minute(s) ago" msgstr "{minutes} min geleden" -#: searx/webapp.py:310 +#: searx/webapp.py:249 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} uur, {minutes} min geleden" -#: searx/engines/__init__.py:177 +#: searx/engines/__init__.py:179 msgid "Page loads (sec)" msgstr "Pagina laadt (sec)" -#: searx/engines/__init__.py:181 +#: searx/engines/__init__.py:183 msgid "Number of results" msgstr "Aantal zoekresultaten" -#: searx/engines/__init__.py:185 +#: searx/engines/__init__.py:187 msgid "Scores" msgstr "Scores" -#: searx/engines/__init__.py:189 +#: searx/engines/__init__.py:191 msgid "Scores per result" msgstr "Scores per zoekresultaat" -#: searx/engines/__init__.py:193 +#: searx/engines/__init__.py:195 msgid "Errors" msgstr "Fouten" @@ -123,63 +123,67 @@ msgstr "Categorie" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:83 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:85 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 #: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Toestaan" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:73 -#: searx/templates/default/preferences.html:86 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 #: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Blokkeren" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:94 +#: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store this " -"data about you." -msgstr "Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets over jou te bewaren." +"These settings are stored in your cookies, this allows us not to store " +"this data about you." +msgstr "" +"Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets" +" over jou te bewaren." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:96 +#: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies niet om je te volgen." +msgstr "" +"Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies " +"niet om je te volgen." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:99 +#: searx/templates/default/preferences.html:97 #: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "bewaren" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:100 +#: searx/templates/default/preferences.html:98 #: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "terug" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:83 msgid "Search URL" msgstr "Zoek URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:88 msgid "Download results" msgstr "Downloaden zoekresultaten" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:58 +#: searx/templates/oscar/results.html:63 msgid "Suggestions" msgstr "Suggesties" @@ -210,18 +214,6 @@ msgstr "Zoekmachinestatistieken" msgid "Click on the magnifier to perform search" msgstr "Klik op het vergrootglas om te zoeken" -#: searx/templates/default/preferences.html:72 -msgid "Localization" -msgstr "Vertaling" - -#: searx/templates/default/preferences.html:82 -msgid "Yes" -msgstr "Ja" - -#: searx/templates/default/preferences.html:82 -msgid "No" -msgstr "Nee" - #: searx/templates/default/results.html:34 msgid "Answers" msgstr "Antwoorden" @@ -269,7 +261,10 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "Bepaal hoe de formulieren worden ingestuurd, lees meer over request methodes" +msgstr "" +"Bepaal hoe de formulieren worden ingestuurd, lees meer over request methodes" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -279,12 +274,11 @@ msgstr "Wijzig searx layout" msgid "Search results" msgstr "Zoekresultaten" -#: searx/templates/oscar/results.html:73 +#: searx/templates/oscar/results.html:78 msgid "Links" msgstr "Links" -#: searx/templates/oscar/search.html:6 -#: searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Start zoeken" @@ -336,7 +330,9 @@ msgstr "Sorry!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "we kregen geen resultaat. Probeer een andere opvraag of zoek in meer categorieën." +msgstr "" +"we kregen geen resultaat. Probeer een andere opvraag of zoek in meer " +"categorieën." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -393,6 +389,15 @@ msgstr "Aanbieder" msgid "Leecher" msgstr "Ophaler" +msgid "Localization" +msgstr "Vertaling" + +msgid "Yes" +msgstr "Ja" + +msgid "No" +msgstr "Nee" + # categories - manually added # TODO - automatically add msgid "files" @@ -421,3 +426,4 @@ msgstr "nieuws" msgid "map" msgstr "kaart" + From 98815a0d6196eb6b9e1d98209043527b9eee33fe Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sun, 28 Dec 2014 09:52:03 +0100 Subject: [PATCH 25/62] [enh] add turkish translation --- AUTHORS.rst | 1 + searx/settings.yml | 1 + searx/translations/tr/LC_MESSAGES/messages.mo | Bin 0 -> 5415 bytes searx/translations/tr/LC_MESSAGES/messages.po | 421 ++++++++++++++++++ 4 files changed, 423 insertions(+) create mode 100644 searx/translations/tr/LC_MESSAGES/messages.mo create mode 100644 searx/translations/tr/LC_MESSAGES/messages.po diff --git a/AUTHORS.rst b/AUTHORS.rst index ef1ae7809..0cb072e9b 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -29,3 +29,4 @@ generally made searx better: - @kernc - @Cqoicebordel - @Reventl0v +- Caner Başaran diff --git a/searx/settings.yml b/searx/settings.yml index 260b56ca8..2d4366a1c 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -205,3 +205,4 @@ locales: it : Italiano nl : Nederlands ja : 日本語 (Japanese) + tr : Türkçe diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..5d6c0498f81fcdd744b53dcc188371196d418697 GIT binary patch literal 5415 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, 2014 +# FIRST AUTHOR , 2014 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"PO-Revision-Date: 2014-12-28 08:20+0000\n" +"Last-Translator: Caner Başaran \n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/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 1.3\n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: searx/webapp.py:247 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} dakika() önce" + +#: searx/webapp.py:249 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} saat(), {minutes} dakika() önce" + +#: searx/engines/__init__.py:179 +msgid "Page loads (sec)" +msgstr "Yüklenen sayfa (sn)" + +#: searx/engines/__init__.py:183 +msgid "Number of results" +msgstr "Sonuç sayısı" + +#: searx/engines/__init__.py:187 +msgid "Scores" +msgstr "" + +#: searx/engines/__init__.py:191 +msgid "Scores per result" +msgstr "" + +#: searx/engines/__init__.py:195 +msgid "Errors" +msgstr "Hatalar" + +#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:7 +#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16 +msgid "about" +msgstr "hakkında" + +#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 +#: searx/templates/oscar/navbar.html:17 +#: searx/templates/oscar/preferences.html:2 +msgid "preferences" +msgstr "tercihler" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/default/preferences.html:5 +#: searx/templates/oscar/preferences.html:6 +msgid "Preferences" +msgstr "Tercihler" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/default/preferences.html:9 +#: searx/templates/oscar/preferences.html:24 +msgid "Default categories" +msgstr "Öntanımlı kategoriler" + +#: searx/templates/courgette/preferences.html:15 +#: searx/templates/default/preferences.html:15 +#: searx/templates/oscar/preferences.html:30 +msgid "Search language" +msgstr "Arama dili" + +#: searx/templates/courgette/preferences.html:18 +#: searx/templates/default/preferences.html:18 +#: searx/templates/oscar/preferences.html:33 +msgid "Automatic" +msgstr "Otomatik" + +#: searx/templates/courgette/preferences.html:26 +#: searx/templates/default/preferences.html:26 +#: searx/templates/oscar/preferences.html:42 +msgid "Interface language" +msgstr "Arayüz dili" + +#: searx/templates/courgette/preferences.html:36 +#: searx/templates/default/preferences.html:36 +#: searx/templates/oscar/preferences.html:53 +msgid "Autocomplete" +msgstr "Otomatik tamamlama" + +#: searx/templates/courgette/preferences.html:47 +#: searx/templates/default/preferences.html:47 +#: searx/templates/oscar/preferences.html:66 +msgid "Method" +msgstr "Sorgu gönderim yöntemi" + +#: searx/templates/courgette/preferences.html:56 +#: searx/templates/default/preferences.html:56 +#: searx/templates/oscar/preferences.html:76 +msgid "Themes" +msgstr "Temalar" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:66 +msgid "Currently used search engines" +msgstr "Şu anda kullanılan arama motorları" + +#: searx/templates/courgette/preferences.html:70 +#: searx/templates/default/preferences.html:70 +msgid "Engine name" +msgstr "Motor adı" + +#: searx/templates/courgette/preferences.html:71 +#: searx/templates/default/preferences.html:71 +msgid "Category" +msgstr "Türü" + +#: searx/templates/courgette/preferences.html:72 +#: searx/templates/courgette/preferences.html:83 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:83 +#: searx/templates/oscar/preferences.html:118 +msgid "Allow" +msgstr "İzin ver" + +#: searx/templates/courgette/preferences.html:72 +#: searx/templates/courgette/preferences.html:84 +#: searx/templates/default/preferences.html:72 +#: searx/templates/default/preferences.html:84 +#: searx/templates/oscar/preferences.html:117 +msgid "Block" +msgstr "Engelle" + +#: searx/templates/courgette/preferences.html:92 +#: searx/templates/default/preferences.html:92 +#: searx/templates/oscar/preferences.html:132 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda veri saklamak için değil." + +#: searx/templates/courgette/preferences.html:94 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:134 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "Bu çerezler size kolaylık sağlar. Sizi takip etmek için kullanılmaz." + +#: searx/templates/courgette/preferences.html:97 +#: searx/templates/default/preferences.html:97 +#: searx/templates/oscar/preferences.html:137 +msgid "save" +msgstr "kaydet" + +#: searx/templates/courgette/preferences.html:98 +#: searx/templates/default/preferences.html:98 +#: searx/templates/oscar/preferences.html:138 +msgid "back" +msgstr "geri" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/default/results.html:12 +#: searx/templates/oscar/results.html:83 +msgid "Search URL" +msgstr "Arama Bağlantısı" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/default/results.html:16 +#: searx/templates/oscar/results.html:88 +msgid "Download results" +msgstr "Arama sonuçlarını indir" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/default/results.html:42 +#: searx/templates/oscar/results.html:63 +msgid "Suggestions" +msgstr "Öneriler" + +#: searx/templates/courgette/results.html:62 +#: searx/templates/default/results.html:78 +#: searx/templates/oscar/results.html:37 +msgid "previous page" +msgstr "önceki sayfa" + +#: searx/templates/courgette/results.html:73 +#: searx/templates/default/results.html:89 +#: searx/templates/oscar/results.html:45 +msgid "next page" +msgstr "sonraki sayfa" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 +#: searx/templates/oscar/search_full.html:5 +msgid "Search for..." +msgstr "Aramak için..." + +#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4 +#: searx/templates/oscar/stats.html:5 +msgid "Engine stats" +msgstr "Arama motoru istatistikleri" + +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "Arama yapmak için büyütece tıklayın" + +#: searx/templates/default/results.html:34 +msgid "Answers" +msgstr "" + +#: searx/templates/oscar/base.html:69 +msgid "Powered by" +msgstr "Gücümün kaynağı" + +#: searx/templates/oscar/base.html:69 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta arama motoru" + +#: searx/templates/oscar/navbar.html:6 +msgid "Toggle navigation" +msgstr "" + +#: searx/templates/oscar/navbar.html:15 +msgid "home" +msgstr "anasayfa" + +#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 +msgid "General" +msgstr "Genel" + +#: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 +msgid "Engines" +msgstr "Motorlar" + +#: searx/templates/oscar/preferences.html:39 +msgid "What language do you prefer for search?" +msgstr "Arama için hangi dili tercih edersiniz?" + +#: searx/templates/oscar/preferences.html:50 +msgid "Change the language of the layout" +msgstr "Yerleşim düzeninin dilini değiştir" + +#: searx/templates/oscar/preferences.html:63 +msgid "Find stuff as you type" +msgstr "Leb demeden leblebiyi anlasın" + +#: searx/templates/oscar/preferences.html:73 +msgid "" +"Change how forms are submited, learn more about request methods" +msgstr "Aramaların nasıl gönderildiğini değiştir, istek yöntemleri hakkında daha fazla bilgi" + +#: searx/templates/oscar/preferences.html:84 +msgid "Change searx layout" +msgstr "searx yerleşim düzenini değiştir" + +#: searx/templates/oscar/results.html:6 +msgid "Search results" +msgstr "Arama sonuçları" + +#: searx/templates/oscar/results.html:78 +msgid "Links" +msgstr "Bağlantılar" + +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 +msgid "Start search" +msgstr "Aramayı başlat" + +#: searx/templates/oscar/search_full.html:11 +msgid "Show search filters" +msgstr "Arama filtrelerini göster" + +#: searx/templates/oscar/search_full.html:11 +msgid "Hide search filters" +msgstr "Arama filtrelerini gizle" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "istatistikler" + +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/no_results.html:5 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Kapat" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "Dikkat et!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "İlk defa searx kullanıyor gibi görünüyorsunuz." + +#: searx/templates/oscar/messages/js_disabled.html:2 +msgid "Warning!" +msgstr "Uyarı!" + +#: searx/templates/oscar/messages/js_disabled.html:3 +msgid "Please enable JavaScript to use full functionality of this site." +msgstr "Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i etkinleştirin." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "Şuan uygun veri yok." + +#: searx/templates/oscar/messages/no_results.html:7 +msgid "Sorry!" +msgstr "Üzgünüz!" + +#: searx/templates/oscar/messages/no_results.html:8 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "herhangi bir sonuç bulamadık. Lütfen, başka sorgu kullanın veya daha fazla kategoride arama yapın." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Aferin!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "Ayarlar başarıyla kaydedildi." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "Tüh tüh!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Bazı bazı şeylerde problem olmuş." + +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" +msgstr "önbellek" + +#: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "Görseli indir" + +#: searx/templates/oscar/result_templates/images.html:22 +msgid "View source" +msgstr "Kaynağı göster" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "haritayı göster" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "haritayı gizle" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "ayrıntıları göster" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "ayrıntıları gizle" + +#: searx/templates/oscar/result_templates/torrent.html:8 +msgid "Seeder" +msgstr "Besleyenler" + +#: searx/templates/oscar/result_templates/torrent.html:8 +msgid "Leecher" +msgstr "Sömürenler" + +msgid "Localization" +msgstr "" + +msgid "Yes" +msgstr "Evet" + +msgid "No" +msgstr "Hayır" + +# categories - manually added +# TODO - automatically add +msgid "files" +msgstr "dosyalar" + +msgid "general" +msgstr "genel" + +msgid "music" +msgstr "müzik" + +msgid "social media" +msgstr "sosyal medya" + +msgid "images" +msgstr "görseller" + +msgid "videos" +msgstr "videolar" + +msgid "it" +msgstr "bilişim" + +msgid "news" +msgstr "haberler" + +msgid "map" +msgstr "harita" From a0293d6196c708e3a79cbb2a099a46caab7e58c7 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sun, 28 Dec 2014 15:07:11 +0100 Subject: [PATCH 26/62] [enh] move favicons into own directory --- .../courgette/img/{ => icons}/icon_dailymotion.ico | Bin .../courgette/img/{ => icons}/icon_deviantart.ico | Bin .../courgette/img/{ => icons}/icon_github.ico | Bin .../courgette/img/{ => icons}/icon_kickass.ico | Bin .../courgette/img/{ => icons}/icon_soundcloud.ico | Bin .../img/{ => icons}/icon_stackoverflow.ico | Bin .../courgette/img/{ => icons}/icon_twitter.ico | Bin .../static/courgette/img/{ => icons}/icon_vimeo.ico | Bin .../courgette/img/{ => icons}/icon_wikipedia.ico | Bin .../courgette/img/{ => icons}/icon_youtube.ico | Bin .../default/img/{ => icons}/icon_dailymotion.ico | Bin .../default/img/{ => icons}/icon_deviantart.ico | Bin .../static/default/img/{ => icons}/icon_github.ico | Bin .../static/default/img/{ => icons}/icon_kickass.ico | Bin .../default/img/{ => icons}/icon_soundcloud.ico | Bin .../default/img/{ => icons}/icon_stackoverflow.ico | Bin .../static/default/img/{ => icons}/icon_twitter.ico | Bin searx/static/default/img/{ => icons}/icon_vimeo.ico | Bin .../default/img/{ => icons}/icon_wikipedia.ico | Bin .../static/default/img/{ => icons}/icon_youtube.ico | Bin .../courgette/result_templates/default.html | 2 +- searx/templates/courgette/result_templates/map.html | 2 +- .../courgette/result_templates/videos.html | 2 +- .../templates/default/result_templates/default.html | 2 +- searx/templates/default/result_templates/map.html | 2 +- .../templates/default/result_templates/videos.html | 2 +- searx/webapp.py | 2 +- 27 files changed, 7 insertions(+), 7 deletions(-) rename searx/static/courgette/img/{ => icons}/icon_dailymotion.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_deviantart.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_github.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_kickass.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_soundcloud.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_stackoverflow.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_twitter.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_vimeo.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_wikipedia.ico (100%) rename searx/static/courgette/img/{ => icons}/icon_youtube.ico (100%) rename searx/static/default/img/{ => icons}/icon_dailymotion.ico (100%) rename searx/static/default/img/{ => icons}/icon_deviantart.ico (100%) rename searx/static/default/img/{ => icons}/icon_github.ico (100%) rename searx/static/default/img/{ => icons}/icon_kickass.ico (100%) rename searx/static/default/img/{ => icons}/icon_soundcloud.ico (100%) rename searx/static/default/img/{ => icons}/icon_stackoverflow.ico (100%) rename searx/static/default/img/{ => icons}/icon_twitter.ico (100%) rename searx/static/default/img/{ => icons}/icon_vimeo.ico (100%) rename searx/static/default/img/{ => icons}/icon_wikipedia.ico (100%) rename searx/static/default/img/{ => icons}/icon_youtube.ico (100%) diff --git a/searx/static/courgette/img/icon_dailymotion.ico b/searx/static/courgette/img/icons/icon_dailymotion.ico similarity index 100% rename from searx/static/courgette/img/icon_dailymotion.ico rename to searx/static/courgette/img/icons/icon_dailymotion.ico diff --git a/searx/static/courgette/img/icon_deviantart.ico b/searx/static/courgette/img/icons/icon_deviantart.ico similarity index 100% rename from searx/static/courgette/img/icon_deviantart.ico rename to searx/static/courgette/img/icons/icon_deviantart.ico diff --git a/searx/static/courgette/img/icon_github.ico b/searx/static/courgette/img/icons/icon_github.ico similarity index 100% rename from searx/static/courgette/img/icon_github.ico rename to searx/static/courgette/img/icons/icon_github.ico diff --git a/searx/static/courgette/img/icon_kickass.ico b/searx/static/courgette/img/icons/icon_kickass.ico similarity index 100% rename from searx/static/courgette/img/icon_kickass.ico rename to searx/static/courgette/img/icons/icon_kickass.ico diff --git a/searx/static/courgette/img/icon_soundcloud.ico b/searx/static/courgette/img/icons/icon_soundcloud.ico similarity index 100% rename from searx/static/courgette/img/icon_soundcloud.ico rename to searx/static/courgette/img/icons/icon_soundcloud.ico diff --git a/searx/static/courgette/img/icon_stackoverflow.ico b/searx/static/courgette/img/icons/icon_stackoverflow.ico similarity index 100% rename from searx/static/courgette/img/icon_stackoverflow.ico rename to searx/static/courgette/img/icons/icon_stackoverflow.ico diff --git a/searx/static/courgette/img/icon_twitter.ico b/searx/static/courgette/img/icons/icon_twitter.ico similarity index 100% rename from searx/static/courgette/img/icon_twitter.ico rename to searx/static/courgette/img/icons/icon_twitter.ico diff --git a/searx/static/courgette/img/icon_vimeo.ico b/searx/static/courgette/img/icons/icon_vimeo.ico similarity index 100% rename from searx/static/courgette/img/icon_vimeo.ico rename to searx/static/courgette/img/icons/icon_vimeo.ico diff --git a/searx/static/courgette/img/icon_wikipedia.ico b/searx/static/courgette/img/icons/icon_wikipedia.ico similarity index 100% rename from searx/static/courgette/img/icon_wikipedia.ico rename to searx/static/courgette/img/icons/icon_wikipedia.ico diff --git a/searx/static/courgette/img/icon_youtube.ico b/searx/static/courgette/img/icons/icon_youtube.ico similarity index 100% rename from searx/static/courgette/img/icon_youtube.ico rename to searx/static/courgette/img/icons/icon_youtube.ico diff --git a/searx/static/default/img/icon_dailymotion.ico b/searx/static/default/img/icons/icon_dailymotion.ico similarity index 100% rename from searx/static/default/img/icon_dailymotion.ico rename to searx/static/default/img/icons/icon_dailymotion.ico diff --git a/searx/static/default/img/icon_deviantart.ico b/searx/static/default/img/icons/icon_deviantart.ico similarity index 100% rename from searx/static/default/img/icon_deviantart.ico rename to searx/static/default/img/icons/icon_deviantart.ico diff --git a/searx/static/default/img/icon_github.ico b/searx/static/default/img/icons/icon_github.ico similarity index 100% rename from searx/static/default/img/icon_github.ico rename to searx/static/default/img/icons/icon_github.ico diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icons/icon_kickass.ico similarity index 100% rename from searx/static/default/img/icon_kickass.ico rename to searx/static/default/img/icons/icon_kickass.ico diff --git a/searx/static/default/img/icon_soundcloud.ico b/searx/static/default/img/icons/icon_soundcloud.ico similarity index 100% rename from searx/static/default/img/icon_soundcloud.ico rename to searx/static/default/img/icons/icon_soundcloud.ico diff --git a/searx/static/default/img/icon_stackoverflow.ico b/searx/static/default/img/icons/icon_stackoverflow.ico similarity index 100% rename from searx/static/default/img/icon_stackoverflow.ico rename to searx/static/default/img/icons/icon_stackoverflow.ico diff --git a/searx/static/default/img/icon_twitter.ico b/searx/static/default/img/icons/icon_twitter.ico similarity index 100% rename from searx/static/default/img/icon_twitter.ico rename to searx/static/default/img/icons/icon_twitter.ico diff --git a/searx/static/default/img/icon_vimeo.ico b/searx/static/default/img/icons/icon_vimeo.ico similarity index 100% rename from searx/static/default/img/icon_vimeo.ico rename to searx/static/default/img/icons/icon_vimeo.ico diff --git a/searx/static/default/img/icon_wikipedia.ico b/searx/static/default/img/icons/icon_wikipedia.ico similarity index 100% rename from searx/static/default/img/icon_wikipedia.ico rename to searx/static/default/img/icons/icon_wikipedia.ico diff --git a/searx/static/default/img/icon_youtube.ico b/searx/static/default/img/icons/icon_youtube.ico similarity index 100% rename from searx/static/default/img/icon_youtube.ico rename to searx/static/default/img/icons/icon_youtube.ico diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html index 3e93eee73..b46f95e9f 100644 --- a/searx/templates/courgette/result_templates/default.html +++ b/searx/templates/courgette/result_templates/default.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html index 3e93eee73..b46f95e9f 100644 --- a/searx/templates/courgette/result_templates/map.html +++ b/searx/templates/courgette/result_templates/map.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index 2694a9101..7b8bf6653 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -1,6 +1,6 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}

{{ result.title|safe }}

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index 0f3e3e6d8..73e9af1a9 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,5 +1,5 @@
-

{% 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 }}

{{ 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/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index f9ba7dcf6..d361ddb01 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 16b2d5f30..08575e847 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,5 +1,5 @@
-

{% 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.url }}

diff --git a/searx/webapp.py b/searx/webapp.py index 8d1676808..be7feee82 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -68,7 +68,7 @@ babel = Babel(app) global_favicons = [] for indice, theme in enumerate(themes): global_favicons.append([]) - theme_img_path = searx_dir+"/static/"+theme+"/img/" + theme_img_path = searx_dir+"/static/"+theme+"/img/icons/" for (dirpath, dirnames, filenames) in os.walk(theme_img_path): global_favicons[indice].extend(filenames) From a7adcacd04f3c40e48b8693f19d90b0c1a430a4c Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sun, 28 Dec 2014 15:10:42 +0100 Subject: [PATCH 27/62] [enh] add new marker-icons for map fetched from https://github.com/pointhi/leaflet-color-markers --- .../oscar/img/map/marker-icon-2x-green.png | Bin 0 -> 4203 bytes .../oscar/img/map/marker-icon-2x-orange.png | Bin 0 -> 4167 bytes .../static/oscar/img/map/marker-icon-2x-red.png | Bin 0 -> 4230 bytes searx/static/oscar/img/map/marker-icon-green.png | Bin 0 -> 1822 bytes .../static/oscar/img/map/marker-icon-orange.png | Bin 0 -> 1862 bytes searx/static/oscar/img/map/marker-icon-red.png | Bin 0 -> 1870 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 searx/static/oscar/img/map/marker-icon-2x-green.png create mode 100644 searx/static/oscar/img/map/marker-icon-2x-orange.png create mode 100644 searx/static/oscar/img/map/marker-icon-2x-red.png create mode 100644 searx/static/oscar/img/map/marker-icon-green.png create mode 100644 searx/static/oscar/img/map/marker-icon-orange.png create mode 100644 searx/static/oscar/img/map/marker-icon-red.png diff --git a/searx/static/oscar/img/map/marker-icon-2x-green.png b/searx/static/oscar/img/map/marker-icon-2x-green.png new file mode 100644 index 0000000000000000000000000000000000000000..c359abb6c2c2a1ee7272e3f85ee825583f6924f2 GIT binary patch literal 4203 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 literal 0 HcmV?d00001 diff --git a/searx/static/oscar/img/map/marker-icon-green.png b/searx/static/oscar/img/map/marker-icon-green.png new file mode 100644 index 0000000000000000000000000000000000000000..56db5ea9ffa29c2bf85feb5a943e0ab0dc73a3c0 GIT binary patch literal 1822 zcmV+(2jTdMP)P001cn1^@s6z>|W`00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3$s303JDN(rN$z2CGR# zK~z}7otIr~Tt^kh|L4rydw1{pBaNN5*bk&piW6ETkl+w_sDwfbNIW1Rgb?t6LNhkW6b(AsrluY;4_y?gJ>oWsL9 z#v9wQ-MRW}rK>sTw{y;!Gj~W;v7E8((7RU~K|dgCgi%c-9((EG;}grVrQ1Q?|C6l) z!tyx+KBIzuCd#adybI2#YMB^U1Mq8AJ$(H0r%ta3@}5VC&F0NJ8T>@4GXZ)fK^I`z zf{381U=b8G0j^PzRdZ6+Z=sw%b@a0@`z0aUe!OWNgMVvHv@sqqDM~=_9_j({0tf&G z*fPihCNe-q@Rzhv_+o^;|HR8*I&)!B$hPMA>=^RLRfv|I1=aMJ-;W>K^}5o{O3R3p?bH|oMXaN-Lm zN6}jN%n0UZl}e?gy&i7L13_D%xkW^@;ClpxzZM{?Ju00Q%U*tQ(=`LY;QmdYX7CQb z!6&Zfp{i|yA)wnJx+6lAT10n5u-yg}(Y(2?=Ar9-V#sVC{Qjng0e}X7cwZ`xCOYq} zq`u1lz3yO~G?YaW=56QcX>Hk!{g}l(+=GSu1nxXF7wbmKne)nqrWl z*5;d$iU1{GWOQUf$jyIzZt|Z9iMCqK9D6bZnqsKnB$LQXQuB@sL4jFGuE_5$FgEc9 zetGtAD+D5Kzeg_r4zG^9iqPjFxwhGpA%wasIOyNZogY}!3Bkv>pJJ)WY}nK*C;<{% z!qHd$j%hoM^*!rRHYpSVFAN>Tp}!tP`K}U*t^(mkXzKu`!pN`qOp36d?t6M;pB228 zzOT$h-L;lIC+^WI3;W*~;j%}w*+g$gFQ&38EL+6)Byc?r&1u)R8QC)8N`%Hg8Uc`g zQdMkzX2Y?LzOKRIZTY+%9{?mJ3zITT!-B3ev_lX&Jc_2kH$2QO`Ld}+G#+bx^v1EF z$IoxK0Kks+WpCCG^V%p4jaE|Uj%MaSO#-tAbrRGmWJ+e|`CF>aB!uR8BV$M3o^6nh zq9ehDBDoqPjtmGgPtX7f4xw20=By&E5@V#4o&VwBP=Beu-ecF%at<}u*s>MVAOk$9aW(^g7 zYWT@ZwIv|{Ae!u#JmfsdNKFMwx~O7Kfk^;)XkJSi&oAU}LCEl)(+vo|A)_ucN$bE` zXkQQ!;>18kT?VDyukX6jTs8y%#AOG?g_>Rk5>6Mas0vk}R{?S1da_DhSj^X=kTZL) z0Nyv!2mqY< zgjs5&!@I literal 0 HcmV?d00001 diff --git a/searx/static/oscar/img/map/marker-icon-orange.png b/searx/static/oscar/img/map/marker-icon-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..fbbce7b2ab1e5de921b5f5488960a333ed37d054 GIT binary patch literal 1862 zcmV-M2f6r(P)P001cn1^@s6z>|W`00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3tN{D;cm-z$E|x2GdDI zK~z}7rI%}rT~!sw|7-7a?z!ijduKYG>9ougD~4o{4_fFm#t_t)HU^^~-j9O{&6*ZVhgaj*XZKaKfQtWiz@B2KDefHkV54WAp?YwcH z{J-3@*ZS?X*WPR0L(GijjOX{iXSL4IP1>vx4kj7i(9UnXIKCWPS`6~X2j1I5Y(C4N zPcd`15F(b2tBua2wbqw{#vt)CYweGAe(l7oD}p?@io~{E+xCLQSHnUPVHkQ|-iL5< zAR;g`tkO_fgeZzsrCcIr{$|h_Jaqe){;ZdT{C?locQDDLuIs*Y?RDLO>quCwz$R4KyS;pC8MgYnVfC{yVL9qBti{GF4pF9`Yd-fcUipkKAFYLlzmJ6z6Un6$p+ zp39sM%7vJon$*)%lg2VW{*iC}?YTLS-`&5t!$|o?S65eS82Hdp32Y6PJ4i@4ehZ>R zVR&e;PI=jL$Ad2q0)V(O$w>L*La`+u_<5-61gz0u<~ah1d4IP?L)E6>=RFi#S{)Oc zXRi1b0PyVnTR+JpKd^RPyJzAuz_v+3I&fRskSlgT_^XgBcEAnWAe`Ksxh5{7qkXkU zLT*34d+Xf*K)=0jQ;>qj-?qLh$UA^Zt4-VBge|bhV|=QNdc6*<5=h5IP-sDCTLBUV zI;#NMUd@qLM52Mdf#D<%+wLR+w@Pv-Ec#H@F+j|o93oYOzM%nJf6ESRzWoy@uGxV4 z5|E`&L#m)`b_|f~YYW+<(bLn(!7w}l1Iw?;Lh zxGWMbD&+{2Z$;1hK0WV=di&-NA?&;X)0KK7KeOzuQ3wm3PvF~xWo-8Y7p&9fWP1+c zB*mH=w}6NiJi6<8wj(hbCip6uDu9}3?{8N*^`hcC#lkelXT>Zw{)@M z{!KS`3mZ>?O*VTuaKkp#Q^v*N8sa!cOZz(1rpF*17dLbj(Gob&$pkpNnh%mLgufc6 z|2b%o>26|XJax~;S2lFDZs{lpn7G^&Hai6A6dM;aV=0P;jKCHqDq97;_WOj~N8E_oK)T-b(29%z6o}fHRr37ha zYQfH)-^@UI51z^_I$_)LwX^21&_!DsKyzpwaik%{q}6XO^|z^er=LL2QH07vCM^+&+zi1 zkhu_j!}Z8A9_~GOs=Ocs0JO*-sMNHnL<%w&g1}44@d~I!3iW!XjWLg1>vIm|^FKII zA@JAx2IE+`0W3Gl$UdGrmXF@wJHnaBQ{EE@sZ>2W>1KPdW^1GuVLjV8(07*qoM6N<$f@n2+ ANB{r; literal 0 HcmV?d00001 diff --git a/searx/static/oscar/img/map/marker-icon-red.png b/searx/static/oscar/img/map/marker-icon-red.png new file mode 100644 index 0000000000000000000000000000000000000000..3e64e06d1db4eecf0d6e4446630fc4f9b97694b2 GIT binary patch literal 1870 zcmV-U2eJ5xP)P001cn1^@s6z>|W`00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3$s2DJLWAuf6~P2HQzQ zK~z}7rI%}rRaX_q|9kIq?mdtDm=_dhinS(Y;uopV!qk}Bl$f@L!Ut@OuNZ3_W2=5D z1dRqIF=(V8wDD16Ta7VRQ>X%>X|+&D3<52*kWi~2!^{+hdEI;G-t*XJ@3s7JVd!OM zm^-?Y|Cf{fU%#^-YprtxGozjH;)gbM8OT0i#WD$+IMv6)ds;^y~vi_r0+s$almBxo(}a6;ggXEEW-lK|b&M zkU1AZ2rx6q06LmM6h*pLsS0NPUJ%fZdtcsb7KI#GyYaoOZvt_$HhkU1BbwHUv2DaulP&KUXdL&tajb3w=-*KNFC3Gs(=XQ%4w>2Wzu zU>otGd#-#BBJ?pmIccURCoKV=-1LvVFU*1LzjITMRs8SX-rjQP`!JOmu(fD+2&LeZ z3W#)yOQWL=p=|$#zyE0z0OYkvR`D+jrIHtT9`wXC$QUs596`!?pOZ1rQx*96Jc{MA zW3Br2wb&8>o?pA+)2!tBTe>^*wps^>S|l9@Zf60xo-W9aB62-la68M8Id{%nTdkv~ zt2-~08rZY;p)Ue}*tce5kP0*Y?%uw@gM^)Fv}}V@@VS|E`Hm7++`R_=ie-4~Z->!U>;PvLY`N)Y0qH6< z44Wj&-jss*o-ptFq%(l7OSledQ36pep#QU*=e<$y`Ph93Z(oV&MjbMjYw?rL5awN9 zFyA8y81P*MPIYsuu1Y!rahhV;U8^93Sn%qu7+8(Oq!5Z*{G4j|t^xrAjv*T~O9g?M zX3fkD%LJ!TSTqsM)l6vh6NC^TB3}YH6(tFTQmt>2WymWBW3Rq`Q^?rKGsv@@vlBuo zL`ebypOi%6a3jq!p;U{Rk`(2s6SD&XuLm0C);on|qi`L_t`599I&5LkCzu(}-0{(4x0TCx^+*@CI@7Xj78a^lZYCyMBw8cy z=HN*Mie_MHbqH?VYE>>`f-)YeR*yY$>ZJh(05rs|k$U~v<;#}^re>RUXqE!l>NKcU zfy}umI1Z>@htACGJO;I_UV08j$EIQp@%`BXDV_KQZH%tz4AKjmb?64M72w#w&LrU2 z00#5UlU|5QqLEr#?|!gz?<{2S#F31^Ke=45#maZUoV8rXwgo_iK1Lh$*fKrw@Xp`a z)_!8`lM_j*BC?Qy59Vyil7Wl5j!;b#VKaKVrJn%6qh}6X2Jqz2OcX2MYc{AGdc{oz zKn6Z8*6T5VCmuU{XmSn&0F1UfD>^~lWKf|$ZwFjRGVn2zY0PAngsXq>&bTd*$Ic#_ zWFdB4jG|bD!PV4nZxt%^G1O>81l~D#;z)Ht2mlx_x2tBXt?3jh3?LYb$|;1X=@gC3 z7;EhhZ;Uwy@|B|pYJ&N@Lvb3*zz2arL<@=qAbbxOq9`KCJ03lAsJc{6H=EWxXCZ`u^g;}!SvR7(owN-B03Fd&skQYfoj?}y^WG>?3^An>q}J5BZSaeQVl4>y>c0-Amg$?rnT>@X z0#deSx0H}x9>ZA{la$~1_?dlr$q)b->we!enrM1Tr%+)IAU!LmkjIoxky@JQez5yj zH;Z#q$o7Lz87r{uB60IGF!s9lo6MTa Date: Sun, 28 Dec 2014 15:46:03 +0100 Subject: [PATCH 28/62] [enh] add new favicons to oscar template --- searx/static/oscar/img/icons/openstreetmap.png | Bin 0 -> 5184 bytes searx/static/oscar/img/icons/photon.png | Bin 0 -> 4177 bytes searx/static/oscar/img/icons/searchcode code.png | Bin 0 -> 4371 bytes searx/static/oscar/img/icons/searchcode doc.png | Bin 0 -> 4371 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 searx/static/oscar/img/icons/openstreetmap.png create mode 100644 searx/static/oscar/img/icons/photon.png create mode 100644 searx/static/oscar/img/icons/searchcode code.png create mode 100644 searx/static/oscar/img/icons/searchcode doc.png diff --git a/searx/static/oscar/img/icons/openstreetmap.png b/searx/static/oscar/img/icons/openstreetmap.png new file mode 100644 index 0000000000000000000000000000000000000000..4f88c9643e20555b94bb33f37a747e736d18393d GIT binary patch literal 5184 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 bd~N>^`Vwhdsyj>#00000NkvXXu0mjfi0{r{ literal 0 HcmV?d00001 diff --git a/searx/static/oscar/img/icons/searchcode code.png b/searx/static/oscar/img/icons/searchcode code.png new file mode 100644 index 0000000000000000000000000000000000000000..884c2660ddd890c179fb253b5cdb73bb63060940 GIT binary patch literal 4371 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 N002ovPDHLkV1k)mTY&%o literal 0 HcmV?d00001 diff --git a/searx/static/oscar/img/icons/searchcode doc.png b/searx/static/oscar/img/icons/searchcode doc.png new file mode 100644 index 0000000000000000000000000000000000000000..884c2660ddd890c179fb253b5cdb73bb63060940 GIT binary patch literal 4371 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 N002ovPDHLkV1k)mTY&%o literal 0 HcmV?d00001 From 8f4814ade265378f421e622e944ff19e9e567f9c Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sun, 28 Dec 2014 15:53:03 +0100 Subject: [PATCH 29/62] [fix] fix test --- searx/tests/test_webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py index 35ae49343..75ff585cc 100644 --- a/searx/tests/test_webapp.py +++ b/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '

youtubeSecond Test

', # noqa + '

youtubeSecond Test

', # noqa result.data ) self.assertIn( From e7e298153678fc0e77e24a3ae3b333b1230136b2 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sun, 28 Dec 2014 22:57:59 +0100 Subject: [PATCH 30/62] Digg + Twitter corrections Digg engines, with thumbnails Add pubdate for twitter --- searx/engines/digg.py | 66 ++++++++++++++++++++++++++++++++++++++++ searx/engines/twitter.py | 22 ++++++++++---- searx/settings.yml | 4 +++ 3 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 searx/engines/digg.py diff --git a/searx/engines/digg.py b/searx/engines/digg.py new file mode 100644 index 000000000..4ebfe58c1 --- /dev/null +++ b/searx/engines/digg.py @@ -0,0 +1,66 @@ +## Digg (News, Social media) +# +# @website https://digg.com/ +# @provide-api no +# +# @using-api no +# @results HTML (using search portal) +# @stable no (HTML can change) +# @parse url, title, content, publishedDate, thumbnail + +from urllib import quote_plus +from json import loads +from lxml import html +from cgi import escape +from dateutil import parser + +# engine dependent config +categories = ['news', 'social media'] +paging = True + +# search-url +base_url = 'https://digg.com/' +search_url = base_url+'api/search/{query}.json?position={position}&format=html' + +# specific xpath variables +results_xpath = '//article' +link_xpath = './/small[@class="time"]//a' +title_xpath = './/h2//a//text()' +content_xpath = './/p//text()' +pubdate_xpath = './/time' + + +# do search-request +def request(query, params): + offset = (params['pageno'] - 1) * 10 + params['url'] = search_url.format(position=offset, + query=quote_plus(query)) + return params + + +# get response from search-request +def response(resp): + results = [] + + search_result = loads(resp.text) + + dom = html.fromstring(search_result['html']) + + # parse results + for result in dom.xpath(results_xpath): + url = result.attrib.get('data-contenturl') + thumbnail = result.xpath('.//img')[0].attrib.get('src') + title = ''.join(result.xpath(title_xpath)) + content = escape(''.join(result.xpath(content_xpath))) + publishedDate = parser.parse(result.xpath(pubdate_xpath)[0].attrib.get('datetime')) + + # append result + results.append({'url': url, + 'title': title, + 'content': content, + 'template': 'videos.html', + 'publishedDate': publishedDate, + 'thumbnail': thumbnail}) + + # return results + return results diff --git a/searx/engines/twitter.py b/searx/engines/twitter.py index 0689150c8..5a7046c83 100644 --- a/searx/engines/twitter.py +++ b/searx/engines/twitter.py @@ -1,6 +1,6 @@ ## Twitter (Social media) # -# @website https://www.bing.com/news +# @website https://twitter.com/ # @provide-api yes (https://dev.twitter.com/docs/using-search) # # @using-api no @@ -14,6 +14,7 @@ from urlparse import urljoin from urllib import urlencode from lxml import html from cgi import escape +from datetime import datetime # engine dependent config categories = ['social media'] @@ -28,6 +29,7 @@ results_xpath = '//li[@data-item-type="tweet"]' link_xpath = './/small[@class="time"]//a' title_xpath = './/span[@class="username js-action-profile-name"]//text()' content_xpath = './/p[@class="js-tweet-text tweet-text"]//text()' +timestamp_xpath = './/span[contains(@class,"_timestamp")]' # do search-request @@ -53,11 +55,19 @@ def response(resp): url = urljoin(base_url, link.attrib.get('href')) title = ''.join(tweet.xpath(title_xpath)) content = escape(''.join(tweet.xpath(content_xpath))) - - # append result - results.append({'url': url, - 'title': title, - 'content': content}) + pubdate = tweet.xpath(timestamp_xpath) + if len(pubdate) > 0: + publishedDate = datetime.fromtimestamp(float(pubdate[0].attrib.get('data-time')), None) + # append result + results.append({'url': url, + 'title': title, + 'content': content, + 'publishedDate': publishedDate}) + else: + # append result + results.append({'url': url, + 'title': title, + 'content': content}) # return results return results diff --git a/searx/settings.yml b/searx/settings.yml index 260b56ca8..584ef6d90 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -44,6 +44,10 @@ engines: - name : ddg definitions engine : duckduckgo_definitions shortcut : ddd + + - name : digg + engine : digg + shortcut : dg - name : wikidata engine : wikidata From 576fdef440e835592f9f5c8dc25398e343687c7a Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sun, 28 Dec 2014 23:23:31 +0100 Subject: [PATCH 31/62] Google Play Store Add Google play store apps, movies and music (sound -> gps) --- searx/settings.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/searx/settings.yml b/searx/settings.yml index 584ef6d90..00c12d1ca 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -103,6 +103,33 @@ engines: engine : google_news shortcut : gon + - name : google play apps + engine : xpath + search_url : https://play.google.com/store/search?q={query}&c=apps + url_xpath : //a[@class="title"]/@href + title_xpath : //a[@class="title"] + content_xpath : //a[@class="subtitle"] + categories : files + shortcut : gpa + + - name : google play movies + engine : xpath + search_url : https://play.google.com/store/search?q={query}&c=movies + url_xpath : //a[@class="title"]/@href + title_xpath : //a[@class="title"] + content_xpath : //a[@class="subtitle"] + categories : videos + shortcut : gpm + + - name : google play music + engine : xpath + search_url : https://play.google.com/store/search?q={query}&c=music + url_xpath : //a[@class="title"]/@href + title_xpath : //a[@class="title"] + content_xpath : //a[@class="subtitle"] + categories : music + shortcut : gps + - name : openstreetmap engine : openstreetmap shortcut : osm From 5d977056f7aa216eae09a22c3baaff73546f6ff1 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 29 Dec 2014 21:31:04 +0100 Subject: [PATCH 32/62] Flake8 and Twitter corrections Lots of Flake8 corrections Maybe we should change the rule to allow lines of 120 chars. It seems more usable. Big twitter correction : now it outputs the words in right order... --- searx/engines/500px.py | 4 ++-- searx/engines/__init__.py | 4 ++-- searx/engines/digg.py | 3 ++- searx/engines/flickr-noapi.py | 12 +++++++++--- searx/engines/flickr.py | 31 +++++++++++++++++++------------ searx/engines/kickass.py | 5 +++-- searx/engines/searchcode_code.py | 18 +++++++++--------- searx/engines/searchcode_doc.py | 15 +++++++++++---- searx/engines/subtitleseeker.py | 8 ++++++-- searx/engines/twitter.py | 7 ++++--- searx/https_rewrite.py | 1 - searx/search.py | 14 ++++++++++---- searx/utils.py | 5 +++-- 13 files changed, 80 insertions(+), 47 deletions(-) diff --git a/searx/engines/500px.py b/searx/engines/500px.py index 5d53af32c..3b95619a1 100644 --- a/searx/engines/500px.py +++ b/searx/engines/500px.py @@ -35,9 +35,9 @@ def request(query, params): # get response from search-request def response(resp): results = [] - + dom = html.fromstring(resp.text) - + # parse results for result in dom.xpath('//div[@class="photo"]'): link = result.xpath('.//a')[0] diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index d42339af8..9bc5cdfd4 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -81,7 +81,7 @@ def load_engine(engine_data): if engine_attr.startswith('_'): continue if getattr(engine, engine_attr) is None: - print('[E] Engine config error: Missing attribute "{0}.{1}"'\ + print('[E] Engine config error: Missing attribute "{0}.{1}"' .format(engine.name, engine_attr)) sys.exit(1) @@ -102,7 +102,7 @@ def load_engine(engine_data): if engine.shortcut: # TODO check duplications if engine.shortcut in engine_shortcuts: - print('[E] Engine config error: ambigious shortcut: {0}'\ + print('[E] Engine config error: ambigious shortcut: {0}' .format(engine.shortcut)) sys.exit(1) engine_shortcuts[engine.shortcut] = engine.name diff --git a/searx/engines/digg.py b/searx/engines/digg.py index 4ebfe58c1..241234fdb 100644 --- a/searx/engines/digg.py +++ b/searx/engines/digg.py @@ -52,7 +52,8 @@ def response(resp): thumbnail = result.xpath('.//img')[0].attrib.get('src') title = ''.join(result.xpath(title_xpath)) content = escape(''.join(result.xpath(content_xpath))) - publishedDate = parser.parse(result.xpath(pubdate_xpath)[0].attrib.get('datetime')) + pubdate = result.xpath(pubdate_xpath)[0].attrib.get('datetime') + publishedDate = parser.parse(pubdate) # append result results.append({'url': url, diff --git a/searx/engines/flickr-noapi.py b/searx/engines/flickr-noapi.py index 522503b53..f90903647 100644 --- a/searx/engines/flickr-noapi.py +++ b/searx/engines/flickr-noapi.py @@ -53,7 +53,8 @@ def response(resp): for photo in photos: - # In paged configuration, the first pages' photos are represented by a None object + # In paged configuration, the first pages' photos + # are represented by a None object if photo is None: continue @@ -74,10 +75,15 @@ def response(resp): title = photo['title'] - content = '' + photo['owner']['username'] + '
' + content = '' +\ + photo['owner']['username'] +\ + '
' if 'description' in photo: - content = content + '' + photo['description'] + '' + content = content +\ + '' +\ + photo['description'] +\ + '' # append result results.append({'url': url, diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py index 2fa5ed7ec..4dadd80a6 100644 --- a/searx/engines/flickr.py +++ b/searx/engines/flickr.py @@ -1,10 +1,10 @@ #!/usr/bin/env python ## Flickr (Images) -# +# # @website https://www.flickr.com -# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) -# +# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) +# # @using-api yes # @results JSON # @stable yes @@ -18,16 +18,20 @@ categories = ['images'] nb_per_page = 15 paging = True -api_key= None +api_key = None -url = 'https://api.flickr.com/services/rest/?method=flickr.photos.search&api_key={api_key}&{text}&sort=relevance&extras=description%2C+owner_name%2C+url_o%2C+url_z&per_page={nb_per_page}&format=json&nojsoncallback=1&page={page}' +url = 'https://api.flickr.com/services/rest/?method=flickr.photos.search' +\ + '&api_key={api_key}&{text}&sort=relevance' +\ + '&extras=description%2C+owner_name%2C+url_o%2C+url_z' +\ + '&per_page={nb_per_page}&format=json&nojsoncallback=1&page={page}' photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' paging = True + def build_flickr_url(user_id, photo_id): - return photo_url.format(userid=user_id,photoid=photo_id) + return photo_url.format(userid=user_id, photoid=photo_id) def request(query, params): @@ -40,7 +44,7 @@ def request(query, params): def response(resp): results = [] - + search_results = loads(resp.text) # return empty array if there are no results @@ -64,11 +68,14 @@ def response(resp): url = build_flickr_url(photo['owner'], photo['id']) title = photo['title'] - - content = ''+ photo['ownername'] +'
' - - content = content + '' + photo['description']['_content'] + '' - + + content = '' +\ + photo['ownername'] +\ + '
' +\ + '' +\ + photo['description']['_content'] +\ + '' + # append result results.append({'url': url, 'title': title, diff --git a/searx/engines/kickass.py b/searx/engines/kickass.py index f1fcd9e1a..16e9d6de6 100644 --- a/searx/engines/kickass.py +++ b/searx/engines/kickass.py @@ -24,7 +24,7 @@ search_url = url + 'search/{search_term}/{pageno}/' # specific xpath variables magnet_xpath = './/a[@title="Torrent magnet link"]' -#content_xpath = './/font[@class="detDesc"]//text()' +content_xpath = './/span[@class="font11px lightgrey block"]' # do search-request @@ -56,7 +56,8 @@ def response(resp): link = result.xpath('.//a[@class="cellMainLink"]')[0] href = urljoin(url, link.attrib['href']) title = ' '.join(link.xpath('.//text()')) - content = escape(html.tostring(result.xpath('.//span[@class="font11px lightgrey block"]')[0], method="text")) + content = escape(html.tostring(result.xpath(content_xpath)[0], + method="text")) seed = result.xpath('.//td[contains(@class, "green")]/text()')[0] leech = result.xpath('.//td[contains(@class, "red")]/text()')[0] diff --git a/searx/engines/searchcode_code.py b/searx/engines/searchcode_code.py index 2ba0e52f1..0f98352c1 100644 --- a/searx/engines/searchcode_code.py +++ b/searx/engines/searchcode_code.py @@ -11,7 +11,6 @@ from urllib import urlencode from json import loads import cgi -import re # engine dependent config categories = ['it'] @@ -33,7 +32,7 @@ def request(query, params): # get response from search-request def response(resp): results = [] - + search_results = loads(resp.text) # parse results @@ -41,21 +40,22 @@ def response(resp): href = result['url'] title = "" + result['name'] + " - " + result['filename'] content = result['repo'] + "
" - + lines = dict() for line, code in result['lines'].items(): lines[int(line)] = code content = content + '
'
         for line, code in sorted(lines.items()):
-            content = content + '"
-            
+
         content = content + "
' 
-            content = content + str(line) + '' 
-            # Replace every two spaces with ' &nbps;' to keep formatting while allowing the browser to break the line if necessary
-            content = content + cgi.escape(code).replace('\t', '    ').replace('  ', '  ').replace('  ', '  ') 
+            content = content + '
'
+            content = content + str(line) + ''
+            # Replace every two spaces with ' &nbps;' to keep formatting
+            # while allowing the browser to break the line if necessary
+            content = content + cgi.escape(code).replace('\t', '    ').replace('  ', '  ').replace('  ', '  ')
             content = content + "
" - + # append result results.append({'url': href, 'title': title, diff --git a/searx/engines/searchcode_doc.py b/searx/engines/searchcode_doc.py index e07cbeab9..b5b7159be 100644 --- a/searx/engines/searchcode_doc.py +++ b/searx/engines/searchcode_doc.py @@ -31,15 +31,22 @@ def request(query, params): # get response from search-request def response(resp): results = [] - + search_results = loads(resp.text) # parse results for result in search_results['results']: href = result['url'] - title = "[" + result['type'] + "] " + result['namespace'] + " " + result['name'] - content = '[' + result['type'] + "] " + result['name'] + " " + result['synopsis'] + "
" + result['description'] - + title = "[" + result['type'] + "] " +\ + result['namespace'] +\ + " " + result['name'] + content = '[' +\ + result['type'] + "] " +\ + result['name'] + " " +\ + result['synopsis'] +\ + "
" +\ + result['description'] + # append result results.append({'url': href, 'title': title, diff --git a/searx/engines/subtitleseeker.py b/searx/engines/subtitleseeker.py index 2f1636f59..c413dcf26 100644 --- a/searx/engines/subtitleseeker.py +++ b/searx/engines/subtitleseeker.py @@ -60,10 +60,14 @@ def response(resp): content = result.xpath('.//div[contains(@class,"red")]//text()')[0] content = content + " - " - content = content + html.tostring(result.xpath('.//div[contains(@class,"grey-web")]')[0], method='text') + text = result.xpath('.//div[contains(@class,"grey-web")]')[0] + content = content + html.tostring(text, method='text') if result.xpath(".//span") != []: - content = content + " - (" + result.xpath(".//span//text()")[0].strip() + ")" + content = content +\ + " - (" +\ + result.xpath(".//span//text()")[0].strip() +\ + ")" # append result results.append({'url': href, diff --git a/searx/engines/twitter.py b/searx/engines/twitter.py index 5a7046c83..bd9a8c2fc 100644 --- a/searx/engines/twitter.py +++ b/searx/engines/twitter.py @@ -28,7 +28,7 @@ search_url = base_url+'search?' results_xpath = '//li[@data-item-type="tweet"]' link_xpath = './/small[@class="time"]//a' title_xpath = './/span[@class="username js-action-profile-name"]//text()' -content_xpath = './/p[@class="js-tweet-text tweet-text"]//text()' +content_xpath = './/p[@class="js-tweet-text tweet-text"]' timestamp_xpath = './/span[contains(@class,"_timestamp")]' @@ -54,10 +54,11 @@ def response(resp): link = tweet.xpath(link_xpath)[0] url = urljoin(base_url, link.attrib.get('href')) title = ''.join(tweet.xpath(title_xpath)) - content = escape(''.join(tweet.xpath(content_xpath))) + content = escape(html.tostring(tweet.xpath(content_xpath)[0], method='text', encoding='UTF-8').decode("utf-8")) pubdate = tweet.xpath(timestamp_xpath) if len(pubdate) > 0: - publishedDate = datetime.fromtimestamp(float(pubdate[0].attrib.get('data-time')), None) + timestamp = float(pubdate[0].attrib.get('data-time')) + publishedDate = datetime.fromtimestamp(timestamp, None) # append result results.append({'url': url, 'title': title, diff --git a/searx/https_rewrite.py b/searx/https_rewrite.py index 408474a44..d873b406d 100644 --- a/searx/https_rewrite.py +++ b/searx/https_rewrite.py @@ -154,7 +154,6 @@ def load_https_rules(rules_path): print(' * {n} https-rules loaded'.format(n=len(https_rules))) - def https_url_rewrite(result): skip_https_rewrite = False # check if HTTPS rewrite is possible diff --git a/searx/search.py b/searx/search.py index d1d03805f..fbbf3fe41 100644 --- a/searx/search.py +++ b/searx/search.py @@ -69,11 +69,16 @@ def threaded_requests(requests): print('engine timeout: {0}'.format(th._engine_name)) - # get default reqest parameter def default_request_params(): return { - 'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}, 'verify': True} + 'method': 'GET', + 'headers': {}, + 'data': {}, + 'url': '', + 'cookies': {}, + 'verify': True + } # create a callback wrapper for the search engine results @@ -487,14 +492,15 @@ class Search(object): continue # append request to list - requests.append((req, request_params['url'], request_args, selected_engine['name'])) + requests.append((req, request_params['url'], + request_args, + selected_engine['name'])) if not requests: return results, suggestions, answers, infoboxes # send all search-request threaded_requests(requests) - while not results_queue.empty(): engine_name, engine_results = results_queue.get_nowait() diff --git a/searx/utils.py b/searx/utils.py index dc831ef5f..b725a8b95 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -30,8 +30,9 @@ def gen_useragent(): def searx_useragent(): - return 'searx/{searx_version} {suffix}'.format(searx_version=VERSION_STRING, - suffix=settings['server'].get('useragent_suffix', '')) + return 'searx/{searx_version} {suffix}'.format( + searx_version=VERSION_STRING, + suffix=settings['server'].get('useragent_suffix', '')) def highlight_content(content, query): From 1408859b4b0ca9efc590ca0e112c6bc0cb984e2c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 14:13:56 +0100 Subject: [PATCH 33/62] [fix] ignore scripts/styles in html_to_text --- searx/utils.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/searx/utils.py b/searx/utils.py index b725a8b95..8a3f35531 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -23,6 +23,9 @@ ua_os = ('Windows NT 6.3; WOW64', ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}" +blocked_tags = ('script', + 'style') + def gen_useragent(): # TODO @@ -67,11 +70,29 @@ class HTMLTextExtractor(HTMLParser): def __init__(self): HTMLParser.__init__(self) self.result = [] + self.tags = [] + + def handle_starttag(self, tag, attrs): + print tag + self.tags.append(tag) + + def handle_endtag(self, tag): + print tag,tag + if tag != self.tags[-1]: + raise Exception("invalid html") + self.tags.pop() + + def is_valid_tag(self): + return not self.tags or self.tags[-1] not in blocked_tags def handle_data(self, d): + if not self.is_valid_tag(): + return self.result.append(d) def handle_charref(self, number): + if not self.is_valid_tag(): + return if number[0] in (u'x', u'X'): codepoint = int(number[1:], 16) else: @@ -79,6 +100,8 @@ class HTMLTextExtractor(HTMLParser): self.result.append(unichr(codepoint)) def handle_entityref(self, name): + if not self.is_valid_tag(): + return # codepoint = htmlentitydefs.name2codepoint[name] # self.result.append(unichr(codepoint)) self.result.append(name) From 2181c4384ed4d41c795799a345974269327bf641 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 14:14:56 +0100 Subject: [PATCH 34/62] [mod] purge local html_to_text --- searx/engines/duckduckgo_definitions.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/searx/engines/duckduckgo_definitions.py b/searx/engines/duckduckgo_definitions.py index 8f81d2c8e..b66d6c0f2 100644 --- a/searx/engines/duckduckgo_definitions.py +++ b/searx/engines/duckduckgo_definitions.py @@ -1,6 +1,7 @@ import json from urllib import urlencode from lxml import html +from searx.utils import html_to_text from searx.engines.xpath import extract_text url = 'https://api.duckduckgo.com/'\ @@ -17,11 +18,6 @@ def result_to_text(url, text, htmlResult): return text -def html_to_text(htmlFragment): - dom = html.fromstring(htmlFragment) - return extract_text(dom) - - def request(query, params): # TODO add kl={locale} params['url'] = url.format(query=urlencode({'q': query})) From 9f12605f7ebc9ca5575fc4ee9900e0e821366c4d Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 17:48:12 +0100 Subject: [PATCH 35/62] [enh] themes static content refactor --- .../{ => themes}/courgette/css/style.css | 0 .../courgette/img/bg-body-index.jpg | Bin .../{ => themes}/courgette/img/favicon.png | Bin .../courgette/img/github_ribbon.png | Bin .../courgette/img/icons/icon_dailymotion.ico | Bin .../courgette/img/icons/icon_deviantart.ico | Bin .../courgette/img/icons/icon_github.ico | Bin .../courgette/img/icons/icon_kickass.ico | Bin .../courgette/img/icons/icon_soundcloud.ico | Bin .../img/icons/icon_stackoverflow.ico | Bin .../courgette/img/icons/icon_twitter.ico | Bin .../courgette/img/icons/icon_vimeo.ico | Bin .../courgette/img/icons/icon_wikipedia.ico | Bin .../courgette/img/icons/icon_youtube.ico | Bin .../courgette/img/preference-icon.png | Bin .../courgette/img/search-icon.png | Bin .../courgette/img/searx-mobile.png | Bin .../{ => themes}/courgette/img/searx.png | Bin .../{ => themes}/courgette/img/searx_logo.svg | 0 .../js/mootools-autocompleter-1.1.2-min.js | 0 .../courgette/js/mootools-core-1.4.5-min.js | 0 .../static/{ => themes}/courgette/js/searx.js | 0 .../static/{ => themes}/default/css/style.css | 0 .../{ => themes}/default/img/favicon.png | Bin .../default/img/github_ribbon.png | Bin .../default/img/icons/icon_dailymotion.ico | Bin .../default/img/icons/icon_deviantart.ico | Bin .../default/img/icons/icon_github.ico | Bin .../default/img/icons/icon_kickass.ico | Bin .../default/img/icons/icon_soundcloud.ico | Bin .../default/img/icons/icon_stackoverflow.ico | Bin .../default/img/icons/icon_twitter.ico | Bin .../default/img/icons/icon_vimeo.ico | Bin .../default/img/icons/icon_wikipedia.ico | Bin .../default/img/icons/icon_youtube.ico | Bin .../default/img/preference-icon.png | Bin .../{ => themes}/default/img/search-icon.png | Bin .../static/{ => themes}/default/img/searx.png | Bin .../{ => themes}/default/img/searx_logo.svg | 0 .../js/mootools-autocompleter-1.1.2-min.js | 0 .../default/js/mootools-core-1.4.5-min.js | 0 searx/static/{ => themes}/default/js/searx.js | 0 .../default/less/autocompleter.less | 0 .../default/less/definitions.less | 0 .../{ => themes}/default/less/mixins.less | 0 .../{ => themes}/default/less/search.less | 0 .../{ => themes}/default/less/style.less | 0 searx/static/{ => themes}/oscar/.gitignore | 0 searx/static/{ => themes}/oscar/README.rst | 0 .../{ => themes}/oscar/css/bootstrap.min.css | 0 .../{ => themes}/oscar/css/leaflet.min.css | 0 .../{ => themes}/oscar/css/oscar.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin searx/static/{ => themes}/oscar/gruntfile.js | 0 .../static/{ => themes}/oscar/img/favicon.png | Bin .../{ => themes}/oscar/img/icons/README.md | 0 .../{ => themes}/oscar/img/icons/amazon.png | Bin .../oscar/img/icons/dailymotion.png | Bin .../oscar/img/icons/deviantart.png | Bin .../{ => themes}/oscar/img/icons/facebook.png | Bin .../{ => themes}/oscar/img/icons/flickr.png | Bin .../{ => themes}/oscar/img/icons/github.png | Bin .../{ => themes}/oscar/img/icons/kickass.png | Bin .../oscar/img/icons/openstreetmap.png | Bin .../{ => themes}/oscar/img/icons/photon.png | Bin .../oscar/img/icons/searchcode code.png | Bin .../oscar/img/icons/searchcode doc.png | Bin .../oscar/img/icons/soundcloud.png | Bin .../oscar/img/icons/stackoverflow.png | Bin .../{ => themes}/oscar/img/icons/twitter.png | Bin .../{ => themes}/oscar/img/icons/vimeo.png | Bin .../oscar/img/icons/wikipedia.png | Bin .../{ => themes}/oscar/img/icons/youtube.png | Bin .../static/{ => themes}/oscar/img/loader.gif | Bin .../{ => themes}/oscar/img/map/layers-2x.png | Bin .../{ => themes}/oscar/img/map/layers.png | Bin .../oscar/img/map/marker-icon-2x-green.png | Bin .../oscar/img/map/marker-icon-2x-orange.png | Bin .../oscar/img/map/marker-icon-2x-red.png | Bin .../oscar/img/map/marker-icon-2x.png | Bin .../oscar/img/map/marker-icon-green.png | Bin .../oscar/img/map/marker-icon-orange.png | Bin .../oscar/img/map/marker-icon-red.png | Bin .../oscar/img/map/marker-icon.png | Bin .../oscar/img/map/marker-shadow.png | Bin .../{ => themes}/oscar/img/searx_logo.png | Bin .../{ => themes}/oscar/js/bootstrap.min.js | 0 .../{ => themes}/oscar/js/html5shiv.min.js | 0 .../oscar/js/jquery-1.11.1.min.js | 0 .../oscar/js/leaflet-0.7.3.min.js | 0 .../oscar/js/require-2.1.15.min.js | 0 .../{ => themes}/oscar/js/respond.min.js | 0 .../static/{ => themes}/oscar/js/searx.min.js | 0 .../oscar/js/searx_src/00_requirejs_config.js | 0 .../oscar/js/searx_src/autocompleter.js | 0 .../oscar/js/searx_src/element_modifiers.js | 0 .../oscar/js/searx_src/leaflet_map.js | 0 .../oscar/js/typeahead.bundle.min.js | 0 .../oscar/less/bootstrap/.csscomb.json | 0 .../oscar/less/bootstrap/.csslintrc | 0 .../oscar/less/bootstrap/alerts.less | 0 .../oscar/less/bootstrap/badges.less | 0 .../oscar/less/bootstrap/bootstrap.less | 0 .../oscar/less/bootstrap/breadcrumbs.less | 0 .../oscar/less/bootstrap/button-groups.less | 0 .../oscar/less/bootstrap/buttons.less | 0 .../oscar/less/bootstrap/carousel.less | 0 .../oscar/less/bootstrap/close.less | 0 .../oscar/less/bootstrap/code.less | 0 .../less/bootstrap/component-animations.less | 0 .../oscar/less/bootstrap/dropdowns.less | 0 .../oscar/less/bootstrap/forms.less | 0 .../oscar/less/bootstrap/glyphicons.less | 0 .../oscar/less/bootstrap/grid.less | 0 .../oscar/less/bootstrap/input-groups.less | 0 .../oscar/less/bootstrap/jumbotron.less | 0 .../oscar/less/bootstrap/labels.less | 0 .../oscar/less/bootstrap/list-group.less | 0 .../oscar/less/bootstrap/media.less | 0 .../oscar/less/bootstrap/mixins.less | 0 .../oscar/less/bootstrap/mixins/alerts.less | 0 .../bootstrap/mixins/background-variant.less | 0 .../less/bootstrap/mixins/border-radius.less | 0 .../oscar/less/bootstrap/mixins/buttons.less | 0 .../less/bootstrap/mixins/center-block.less | 0 .../oscar/less/bootstrap/mixins/clearfix.less | 0 .../oscar/less/bootstrap/mixins/forms.less | 0 .../less/bootstrap/mixins/gradients.less | 0 .../less/bootstrap/mixins/grid-framework.less | 0 .../oscar/less/bootstrap/mixins/grid.less | 0 .../less/bootstrap/mixins/hide-text.less | 0 .../oscar/less/bootstrap/mixins/image.less | 0 .../oscar/less/bootstrap/mixins/labels.less | 0 .../less/bootstrap/mixins/list-group.less | 0 .../less/bootstrap/mixins/nav-divider.less | 0 .../bootstrap/mixins/nav-vertical-align.less | 0 .../oscar/less/bootstrap/mixins/opacity.less | 0 .../less/bootstrap/mixins/pagination.less | 0 .../oscar/less/bootstrap/mixins/panels.less | 0 .../less/bootstrap/mixins/progress-bar.less | 0 .../less/bootstrap/mixins/reset-filter.less | 0 .../oscar/less/bootstrap/mixins/resize.less | 0 .../mixins/responsive-visibility.less | 0 .../oscar/less/bootstrap/mixins/size.less | 0 .../less/bootstrap/mixins/tab-focus.less | 0 .../less/bootstrap/mixins/table-row.less | 0 .../less/bootstrap/mixins/text-emphasis.less | 0 .../less/bootstrap/mixins/text-overflow.less | 0 .../bootstrap/mixins/vendor-prefixes.less | 0 .../oscar/less/bootstrap/modals.less | 0 .../oscar/less/bootstrap/navbar.less | 0 .../oscar/less/bootstrap/navs.less | 0 .../oscar/less/bootstrap/normalize.less | 0 .../oscar/less/bootstrap/pager.less | 0 .../oscar/less/bootstrap/pagination.less | 0 .../oscar/less/bootstrap/panels.less | 0 .../oscar/less/bootstrap/popovers.less | 0 .../oscar/less/bootstrap/print.less | 0 .../oscar/less/bootstrap/progress-bars.less | 0 .../less/bootstrap/responsive-embed.less | 0 .../less/bootstrap/responsive-utilities.less | 0 .../oscar/less/bootstrap/scaffolding.less | 0 .../oscar/less/bootstrap/tables.less | 0 .../oscar/less/bootstrap/theme.less | 0 .../oscar/less/bootstrap/thumbnails.less | 0 .../oscar/less/bootstrap/tooltip.less | 0 .../oscar/less/bootstrap/type.less | 0 .../oscar/less/bootstrap/typeahead.less | 0 .../oscar/less/bootstrap/utilities.less | 0 .../oscar/less/bootstrap/variables.less | 0 .../oscar/less/bootstrap/wells.less | 0 .../oscar/less/oscar/checkbox.less | 0 .../{ => themes}/oscar/less/oscar/cursor.less | 0 .../{ => themes}/oscar/less/oscar/footer.less | 0 .../oscar/less/oscar/infobox.less | 0 .../{ => themes}/oscar/less/oscar/oscar.less | 0 .../oscar/less/oscar/results.less | 0 .../{ => themes}/oscar/less/oscar/search.less | 0 searx/static/{ => themes}/oscar/package.json | 0 searx/utils.py | 18 +++++++++++------- searx/webapp.py | 11 ++++++++--- 184 files changed, 19 insertions(+), 10 deletions(-) rename searx/static/{ => themes}/courgette/css/style.css (100%) rename searx/static/{ => themes}/courgette/img/bg-body-index.jpg (100%) rename searx/static/{ => themes}/courgette/img/favicon.png (100%) rename searx/static/{ => themes}/courgette/img/github_ribbon.png (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_dailymotion.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_deviantart.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_github.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_kickass.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_soundcloud.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_stackoverflow.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_twitter.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_vimeo.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_wikipedia.ico (100%) rename searx/static/{ => themes}/courgette/img/icons/icon_youtube.ico (100%) rename searx/static/{ => themes}/courgette/img/preference-icon.png (100%) rename searx/static/{ => themes}/courgette/img/search-icon.png (100%) rename searx/static/{ => themes}/courgette/img/searx-mobile.png (100%) rename searx/static/{ => themes}/courgette/img/searx.png (100%) rename searx/static/{ => themes}/courgette/img/searx_logo.svg (100%) rename searx/static/{ => themes}/courgette/js/mootools-autocompleter-1.1.2-min.js (100%) rename searx/static/{ => themes}/courgette/js/mootools-core-1.4.5-min.js (100%) rename searx/static/{ => themes}/courgette/js/searx.js (100%) rename searx/static/{ => themes}/default/css/style.css (100%) rename searx/static/{ => themes}/default/img/favicon.png (100%) rename searx/static/{ => themes}/default/img/github_ribbon.png (100%) rename searx/static/{ => themes}/default/img/icons/icon_dailymotion.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_deviantart.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_github.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_kickass.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_soundcloud.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_stackoverflow.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_twitter.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_vimeo.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_wikipedia.ico (100%) rename searx/static/{ => themes}/default/img/icons/icon_youtube.ico (100%) rename searx/static/{ => themes}/default/img/preference-icon.png (100%) rename searx/static/{ => themes}/default/img/search-icon.png (100%) rename searx/static/{ => themes}/default/img/searx.png (100%) rename searx/static/{ => themes}/default/img/searx_logo.svg (100%) rename searx/static/{ => themes}/default/js/mootools-autocompleter-1.1.2-min.js (100%) rename searx/static/{ => themes}/default/js/mootools-core-1.4.5-min.js (100%) rename searx/static/{ => themes}/default/js/searx.js (100%) rename searx/static/{ => themes}/default/less/autocompleter.less (100%) rename searx/static/{ => themes}/default/less/definitions.less (100%) rename searx/static/{ => themes}/default/less/mixins.less (100%) rename searx/static/{ => themes}/default/less/search.less (100%) rename searx/static/{ => themes}/default/less/style.less (100%) rename searx/static/{ => themes}/oscar/.gitignore (100%) rename searx/static/{ => themes}/oscar/README.rst (100%) rename searx/static/{ => themes}/oscar/css/bootstrap.min.css (100%) rename searx/static/{ => themes}/oscar/css/leaflet.min.css (100%) rename searx/static/{ => themes}/oscar/css/oscar.min.css (100%) rename searx/static/{ => themes}/oscar/fonts/glyphicons-halflings-regular.eot (100%) rename searx/static/{ => themes}/oscar/fonts/glyphicons-halflings-regular.svg (100%) rename searx/static/{ => themes}/oscar/fonts/glyphicons-halflings-regular.ttf (100%) rename searx/static/{ => themes}/oscar/fonts/glyphicons-halflings-regular.woff (100%) rename searx/static/{ => themes}/oscar/gruntfile.js (100%) rename searx/static/{ => themes}/oscar/img/favicon.png (100%) rename searx/static/{ => themes}/oscar/img/icons/README.md (100%) rename searx/static/{ => themes}/oscar/img/icons/amazon.png (100%) rename searx/static/{ => themes}/oscar/img/icons/dailymotion.png (100%) rename searx/static/{ => themes}/oscar/img/icons/deviantart.png (100%) rename searx/static/{ => themes}/oscar/img/icons/facebook.png (100%) rename searx/static/{ => themes}/oscar/img/icons/flickr.png (100%) rename searx/static/{ => themes}/oscar/img/icons/github.png (100%) rename searx/static/{ => themes}/oscar/img/icons/kickass.png (100%) rename searx/static/{ => themes}/oscar/img/icons/openstreetmap.png (100%) rename searx/static/{ => themes}/oscar/img/icons/photon.png (100%) rename searx/static/{ => themes}/oscar/img/icons/searchcode code.png (100%) rename searx/static/{ => themes}/oscar/img/icons/searchcode doc.png (100%) rename searx/static/{ => themes}/oscar/img/icons/soundcloud.png (100%) rename searx/static/{ => themes}/oscar/img/icons/stackoverflow.png (100%) rename searx/static/{ => themes}/oscar/img/icons/twitter.png (100%) rename searx/static/{ => themes}/oscar/img/icons/vimeo.png (100%) rename searx/static/{ => themes}/oscar/img/icons/wikipedia.png (100%) rename searx/static/{ => themes}/oscar/img/icons/youtube.png (100%) rename searx/static/{ => themes}/oscar/img/loader.gif (100%) rename searx/static/{ => themes}/oscar/img/map/layers-2x.png (100%) rename searx/static/{ => themes}/oscar/img/map/layers.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon-2x-green.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon-2x-orange.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon-2x-red.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon-2x.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon-green.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon-orange.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon-red.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-icon.png (100%) rename searx/static/{ => themes}/oscar/img/map/marker-shadow.png (100%) rename searx/static/{ => themes}/oscar/img/searx_logo.png (100%) rename searx/static/{ => themes}/oscar/js/bootstrap.min.js (100%) rename searx/static/{ => themes}/oscar/js/html5shiv.min.js (100%) rename searx/static/{ => themes}/oscar/js/jquery-1.11.1.min.js (100%) rename searx/static/{ => themes}/oscar/js/leaflet-0.7.3.min.js (100%) rename searx/static/{ => themes}/oscar/js/require-2.1.15.min.js (100%) rename searx/static/{ => themes}/oscar/js/respond.min.js (100%) rename searx/static/{ => themes}/oscar/js/searx.min.js (100%) rename searx/static/{ => themes}/oscar/js/searx_src/00_requirejs_config.js (100%) rename searx/static/{ => themes}/oscar/js/searx_src/autocompleter.js (100%) rename searx/static/{ => themes}/oscar/js/searx_src/element_modifiers.js (100%) rename searx/static/{ => themes}/oscar/js/searx_src/leaflet_map.js (100%) rename searx/static/{ => themes}/oscar/js/typeahead.bundle.min.js (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/.csscomb.json (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/.csslintrc (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/alerts.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/badges.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/bootstrap.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/breadcrumbs.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/button-groups.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/buttons.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/carousel.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/close.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/code.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/component-animations.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/dropdowns.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/forms.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/glyphicons.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/grid.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/input-groups.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/jumbotron.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/labels.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/list-group.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/media.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/alerts.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/background-variant.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/border-radius.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/buttons.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/center-block.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/clearfix.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/forms.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/gradients.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/grid-framework.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/grid.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/hide-text.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/image.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/labels.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/list-group.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/nav-divider.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/nav-vertical-align.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/opacity.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/pagination.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/panels.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/progress-bar.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/reset-filter.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/resize.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/responsive-visibility.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/size.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/tab-focus.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/table-row.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/text-emphasis.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/text-overflow.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/mixins/vendor-prefixes.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/modals.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/navbar.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/navs.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/normalize.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/pager.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/pagination.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/panels.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/popovers.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/print.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/progress-bars.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/responsive-embed.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/responsive-utilities.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/scaffolding.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/tables.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/theme.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/thumbnails.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/tooltip.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/type.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/typeahead.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/utilities.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/variables.less (100%) rename searx/static/{ => themes}/oscar/less/bootstrap/wells.less (100%) rename searx/static/{ => themes}/oscar/less/oscar/checkbox.less (100%) rename searx/static/{ => themes}/oscar/less/oscar/cursor.less (100%) rename searx/static/{ => themes}/oscar/less/oscar/footer.less (100%) rename searx/static/{ => themes}/oscar/less/oscar/infobox.less (100%) rename searx/static/{ => themes}/oscar/less/oscar/oscar.less (100%) rename searx/static/{ => themes}/oscar/less/oscar/results.less (100%) rename searx/static/{ => themes}/oscar/less/oscar/search.less (100%) rename searx/static/{ => themes}/oscar/package.json (100%) diff --git a/searx/static/courgette/css/style.css b/searx/static/themes/courgette/css/style.css similarity index 100% rename from searx/static/courgette/css/style.css rename to searx/static/themes/courgette/css/style.css diff --git a/searx/static/courgette/img/bg-body-index.jpg b/searx/static/themes/courgette/img/bg-body-index.jpg similarity index 100% rename from searx/static/courgette/img/bg-body-index.jpg rename to searx/static/themes/courgette/img/bg-body-index.jpg diff --git a/searx/static/courgette/img/favicon.png b/searx/static/themes/courgette/img/favicon.png similarity index 100% rename from searx/static/courgette/img/favicon.png rename to searx/static/themes/courgette/img/favicon.png diff --git a/searx/static/courgette/img/github_ribbon.png b/searx/static/themes/courgette/img/github_ribbon.png similarity index 100% rename from searx/static/courgette/img/github_ribbon.png rename to searx/static/themes/courgette/img/github_ribbon.png diff --git a/searx/static/courgette/img/icons/icon_dailymotion.ico b/searx/static/themes/courgette/img/icons/icon_dailymotion.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_dailymotion.ico rename to searx/static/themes/courgette/img/icons/icon_dailymotion.ico diff --git a/searx/static/courgette/img/icons/icon_deviantart.ico b/searx/static/themes/courgette/img/icons/icon_deviantart.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_deviantart.ico rename to searx/static/themes/courgette/img/icons/icon_deviantart.ico diff --git a/searx/static/courgette/img/icons/icon_github.ico b/searx/static/themes/courgette/img/icons/icon_github.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_github.ico rename to searx/static/themes/courgette/img/icons/icon_github.ico diff --git a/searx/static/courgette/img/icons/icon_kickass.ico b/searx/static/themes/courgette/img/icons/icon_kickass.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_kickass.ico rename to searx/static/themes/courgette/img/icons/icon_kickass.ico diff --git a/searx/static/courgette/img/icons/icon_soundcloud.ico b/searx/static/themes/courgette/img/icons/icon_soundcloud.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_soundcloud.ico rename to searx/static/themes/courgette/img/icons/icon_soundcloud.ico diff --git a/searx/static/courgette/img/icons/icon_stackoverflow.ico b/searx/static/themes/courgette/img/icons/icon_stackoverflow.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_stackoverflow.ico rename to searx/static/themes/courgette/img/icons/icon_stackoverflow.ico diff --git a/searx/static/courgette/img/icons/icon_twitter.ico b/searx/static/themes/courgette/img/icons/icon_twitter.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_twitter.ico rename to searx/static/themes/courgette/img/icons/icon_twitter.ico diff --git a/searx/static/courgette/img/icons/icon_vimeo.ico b/searx/static/themes/courgette/img/icons/icon_vimeo.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_vimeo.ico rename to searx/static/themes/courgette/img/icons/icon_vimeo.ico diff --git a/searx/static/courgette/img/icons/icon_wikipedia.ico b/searx/static/themes/courgette/img/icons/icon_wikipedia.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_wikipedia.ico rename to searx/static/themes/courgette/img/icons/icon_wikipedia.ico diff --git a/searx/static/courgette/img/icons/icon_youtube.ico b/searx/static/themes/courgette/img/icons/icon_youtube.ico similarity index 100% rename from searx/static/courgette/img/icons/icon_youtube.ico rename to searx/static/themes/courgette/img/icons/icon_youtube.ico diff --git a/searx/static/courgette/img/preference-icon.png b/searx/static/themes/courgette/img/preference-icon.png similarity index 100% rename from searx/static/courgette/img/preference-icon.png rename to searx/static/themes/courgette/img/preference-icon.png diff --git a/searx/static/courgette/img/search-icon.png b/searx/static/themes/courgette/img/search-icon.png similarity index 100% rename from searx/static/courgette/img/search-icon.png rename to searx/static/themes/courgette/img/search-icon.png diff --git a/searx/static/courgette/img/searx-mobile.png b/searx/static/themes/courgette/img/searx-mobile.png similarity index 100% rename from searx/static/courgette/img/searx-mobile.png rename to searx/static/themes/courgette/img/searx-mobile.png diff --git a/searx/static/courgette/img/searx.png b/searx/static/themes/courgette/img/searx.png similarity index 100% rename from searx/static/courgette/img/searx.png rename to searx/static/themes/courgette/img/searx.png diff --git a/searx/static/courgette/img/searx_logo.svg b/searx/static/themes/courgette/img/searx_logo.svg similarity index 100% rename from searx/static/courgette/img/searx_logo.svg rename to searx/static/themes/courgette/img/searx_logo.svg diff --git a/searx/static/courgette/js/mootools-autocompleter-1.1.2-min.js b/searx/static/themes/courgette/js/mootools-autocompleter-1.1.2-min.js similarity index 100% rename from searx/static/courgette/js/mootools-autocompleter-1.1.2-min.js rename to searx/static/themes/courgette/js/mootools-autocompleter-1.1.2-min.js diff --git a/searx/static/courgette/js/mootools-core-1.4.5-min.js b/searx/static/themes/courgette/js/mootools-core-1.4.5-min.js similarity index 100% rename from searx/static/courgette/js/mootools-core-1.4.5-min.js rename to searx/static/themes/courgette/js/mootools-core-1.4.5-min.js diff --git a/searx/static/courgette/js/searx.js b/searx/static/themes/courgette/js/searx.js similarity index 100% rename from searx/static/courgette/js/searx.js rename to searx/static/themes/courgette/js/searx.js diff --git a/searx/static/default/css/style.css b/searx/static/themes/default/css/style.css similarity index 100% rename from searx/static/default/css/style.css rename to searx/static/themes/default/css/style.css diff --git a/searx/static/default/img/favicon.png b/searx/static/themes/default/img/favicon.png similarity index 100% rename from searx/static/default/img/favicon.png rename to searx/static/themes/default/img/favicon.png diff --git a/searx/static/default/img/github_ribbon.png b/searx/static/themes/default/img/github_ribbon.png similarity index 100% rename from searx/static/default/img/github_ribbon.png rename to searx/static/themes/default/img/github_ribbon.png diff --git a/searx/static/default/img/icons/icon_dailymotion.ico b/searx/static/themes/default/img/icons/icon_dailymotion.ico similarity index 100% rename from searx/static/default/img/icons/icon_dailymotion.ico rename to searx/static/themes/default/img/icons/icon_dailymotion.ico diff --git a/searx/static/default/img/icons/icon_deviantart.ico b/searx/static/themes/default/img/icons/icon_deviantart.ico similarity index 100% rename from searx/static/default/img/icons/icon_deviantart.ico rename to searx/static/themes/default/img/icons/icon_deviantart.ico diff --git a/searx/static/default/img/icons/icon_github.ico b/searx/static/themes/default/img/icons/icon_github.ico similarity index 100% rename from searx/static/default/img/icons/icon_github.ico rename to searx/static/themes/default/img/icons/icon_github.ico diff --git a/searx/static/default/img/icons/icon_kickass.ico b/searx/static/themes/default/img/icons/icon_kickass.ico similarity index 100% rename from searx/static/default/img/icons/icon_kickass.ico rename to searx/static/themes/default/img/icons/icon_kickass.ico diff --git a/searx/static/default/img/icons/icon_soundcloud.ico b/searx/static/themes/default/img/icons/icon_soundcloud.ico similarity index 100% rename from searx/static/default/img/icons/icon_soundcloud.ico rename to searx/static/themes/default/img/icons/icon_soundcloud.ico diff --git a/searx/static/default/img/icons/icon_stackoverflow.ico b/searx/static/themes/default/img/icons/icon_stackoverflow.ico similarity index 100% rename from searx/static/default/img/icons/icon_stackoverflow.ico rename to searx/static/themes/default/img/icons/icon_stackoverflow.ico diff --git a/searx/static/default/img/icons/icon_twitter.ico b/searx/static/themes/default/img/icons/icon_twitter.ico similarity index 100% rename from searx/static/default/img/icons/icon_twitter.ico rename to searx/static/themes/default/img/icons/icon_twitter.ico diff --git a/searx/static/default/img/icons/icon_vimeo.ico b/searx/static/themes/default/img/icons/icon_vimeo.ico similarity index 100% rename from searx/static/default/img/icons/icon_vimeo.ico rename to searx/static/themes/default/img/icons/icon_vimeo.ico diff --git a/searx/static/default/img/icons/icon_wikipedia.ico b/searx/static/themes/default/img/icons/icon_wikipedia.ico similarity index 100% rename from searx/static/default/img/icons/icon_wikipedia.ico rename to searx/static/themes/default/img/icons/icon_wikipedia.ico diff --git a/searx/static/default/img/icons/icon_youtube.ico b/searx/static/themes/default/img/icons/icon_youtube.ico similarity index 100% rename from searx/static/default/img/icons/icon_youtube.ico rename to searx/static/themes/default/img/icons/icon_youtube.ico diff --git a/searx/static/default/img/preference-icon.png b/searx/static/themes/default/img/preference-icon.png similarity index 100% rename from searx/static/default/img/preference-icon.png rename to searx/static/themes/default/img/preference-icon.png diff --git a/searx/static/default/img/search-icon.png b/searx/static/themes/default/img/search-icon.png similarity index 100% rename from searx/static/default/img/search-icon.png rename to searx/static/themes/default/img/search-icon.png diff --git a/searx/static/default/img/searx.png b/searx/static/themes/default/img/searx.png similarity index 100% rename from searx/static/default/img/searx.png rename to searx/static/themes/default/img/searx.png diff --git a/searx/static/default/img/searx_logo.svg b/searx/static/themes/default/img/searx_logo.svg similarity index 100% rename from searx/static/default/img/searx_logo.svg rename to searx/static/themes/default/img/searx_logo.svg diff --git a/searx/static/default/js/mootools-autocompleter-1.1.2-min.js b/searx/static/themes/default/js/mootools-autocompleter-1.1.2-min.js similarity index 100% rename from searx/static/default/js/mootools-autocompleter-1.1.2-min.js rename to searx/static/themes/default/js/mootools-autocompleter-1.1.2-min.js diff --git a/searx/static/default/js/mootools-core-1.4.5-min.js b/searx/static/themes/default/js/mootools-core-1.4.5-min.js similarity index 100% rename from searx/static/default/js/mootools-core-1.4.5-min.js rename to searx/static/themes/default/js/mootools-core-1.4.5-min.js diff --git a/searx/static/default/js/searx.js b/searx/static/themes/default/js/searx.js similarity index 100% rename from searx/static/default/js/searx.js rename to searx/static/themes/default/js/searx.js diff --git a/searx/static/default/less/autocompleter.less b/searx/static/themes/default/less/autocompleter.less similarity index 100% rename from searx/static/default/less/autocompleter.less rename to searx/static/themes/default/less/autocompleter.less diff --git a/searx/static/default/less/definitions.less b/searx/static/themes/default/less/definitions.less similarity index 100% rename from searx/static/default/less/definitions.less rename to searx/static/themes/default/less/definitions.less diff --git a/searx/static/default/less/mixins.less b/searx/static/themes/default/less/mixins.less similarity index 100% rename from searx/static/default/less/mixins.less rename to searx/static/themes/default/less/mixins.less diff --git a/searx/static/default/less/search.less b/searx/static/themes/default/less/search.less similarity index 100% rename from searx/static/default/less/search.less rename to searx/static/themes/default/less/search.less diff --git a/searx/static/default/less/style.less b/searx/static/themes/default/less/style.less similarity index 100% rename from searx/static/default/less/style.less rename to searx/static/themes/default/less/style.less diff --git a/searx/static/oscar/.gitignore b/searx/static/themes/oscar/.gitignore similarity index 100% rename from searx/static/oscar/.gitignore rename to searx/static/themes/oscar/.gitignore diff --git a/searx/static/oscar/README.rst b/searx/static/themes/oscar/README.rst similarity index 100% rename from searx/static/oscar/README.rst rename to searx/static/themes/oscar/README.rst diff --git a/searx/static/oscar/css/bootstrap.min.css b/searx/static/themes/oscar/css/bootstrap.min.css similarity index 100% rename from searx/static/oscar/css/bootstrap.min.css rename to searx/static/themes/oscar/css/bootstrap.min.css diff --git a/searx/static/oscar/css/leaflet.min.css b/searx/static/themes/oscar/css/leaflet.min.css similarity index 100% rename from searx/static/oscar/css/leaflet.min.css rename to searx/static/themes/oscar/css/leaflet.min.css diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/themes/oscar/css/oscar.min.css similarity index 100% rename from searx/static/oscar/css/oscar.min.css rename to searx/static/themes/oscar/css/oscar.min.css diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.eot b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from searx/static/oscar/fonts/glyphicons-halflings-regular.eot rename to searx/static/themes/oscar/fonts/glyphicons-halflings-regular.eot diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.svg b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from searx/static/oscar/fonts/glyphicons-halflings-regular.svg rename to searx/static/themes/oscar/fonts/glyphicons-halflings-regular.svg diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.ttf b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from searx/static/oscar/fonts/glyphicons-halflings-regular.ttf rename to searx/static/themes/oscar/fonts/glyphicons-halflings-regular.ttf diff --git a/searx/static/oscar/fonts/glyphicons-halflings-regular.woff b/searx/static/themes/oscar/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from searx/static/oscar/fonts/glyphicons-halflings-regular.woff rename to searx/static/themes/oscar/fonts/glyphicons-halflings-regular.woff diff --git a/searx/static/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js similarity index 100% rename from searx/static/oscar/gruntfile.js rename to searx/static/themes/oscar/gruntfile.js diff --git a/searx/static/oscar/img/favicon.png b/searx/static/themes/oscar/img/favicon.png similarity index 100% rename from searx/static/oscar/img/favicon.png rename to searx/static/themes/oscar/img/favicon.png diff --git a/searx/static/oscar/img/icons/README.md b/searx/static/themes/oscar/img/icons/README.md similarity index 100% rename from searx/static/oscar/img/icons/README.md rename to searx/static/themes/oscar/img/icons/README.md diff --git a/searx/static/oscar/img/icons/amazon.png b/searx/static/themes/oscar/img/icons/amazon.png similarity index 100% rename from searx/static/oscar/img/icons/amazon.png rename to searx/static/themes/oscar/img/icons/amazon.png diff --git a/searx/static/oscar/img/icons/dailymotion.png b/searx/static/themes/oscar/img/icons/dailymotion.png similarity index 100% rename from searx/static/oscar/img/icons/dailymotion.png rename to searx/static/themes/oscar/img/icons/dailymotion.png diff --git a/searx/static/oscar/img/icons/deviantart.png b/searx/static/themes/oscar/img/icons/deviantart.png similarity index 100% rename from searx/static/oscar/img/icons/deviantart.png rename to searx/static/themes/oscar/img/icons/deviantart.png diff --git a/searx/static/oscar/img/icons/facebook.png b/searx/static/themes/oscar/img/icons/facebook.png similarity index 100% rename from searx/static/oscar/img/icons/facebook.png rename to searx/static/themes/oscar/img/icons/facebook.png diff --git a/searx/static/oscar/img/icons/flickr.png b/searx/static/themes/oscar/img/icons/flickr.png similarity index 100% rename from searx/static/oscar/img/icons/flickr.png rename to searx/static/themes/oscar/img/icons/flickr.png diff --git a/searx/static/oscar/img/icons/github.png b/searx/static/themes/oscar/img/icons/github.png similarity index 100% rename from searx/static/oscar/img/icons/github.png rename to searx/static/themes/oscar/img/icons/github.png diff --git a/searx/static/oscar/img/icons/kickass.png b/searx/static/themes/oscar/img/icons/kickass.png similarity index 100% rename from searx/static/oscar/img/icons/kickass.png rename to searx/static/themes/oscar/img/icons/kickass.png diff --git a/searx/static/oscar/img/icons/openstreetmap.png b/searx/static/themes/oscar/img/icons/openstreetmap.png similarity index 100% rename from searx/static/oscar/img/icons/openstreetmap.png rename to searx/static/themes/oscar/img/icons/openstreetmap.png diff --git a/searx/static/oscar/img/icons/photon.png b/searx/static/themes/oscar/img/icons/photon.png similarity index 100% rename from searx/static/oscar/img/icons/photon.png rename to searx/static/themes/oscar/img/icons/photon.png diff --git a/searx/static/oscar/img/icons/searchcode code.png b/searx/static/themes/oscar/img/icons/searchcode code.png similarity index 100% rename from searx/static/oscar/img/icons/searchcode code.png rename to searx/static/themes/oscar/img/icons/searchcode code.png diff --git a/searx/static/oscar/img/icons/searchcode doc.png b/searx/static/themes/oscar/img/icons/searchcode doc.png similarity index 100% rename from searx/static/oscar/img/icons/searchcode doc.png rename to searx/static/themes/oscar/img/icons/searchcode doc.png diff --git a/searx/static/oscar/img/icons/soundcloud.png b/searx/static/themes/oscar/img/icons/soundcloud.png similarity index 100% rename from searx/static/oscar/img/icons/soundcloud.png rename to searx/static/themes/oscar/img/icons/soundcloud.png diff --git a/searx/static/oscar/img/icons/stackoverflow.png b/searx/static/themes/oscar/img/icons/stackoverflow.png similarity index 100% rename from searx/static/oscar/img/icons/stackoverflow.png rename to searx/static/themes/oscar/img/icons/stackoverflow.png diff --git a/searx/static/oscar/img/icons/twitter.png b/searx/static/themes/oscar/img/icons/twitter.png similarity index 100% rename from searx/static/oscar/img/icons/twitter.png rename to searx/static/themes/oscar/img/icons/twitter.png diff --git a/searx/static/oscar/img/icons/vimeo.png b/searx/static/themes/oscar/img/icons/vimeo.png similarity index 100% rename from searx/static/oscar/img/icons/vimeo.png rename to searx/static/themes/oscar/img/icons/vimeo.png diff --git a/searx/static/oscar/img/icons/wikipedia.png b/searx/static/themes/oscar/img/icons/wikipedia.png similarity index 100% rename from searx/static/oscar/img/icons/wikipedia.png rename to searx/static/themes/oscar/img/icons/wikipedia.png diff --git a/searx/static/oscar/img/icons/youtube.png b/searx/static/themes/oscar/img/icons/youtube.png similarity index 100% rename from searx/static/oscar/img/icons/youtube.png rename to searx/static/themes/oscar/img/icons/youtube.png diff --git a/searx/static/oscar/img/loader.gif b/searx/static/themes/oscar/img/loader.gif similarity index 100% rename from searx/static/oscar/img/loader.gif rename to searx/static/themes/oscar/img/loader.gif diff --git a/searx/static/oscar/img/map/layers-2x.png b/searx/static/themes/oscar/img/map/layers-2x.png similarity index 100% rename from searx/static/oscar/img/map/layers-2x.png rename to searx/static/themes/oscar/img/map/layers-2x.png diff --git a/searx/static/oscar/img/map/layers.png b/searx/static/themes/oscar/img/map/layers.png similarity index 100% rename from searx/static/oscar/img/map/layers.png rename to searx/static/themes/oscar/img/map/layers.png diff --git a/searx/static/oscar/img/map/marker-icon-2x-green.png b/searx/static/themes/oscar/img/map/marker-icon-2x-green.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon-2x-green.png rename to searx/static/themes/oscar/img/map/marker-icon-2x-green.png diff --git a/searx/static/oscar/img/map/marker-icon-2x-orange.png b/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon-2x-orange.png rename to searx/static/themes/oscar/img/map/marker-icon-2x-orange.png diff --git a/searx/static/oscar/img/map/marker-icon-2x-red.png b/searx/static/themes/oscar/img/map/marker-icon-2x-red.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon-2x-red.png rename to searx/static/themes/oscar/img/map/marker-icon-2x-red.png diff --git a/searx/static/oscar/img/map/marker-icon-2x.png b/searx/static/themes/oscar/img/map/marker-icon-2x.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon-2x.png rename to searx/static/themes/oscar/img/map/marker-icon-2x.png diff --git a/searx/static/oscar/img/map/marker-icon-green.png b/searx/static/themes/oscar/img/map/marker-icon-green.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon-green.png rename to searx/static/themes/oscar/img/map/marker-icon-green.png diff --git a/searx/static/oscar/img/map/marker-icon-orange.png b/searx/static/themes/oscar/img/map/marker-icon-orange.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon-orange.png rename to searx/static/themes/oscar/img/map/marker-icon-orange.png diff --git a/searx/static/oscar/img/map/marker-icon-red.png b/searx/static/themes/oscar/img/map/marker-icon-red.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon-red.png rename to searx/static/themes/oscar/img/map/marker-icon-red.png diff --git a/searx/static/oscar/img/map/marker-icon.png b/searx/static/themes/oscar/img/map/marker-icon.png similarity index 100% rename from searx/static/oscar/img/map/marker-icon.png rename to searx/static/themes/oscar/img/map/marker-icon.png diff --git a/searx/static/oscar/img/map/marker-shadow.png b/searx/static/themes/oscar/img/map/marker-shadow.png similarity index 100% rename from searx/static/oscar/img/map/marker-shadow.png rename to searx/static/themes/oscar/img/map/marker-shadow.png diff --git a/searx/static/oscar/img/searx_logo.png b/searx/static/themes/oscar/img/searx_logo.png similarity index 100% rename from searx/static/oscar/img/searx_logo.png rename to searx/static/themes/oscar/img/searx_logo.png diff --git a/searx/static/oscar/js/bootstrap.min.js b/searx/static/themes/oscar/js/bootstrap.min.js similarity index 100% rename from searx/static/oscar/js/bootstrap.min.js rename to searx/static/themes/oscar/js/bootstrap.min.js diff --git a/searx/static/oscar/js/html5shiv.min.js b/searx/static/themes/oscar/js/html5shiv.min.js similarity index 100% rename from searx/static/oscar/js/html5shiv.min.js rename to searx/static/themes/oscar/js/html5shiv.min.js diff --git a/searx/static/oscar/js/jquery-1.11.1.min.js b/searx/static/themes/oscar/js/jquery-1.11.1.min.js similarity index 100% rename from searx/static/oscar/js/jquery-1.11.1.min.js rename to searx/static/themes/oscar/js/jquery-1.11.1.min.js diff --git a/searx/static/oscar/js/leaflet-0.7.3.min.js b/searx/static/themes/oscar/js/leaflet-0.7.3.min.js similarity index 100% rename from searx/static/oscar/js/leaflet-0.7.3.min.js rename to searx/static/themes/oscar/js/leaflet-0.7.3.min.js diff --git a/searx/static/oscar/js/require-2.1.15.min.js b/searx/static/themes/oscar/js/require-2.1.15.min.js similarity index 100% rename from searx/static/oscar/js/require-2.1.15.min.js rename to searx/static/themes/oscar/js/require-2.1.15.min.js diff --git a/searx/static/oscar/js/respond.min.js b/searx/static/themes/oscar/js/respond.min.js similarity index 100% rename from searx/static/oscar/js/respond.min.js rename to searx/static/themes/oscar/js/respond.min.js diff --git a/searx/static/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js similarity index 100% rename from searx/static/oscar/js/searx.min.js rename to searx/static/themes/oscar/js/searx.min.js diff --git a/searx/static/oscar/js/searx_src/00_requirejs_config.js b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js similarity index 100% rename from searx/static/oscar/js/searx_src/00_requirejs_config.js rename to searx/static/themes/oscar/js/searx_src/00_requirejs_config.js diff --git a/searx/static/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/js/searx_src/autocompleter.js similarity index 100% rename from searx/static/oscar/js/searx_src/autocompleter.js rename to searx/static/themes/oscar/js/searx_src/autocompleter.js diff --git a/searx/static/oscar/js/searx_src/element_modifiers.js b/searx/static/themes/oscar/js/searx_src/element_modifiers.js similarity index 100% rename from searx/static/oscar/js/searx_src/element_modifiers.js rename to searx/static/themes/oscar/js/searx_src/element_modifiers.js diff --git a/searx/static/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/js/searx_src/leaflet_map.js similarity index 100% rename from searx/static/oscar/js/searx_src/leaflet_map.js rename to searx/static/themes/oscar/js/searx_src/leaflet_map.js diff --git a/searx/static/oscar/js/typeahead.bundle.min.js b/searx/static/themes/oscar/js/typeahead.bundle.min.js similarity index 100% rename from searx/static/oscar/js/typeahead.bundle.min.js rename to searx/static/themes/oscar/js/typeahead.bundle.min.js diff --git a/searx/static/oscar/less/bootstrap/.csscomb.json b/searx/static/themes/oscar/less/bootstrap/.csscomb.json similarity index 100% rename from searx/static/oscar/less/bootstrap/.csscomb.json rename to searx/static/themes/oscar/less/bootstrap/.csscomb.json diff --git a/searx/static/oscar/less/bootstrap/.csslintrc b/searx/static/themes/oscar/less/bootstrap/.csslintrc similarity index 100% rename from searx/static/oscar/less/bootstrap/.csslintrc rename to searx/static/themes/oscar/less/bootstrap/.csslintrc diff --git a/searx/static/oscar/less/bootstrap/alerts.less b/searx/static/themes/oscar/less/bootstrap/alerts.less similarity index 100% rename from searx/static/oscar/less/bootstrap/alerts.less rename to searx/static/themes/oscar/less/bootstrap/alerts.less diff --git a/searx/static/oscar/less/bootstrap/badges.less b/searx/static/themes/oscar/less/bootstrap/badges.less similarity index 100% rename from searx/static/oscar/less/bootstrap/badges.less rename to searx/static/themes/oscar/less/bootstrap/badges.less diff --git a/searx/static/oscar/less/bootstrap/bootstrap.less b/searx/static/themes/oscar/less/bootstrap/bootstrap.less similarity index 100% rename from searx/static/oscar/less/bootstrap/bootstrap.less rename to searx/static/themes/oscar/less/bootstrap/bootstrap.less diff --git a/searx/static/oscar/less/bootstrap/breadcrumbs.less b/searx/static/themes/oscar/less/bootstrap/breadcrumbs.less similarity index 100% rename from searx/static/oscar/less/bootstrap/breadcrumbs.less rename to searx/static/themes/oscar/less/bootstrap/breadcrumbs.less diff --git a/searx/static/oscar/less/bootstrap/button-groups.less b/searx/static/themes/oscar/less/bootstrap/button-groups.less similarity index 100% rename from searx/static/oscar/less/bootstrap/button-groups.less rename to searx/static/themes/oscar/less/bootstrap/button-groups.less diff --git a/searx/static/oscar/less/bootstrap/buttons.less b/searx/static/themes/oscar/less/bootstrap/buttons.less similarity index 100% rename from searx/static/oscar/less/bootstrap/buttons.less rename to searx/static/themes/oscar/less/bootstrap/buttons.less diff --git a/searx/static/oscar/less/bootstrap/carousel.less b/searx/static/themes/oscar/less/bootstrap/carousel.less similarity index 100% rename from searx/static/oscar/less/bootstrap/carousel.less rename to searx/static/themes/oscar/less/bootstrap/carousel.less diff --git a/searx/static/oscar/less/bootstrap/close.less b/searx/static/themes/oscar/less/bootstrap/close.less similarity index 100% rename from searx/static/oscar/less/bootstrap/close.less rename to searx/static/themes/oscar/less/bootstrap/close.less diff --git a/searx/static/oscar/less/bootstrap/code.less b/searx/static/themes/oscar/less/bootstrap/code.less similarity index 100% rename from searx/static/oscar/less/bootstrap/code.less rename to searx/static/themes/oscar/less/bootstrap/code.less diff --git a/searx/static/oscar/less/bootstrap/component-animations.less b/searx/static/themes/oscar/less/bootstrap/component-animations.less similarity index 100% rename from searx/static/oscar/less/bootstrap/component-animations.less rename to searx/static/themes/oscar/less/bootstrap/component-animations.less diff --git a/searx/static/oscar/less/bootstrap/dropdowns.less b/searx/static/themes/oscar/less/bootstrap/dropdowns.less similarity index 100% rename from searx/static/oscar/less/bootstrap/dropdowns.less rename to searx/static/themes/oscar/less/bootstrap/dropdowns.less diff --git a/searx/static/oscar/less/bootstrap/forms.less b/searx/static/themes/oscar/less/bootstrap/forms.less similarity index 100% rename from searx/static/oscar/less/bootstrap/forms.less rename to searx/static/themes/oscar/less/bootstrap/forms.less diff --git a/searx/static/oscar/less/bootstrap/glyphicons.less b/searx/static/themes/oscar/less/bootstrap/glyphicons.less similarity index 100% rename from searx/static/oscar/less/bootstrap/glyphicons.less rename to searx/static/themes/oscar/less/bootstrap/glyphicons.less diff --git a/searx/static/oscar/less/bootstrap/grid.less b/searx/static/themes/oscar/less/bootstrap/grid.less similarity index 100% rename from searx/static/oscar/less/bootstrap/grid.less rename to searx/static/themes/oscar/less/bootstrap/grid.less diff --git a/searx/static/oscar/less/bootstrap/input-groups.less b/searx/static/themes/oscar/less/bootstrap/input-groups.less similarity index 100% rename from searx/static/oscar/less/bootstrap/input-groups.less rename to searx/static/themes/oscar/less/bootstrap/input-groups.less diff --git a/searx/static/oscar/less/bootstrap/jumbotron.less b/searx/static/themes/oscar/less/bootstrap/jumbotron.less similarity index 100% rename from searx/static/oscar/less/bootstrap/jumbotron.less rename to searx/static/themes/oscar/less/bootstrap/jumbotron.less diff --git a/searx/static/oscar/less/bootstrap/labels.less b/searx/static/themes/oscar/less/bootstrap/labels.less similarity index 100% rename from searx/static/oscar/less/bootstrap/labels.less rename to searx/static/themes/oscar/less/bootstrap/labels.less diff --git a/searx/static/oscar/less/bootstrap/list-group.less b/searx/static/themes/oscar/less/bootstrap/list-group.less similarity index 100% rename from searx/static/oscar/less/bootstrap/list-group.less rename to searx/static/themes/oscar/less/bootstrap/list-group.less diff --git a/searx/static/oscar/less/bootstrap/media.less b/searx/static/themes/oscar/less/bootstrap/media.less similarity index 100% rename from searx/static/oscar/less/bootstrap/media.less rename to searx/static/themes/oscar/less/bootstrap/media.less diff --git a/searx/static/oscar/less/bootstrap/mixins.less b/searx/static/themes/oscar/less/bootstrap/mixins.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins.less rename to searx/static/themes/oscar/less/bootstrap/mixins.less diff --git a/searx/static/oscar/less/bootstrap/mixins/alerts.less b/searx/static/themes/oscar/less/bootstrap/mixins/alerts.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/alerts.less rename to searx/static/themes/oscar/less/bootstrap/mixins/alerts.less diff --git a/searx/static/oscar/less/bootstrap/mixins/background-variant.less b/searx/static/themes/oscar/less/bootstrap/mixins/background-variant.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/background-variant.less rename to searx/static/themes/oscar/less/bootstrap/mixins/background-variant.less diff --git a/searx/static/oscar/less/bootstrap/mixins/border-radius.less b/searx/static/themes/oscar/less/bootstrap/mixins/border-radius.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/border-radius.less rename to searx/static/themes/oscar/less/bootstrap/mixins/border-radius.less diff --git a/searx/static/oscar/less/bootstrap/mixins/buttons.less b/searx/static/themes/oscar/less/bootstrap/mixins/buttons.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/buttons.less rename to searx/static/themes/oscar/less/bootstrap/mixins/buttons.less diff --git a/searx/static/oscar/less/bootstrap/mixins/center-block.less b/searx/static/themes/oscar/less/bootstrap/mixins/center-block.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/center-block.less rename to searx/static/themes/oscar/less/bootstrap/mixins/center-block.less diff --git a/searx/static/oscar/less/bootstrap/mixins/clearfix.less b/searx/static/themes/oscar/less/bootstrap/mixins/clearfix.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/clearfix.less rename to searx/static/themes/oscar/less/bootstrap/mixins/clearfix.less diff --git a/searx/static/oscar/less/bootstrap/mixins/forms.less b/searx/static/themes/oscar/less/bootstrap/mixins/forms.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/forms.less rename to searx/static/themes/oscar/less/bootstrap/mixins/forms.less diff --git a/searx/static/oscar/less/bootstrap/mixins/gradients.less b/searx/static/themes/oscar/less/bootstrap/mixins/gradients.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/gradients.less rename to searx/static/themes/oscar/less/bootstrap/mixins/gradients.less diff --git a/searx/static/oscar/less/bootstrap/mixins/grid-framework.less b/searx/static/themes/oscar/less/bootstrap/mixins/grid-framework.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/grid-framework.less rename to searx/static/themes/oscar/less/bootstrap/mixins/grid-framework.less diff --git a/searx/static/oscar/less/bootstrap/mixins/grid.less b/searx/static/themes/oscar/less/bootstrap/mixins/grid.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/grid.less rename to searx/static/themes/oscar/less/bootstrap/mixins/grid.less diff --git a/searx/static/oscar/less/bootstrap/mixins/hide-text.less b/searx/static/themes/oscar/less/bootstrap/mixins/hide-text.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/hide-text.less rename to searx/static/themes/oscar/less/bootstrap/mixins/hide-text.less diff --git a/searx/static/oscar/less/bootstrap/mixins/image.less b/searx/static/themes/oscar/less/bootstrap/mixins/image.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/image.less rename to searx/static/themes/oscar/less/bootstrap/mixins/image.less diff --git a/searx/static/oscar/less/bootstrap/mixins/labels.less b/searx/static/themes/oscar/less/bootstrap/mixins/labels.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/labels.less rename to searx/static/themes/oscar/less/bootstrap/mixins/labels.less diff --git a/searx/static/oscar/less/bootstrap/mixins/list-group.less b/searx/static/themes/oscar/less/bootstrap/mixins/list-group.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/list-group.less rename to searx/static/themes/oscar/less/bootstrap/mixins/list-group.less diff --git a/searx/static/oscar/less/bootstrap/mixins/nav-divider.less b/searx/static/themes/oscar/less/bootstrap/mixins/nav-divider.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/nav-divider.less rename to searx/static/themes/oscar/less/bootstrap/mixins/nav-divider.less diff --git a/searx/static/oscar/less/bootstrap/mixins/nav-vertical-align.less b/searx/static/themes/oscar/less/bootstrap/mixins/nav-vertical-align.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/nav-vertical-align.less rename to searx/static/themes/oscar/less/bootstrap/mixins/nav-vertical-align.less diff --git a/searx/static/oscar/less/bootstrap/mixins/opacity.less b/searx/static/themes/oscar/less/bootstrap/mixins/opacity.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/opacity.less rename to searx/static/themes/oscar/less/bootstrap/mixins/opacity.less diff --git a/searx/static/oscar/less/bootstrap/mixins/pagination.less b/searx/static/themes/oscar/less/bootstrap/mixins/pagination.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/pagination.less rename to searx/static/themes/oscar/less/bootstrap/mixins/pagination.less diff --git a/searx/static/oscar/less/bootstrap/mixins/panels.less b/searx/static/themes/oscar/less/bootstrap/mixins/panels.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/panels.less rename to searx/static/themes/oscar/less/bootstrap/mixins/panels.less diff --git a/searx/static/oscar/less/bootstrap/mixins/progress-bar.less b/searx/static/themes/oscar/less/bootstrap/mixins/progress-bar.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/progress-bar.less rename to searx/static/themes/oscar/less/bootstrap/mixins/progress-bar.less diff --git a/searx/static/oscar/less/bootstrap/mixins/reset-filter.less b/searx/static/themes/oscar/less/bootstrap/mixins/reset-filter.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/reset-filter.less rename to searx/static/themes/oscar/less/bootstrap/mixins/reset-filter.less diff --git a/searx/static/oscar/less/bootstrap/mixins/resize.less b/searx/static/themes/oscar/less/bootstrap/mixins/resize.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/resize.less rename to searx/static/themes/oscar/less/bootstrap/mixins/resize.less diff --git a/searx/static/oscar/less/bootstrap/mixins/responsive-visibility.less b/searx/static/themes/oscar/less/bootstrap/mixins/responsive-visibility.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/responsive-visibility.less rename to searx/static/themes/oscar/less/bootstrap/mixins/responsive-visibility.less diff --git a/searx/static/oscar/less/bootstrap/mixins/size.less b/searx/static/themes/oscar/less/bootstrap/mixins/size.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/size.less rename to searx/static/themes/oscar/less/bootstrap/mixins/size.less diff --git a/searx/static/oscar/less/bootstrap/mixins/tab-focus.less b/searx/static/themes/oscar/less/bootstrap/mixins/tab-focus.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/tab-focus.less rename to searx/static/themes/oscar/less/bootstrap/mixins/tab-focus.less diff --git a/searx/static/oscar/less/bootstrap/mixins/table-row.less b/searx/static/themes/oscar/less/bootstrap/mixins/table-row.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/table-row.less rename to searx/static/themes/oscar/less/bootstrap/mixins/table-row.less diff --git a/searx/static/oscar/less/bootstrap/mixins/text-emphasis.less b/searx/static/themes/oscar/less/bootstrap/mixins/text-emphasis.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/text-emphasis.less rename to searx/static/themes/oscar/less/bootstrap/mixins/text-emphasis.less diff --git a/searx/static/oscar/less/bootstrap/mixins/text-overflow.less b/searx/static/themes/oscar/less/bootstrap/mixins/text-overflow.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/text-overflow.less rename to searx/static/themes/oscar/less/bootstrap/mixins/text-overflow.less diff --git a/searx/static/oscar/less/bootstrap/mixins/vendor-prefixes.less b/searx/static/themes/oscar/less/bootstrap/mixins/vendor-prefixes.less similarity index 100% rename from searx/static/oscar/less/bootstrap/mixins/vendor-prefixes.less rename to searx/static/themes/oscar/less/bootstrap/mixins/vendor-prefixes.less diff --git a/searx/static/oscar/less/bootstrap/modals.less b/searx/static/themes/oscar/less/bootstrap/modals.less similarity index 100% rename from searx/static/oscar/less/bootstrap/modals.less rename to searx/static/themes/oscar/less/bootstrap/modals.less diff --git a/searx/static/oscar/less/bootstrap/navbar.less b/searx/static/themes/oscar/less/bootstrap/navbar.less similarity index 100% rename from searx/static/oscar/less/bootstrap/navbar.less rename to searx/static/themes/oscar/less/bootstrap/navbar.less diff --git a/searx/static/oscar/less/bootstrap/navs.less b/searx/static/themes/oscar/less/bootstrap/navs.less similarity index 100% rename from searx/static/oscar/less/bootstrap/navs.less rename to searx/static/themes/oscar/less/bootstrap/navs.less diff --git a/searx/static/oscar/less/bootstrap/normalize.less b/searx/static/themes/oscar/less/bootstrap/normalize.less similarity index 100% rename from searx/static/oscar/less/bootstrap/normalize.less rename to searx/static/themes/oscar/less/bootstrap/normalize.less diff --git a/searx/static/oscar/less/bootstrap/pager.less b/searx/static/themes/oscar/less/bootstrap/pager.less similarity index 100% rename from searx/static/oscar/less/bootstrap/pager.less rename to searx/static/themes/oscar/less/bootstrap/pager.less diff --git a/searx/static/oscar/less/bootstrap/pagination.less b/searx/static/themes/oscar/less/bootstrap/pagination.less similarity index 100% rename from searx/static/oscar/less/bootstrap/pagination.less rename to searx/static/themes/oscar/less/bootstrap/pagination.less diff --git a/searx/static/oscar/less/bootstrap/panels.less b/searx/static/themes/oscar/less/bootstrap/panels.less similarity index 100% rename from searx/static/oscar/less/bootstrap/panels.less rename to searx/static/themes/oscar/less/bootstrap/panels.less diff --git a/searx/static/oscar/less/bootstrap/popovers.less b/searx/static/themes/oscar/less/bootstrap/popovers.less similarity index 100% rename from searx/static/oscar/less/bootstrap/popovers.less rename to searx/static/themes/oscar/less/bootstrap/popovers.less diff --git a/searx/static/oscar/less/bootstrap/print.less b/searx/static/themes/oscar/less/bootstrap/print.less similarity index 100% rename from searx/static/oscar/less/bootstrap/print.less rename to searx/static/themes/oscar/less/bootstrap/print.less diff --git a/searx/static/oscar/less/bootstrap/progress-bars.less b/searx/static/themes/oscar/less/bootstrap/progress-bars.less similarity index 100% rename from searx/static/oscar/less/bootstrap/progress-bars.less rename to searx/static/themes/oscar/less/bootstrap/progress-bars.less diff --git a/searx/static/oscar/less/bootstrap/responsive-embed.less b/searx/static/themes/oscar/less/bootstrap/responsive-embed.less similarity index 100% rename from searx/static/oscar/less/bootstrap/responsive-embed.less rename to searx/static/themes/oscar/less/bootstrap/responsive-embed.less diff --git a/searx/static/oscar/less/bootstrap/responsive-utilities.less b/searx/static/themes/oscar/less/bootstrap/responsive-utilities.less similarity index 100% rename from searx/static/oscar/less/bootstrap/responsive-utilities.less rename to searx/static/themes/oscar/less/bootstrap/responsive-utilities.less diff --git a/searx/static/oscar/less/bootstrap/scaffolding.less b/searx/static/themes/oscar/less/bootstrap/scaffolding.less similarity index 100% rename from searx/static/oscar/less/bootstrap/scaffolding.less rename to searx/static/themes/oscar/less/bootstrap/scaffolding.less diff --git a/searx/static/oscar/less/bootstrap/tables.less b/searx/static/themes/oscar/less/bootstrap/tables.less similarity index 100% rename from searx/static/oscar/less/bootstrap/tables.less rename to searx/static/themes/oscar/less/bootstrap/tables.less diff --git a/searx/static/oscar/less/bootstrap/theme.less b/searx/static/themes/oscar/less/bootstrap/theme.less similarity index 100% rename from searx/static/oscar/less/bootstrap/theme.less rename to searx/static/themes/oscar/less/bootstrap/theme.less diff --git a/searx/static/oscar/less/bootstrap/thumbnails.less b/searx/static/themes/oscar/less/bootstrap/thumbnails.less similarity index 100% rename from searx/static/oscar/less/bootstrap/thumbnails.less rename to searx/static/themes/oscar/less/bootstrap/thumbnails.less diff --git a/searx/static/oscar/less/bootstrap/tooltip.less b/searx/static/themes/oscar/less/bootstrap/tooltip.less similarity index 100% rename from searx/static/oscar/less/bootstrap/tooltip.less rename to searx/static/themes/oscar/less/bootstrap/tooltip.less diff --git a/searx/static/oscar/less/bootstrap/type.less b/searx/static/themes/oscar/less/bootstrap/type.less similarity index 100% rename from searx/static/oscar/less/bootstrap/type.less rename to searx/static/themes/oscar/less/bootstrap/type.less diff --git a/searx/static/oscar/less/bootstrap/typeahead.less b/searx/static/themes/oscar/less/bootstrap/typeahead.less similarity index 100% rename from searx/static/oscar/less/bootstrap/typeahead.less rename to searx/static/themes/oscar/less/bootstrap/typeahead.less diff --git a/searx/static/oscar/less/bootstrap/utilities.less b/searx/static/themes/oscar/less/bootstrap/utilities.less similarity index 100% rename from searx/static/oscar/less/bootstrap/utilities.less rename to searx/static/themes/oscar/less/bootstrap/utilities.less diff --git a/searx/static/oscar/less/bootstrap/variables.less b/searx/static/themes/oscar/less/bootstrap/variables.less similarity index 100% rename from searx/static/oscar/less/bootstrap/variables.less rename to searx/static/themes/oscar/less/bootstrap/variables.less diff --git a/searx/static/oscar/less/bootstrap/wells.less b/searx/static/themes/oscar/less/bootstrap/wells.less similarity index 100% rename from searx/static/oscar/less/bootstrap/wells.less rename to searx/static/themes/oscar/less/bootstrap/wells.less diff --git a/searx/static/oscar/less/oscar/checkbox.less b/searx/static/themes/oscar/less/oscar/checkbox.less similarity index 100% rename from searx/static/oscar/less/oscar/checkbox.less rename to searx/static/themes/oscar/less/oscar/checkbox.less diff --git a/searx/static/oscar/less/oscar/cursor.less b/searx/static/themes/oscar/less/oscar/cursor.less similarity index 100% rename from searx/static/oscar/less/oscar/cursor.less rename to searx/static/themes/oscar/less/oscar/cursor.less diff --git a/searx/static/oscar/less/oscar/footer.less b/searx/static/themes/oscar/less/oscar/footer.less similarity index 100% rename from searx/static/oscar/less/oscar/footer.less rename to searx/static/themes/oscar/less/oscar/footer.less diff --git a/searx/static/oscar/less/oscar/infobox.less b/searx/static/themes/oscar/less/oscar/infobox.less similarity index 100% rename from searx/static/oscar/less/oscar/infobox.less rename to searx/static/themes/oscar/less/oscar/infobox.less diff --git a/searx/static/oscar/less/oscar/oscar.less b/searx/static/themes/oscar/less/oscar/oscar.less similarity index 100% rename from searx/static/oscar/less/oscar/oscar.less rename to searx/static/themes/oscar/less/oscar/oscar.less diff --git a/searx/static/oscar/less/oscar/results.less b/searx/static/themes/oscar/less/oscar/results.less similarity index 100% rename from searx/static/oscar/less/oscar/results.less rename to searx/static/themes/oscar/less/oscar/results.less diff --git a/searx/static/oscar/less/oscar/search.less b/searx/static/themes/oscar/less/oscar/search.less similarity index 100% rename from searx/static/oscar/less/oscar/search.less rename to searx/static/themes/oscar/less/oscar/search.less diff --git a/searx/static/oscar/package.json b/searx/static/themes/oscar/package.json similarity index 100% rename from searx/static/oscar/package.json rename to searx/static/themes/oscar/package.json diff --git a/searx/utils.py b/searx/utils.py index 8a3f35531..0594339d5 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -73,11 +73,9 @@ class HTMLTextExtractor(HTMLParser): self.tags = [] def handle_starttag(self, tag, attrs): - print tag self.tags.append(tag) def handle_endtag(self, tag): - print tag,tag if tag != self.tags[-1]: raise Exception("invalid html") self.tags.pop() @@ -156,11 +154,17 @@ def get_themes(root): """Returns available themes list.""" static_path = os.path.join(root, 'static') - static_names = set(os.listdir(static_path)) templates_path = os.path.join(root, 'templates') - templates_names = set(os.listdir(templates_path)) - themes = [] - for name in static_names.intersection(templates_names): - themes += [name] + themes = os.listdir(os.path.join(static_path, 'themes')) return static_path, templates_path, themes + + +def get_static_files(base_path): + static_files = set() + base_path_length = len(base_path+'/static') + 1 + for directory, _, files in os.walk(os.path.join(base_path, 'static')): + for filename in files: + f = os.path.join(directory[base_path_length:], filename) + static_files.add(f) + return static_files diff --git a/searx/webapp.py b/searx/webapp.py index be7feee82..2e3c2c119 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -38,7 +38,8 @@ from searx.engines import ( categories, engines, get_engines_stats, engine_shortcuts ) from searx.utils import ( - UnicodeWriter, highlight_content, html_to_text, get_themes + UnicodeWriter, highlight_content, html_to_text, get_themes, + get_static_files ) from searx.version import VERSION_STRING from searx.languages import language_codes @@ -55,6 +56,8 @@ static_path, templates_path, themes =\ default_theme = settings['server'].get('default_theme', 'default') +static_files = get_static_files(searx_dir) + app = Flask( __name__, static_folder=static_path, @@ -123,9 +126,11 @@ def get_current_theme_name(override=None): def url_for_theme(endpoint, override_theme=None, **values): - if endpoint == 'static' and values.get('filename', None): + if endpoint == 'static' and values.get('filename'): theme_name = get_current_theme_name(override=override_theme) - values['filename'] = "{}/{}".format(theme_name, values['filename']) + filename_with_theme = "themes/{}/{}".format(theme_name, values['filename']) + if filename_with_theme in static_files: + values['filename'] = filename_with_theme return url_for(endpoint, **values) From 8151585918a3d86b9dac5bef782581d13a14179f Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 17:54:33 +0100 Subject: [PATCH 36/62] [fix] static file paths --- .travis.yml | 2 +- Makefile | 12 ++++++------ searx/static/themes/oscar/README.rst | 4 ++-- searx/static/themes/oscar/js/searx.min.js | 2 +- .../themes/oscar/js/searx_src/00_requirejs_config.js | 2 +- .../static/themes/oscar/js/searx_src/leaflet_map.js | 2 +- searx/tests/test_webapp.py | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cc51e84b..751a0ca68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - npm install -g less grunt-cli - - ( cd searx/static/oscar;npm install ) + - ( cd searx/static/themes/oscar;npm install ) install: - "make" - pip install coveralls diff --git a/Makefile b/Makefile index f9882e5ac..7d40a8127 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ $(python): tests: .installed.cfg @bin/test - @grunt test --gruntfile searx/static/oscar/gruntfile.js + @grunt test --gruntfile searx/static/themes/oscar/gruntfile.js robot: .installed.cfg @bin/robot @@ -45,18 +45,18 @@ minimal: bin/buildout minimal.cfg setup.py bin/buildout -c minimal.cfg $(options) styles: - @lessc -x searx/static/default/less/style.less > searx/static/default/css/style.css - @lessc -x searx/static/oscar/less/bootstrap/bootstrap.less > searx/static/oscar/css/bootstrap.min.css - @lessc -x searx/static/oscar/less/oscar/oscar.less > searx/static/oscar/css/oscar.min.css + @lessc -x searx/static/themes/default/less/style.less > searx/static/themes/default/css/style.css + @lessc -x searx/static/themes/oscar/less/bootstrap/bootstrap.less > searx/static/themes/oscar/css/bootstrap.min.css + @lessc -x searx/static/themes/oscar/less/oscar/oscar.less > searx/static/themes/oscar/css/oscar.min.css grunt: - @grunt --gruntfile searx/static/oscar/gruntfile.js + @grunt --gruntfile searx/static/themes/oscar/gruntfile.js locales: @pybabel compile -d searx/translations clean: @rm -rf .installed.cfg .mr.developer.cfg bin parts develop-eggs \ - searx.egg-info lib include .coverage coverage searx/static/default/css/*.css + searx.egg-info lib include .coverage coverage searx/static/themes/default/css/*.css .PHONY: all tests robot flake8 coverage production minimal styles locales clean diff --git a/searx/static/themes/oscar/README.rst b/searx/static/themes/oscar/README.rst index 7a1800add..e7daa8719 100644 --- a/searx/static/themes/oscar/README.rst +++ b/searx/static/themes/oscar/README.rst @@ -1,14 +1,14 @@ install dependencies ~~~~~~~~~~~~~~~~~~~~ -run this command in the directory ``searx/static/oscar`` +run this command in the directory ``searx/static/themes/oscar`` ``npm install`` compile sources ~~~~~~~~~~~~~~~ -run this command in the directory ``searx/static/oscar`` +run this command in the directory ``searx/static/themes/oscar`` ``grunt`` diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index 2fba71063..34a44f51b 100644 --- a/searx/static/themes/oscar/js/searx.min.js +++ b/searx/static/themes/oscar/js/searx.min.js @@ -1,2 +1,2 @@ /*! oscar/searx.min.js | 19-12-2014 | https://github.com/asciimoo/searx */ -requirejs.config({baseUrl:"./static/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")}),$(".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/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 +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")}),$(".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/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)})}); diff --git a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js index 99ec4b585..1aa434902 100644 --- a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js +++ b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js @@ -16,7 +16,7 @@ */ requirejs.config({ - baseUrl: './static/oscar/js', + baseUrl: './static/themes/oscar/js', paths: { app: '../app' } diff --git a/searx/static/themes/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/js/searx_src/leaflet_map.js index b5112ef5e..cbcbe157e 100644 --- a/searx/static/themes/oscar/js/searx_src/leaflet_map.js +++ b/searx/static/themes/oscar/js/searx_src/leaflet_map.js @@ -116,7 +116,7 @@ $(document).ready(function(){ // TODO hack // change default imagePath - L.Icon.Default.imagePath = "./static/oscar/img/map"; + L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; // init map var map = L.map(leaflet_target); diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py index 75ff585cc..a979e786d 100644 --- a/searx/tests/test_webapp.py +++ b/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '

youtubeSecond Test

', # noqa + '

youtubeSecond Test

', # noqa result.data ) self.assertIn( From 20c4de8f06cd7f4b04ec37bf8aa28f96be48c093 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 18:06:51 +0100 Subject: [PATCH 37/62] [fix] filename strip --- searx/static/themes/oscar/{README.rst => README.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename searx/static/themes/oscar/{README.rst => README.rst} (100%) diff --git a/searx/static/themes/oscar/README.rst b/searx/static/themes/oscar/README.rst similarity index 100% rename from searx/static/themes/oscar/README.rst rename to searx/static/themes/oscar/README.rst From 2f9a386c0db884ffbea27f43bdcff5bfd1876ad1 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 18:59:53 +0100 Subject: [PATCH 38/62] [enh] better result template handling --- searx/templates/courgette/results.html | 2 +- searx/templates/default/results.html | 2 +- searx/templates/oscar/results.html | 6 +++++- searx/utils.py | 17 +++++++++++++++-- searx/webapp.py | 13 ++++++++++++- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/searx/templates/courgette/results.html b/searx/templates/courgette/results.html index 62bef8c90..8b5135c02 100644 --- a/searx/templates/courgette/results.html +++ b/searx/templates/courgette/results.html @@ -43,7 +43,7 @@ {% for result in results %} {% if result['template'] %} - {% include 'courgette/result_templates/'+result['template'] %} + {% include get_result_template('courgette', result['template']) %} {% else %} {% include 'courgette/result_templates/default.html' %} {% endif %} diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html index 199eb1d96..822960593 100644 --- a/searx/templates/default/results.html +++ b/searx/templates/default/results.html @@ -59,7 +59,7 @@ {% for result in results %} {% if result['template'] %} - {% include 'default/result_templates/'+result['template'] %} + {% include get_result_template('default', result['template']) %} {% else %} {% include 'default/result_templates/default.html' %} {% endif %} diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index 69f8c9237..380947ca0 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -17,7 +17,11 @@ {% for result in results %}
{% set index = loop.index %} - {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %} + {% if result.template %} + {% include get_result_template('oscar', result['template']) %} + {% else %} + {% include 'oscar/result_templates/default.html' %} + {% endif %}
{% endfor %} diff --git a/searx/utils.py b/searx/utils.py index 0594339d5..5bd1ced4d 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -161,10 +161,23 @@ def get_themes(root): def get_static_files(base_path): + base_path = os.path.join(base_path, 'static') static_files = set() - base_path_length = len(base_path+'/static') + 1 - for directory, _, files in os.walk(os.path.join(base_path, 'static')): + base_path_length = len(base_path) + 1 + for directory, _, files in os.walk(base_path): for filename in files: f = os.path.join(directory[base_path_length:], filename) static_files.add(f) return static_files + + +def get_result_templates(base_path): + base_path = os.path.join(base_path, 'templates') + result_templates = set() + base_path_length = len(base_path) + 1 + for directory, _, files in os.walk(base_path): + if directory.endswith('result_templates'): + for filename in files: + f = os.path.join(directory[base_path_length:], filename) + result_templates.add(f) + return result_templates diff --git a/searx/webapp.py b/searx/webapp.py index 2e3c2c119..fca42d48e 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -39,7 +39,7 @@ from searx.engines import ( ) from searx.utils import ( UnicodeWriter, highlight_content, html_to_text, get_themes, - get_static_files + get_static_files, get_result_templates ) from searx.version import VERSION_STRING from searx.languages import language_codes @@ -58,6 +58,8 @@ default_theme = settings['server'].get('default_theme', 'default') static_files = get_static_files(searx_dir) +result_templates = get_result_templates(searx_dir) + app = Flask( __name__, static_folder=static_path, @@ -125,6 +127,13 @@ def get_current_theme_name(override=None): return theme_name +def get_result_template(theme, template_name): + themed_path = theme + '/result_templates/' + template_name + if themed_path in result_templates: + return themed_path + return 'result_templates/' + template_name + + def url_for_theme(endpoint, override_theme=None, **values): if endpoint == 'static' and values.get('filename'): theme_name = get_current_theme_name(override=override_theme) @@ -180,6 +189,8 @@ def render(template_name, override_theme=None, **kwargs): # override url_for function in templates kwargs['url_for'] = url_for_theme + kwargs['get_result_template'] = get_result_template + kwargs['theme'] = get_current_theme_name(override=override_theme) kwargs['template_name'] = template_name From 798bef77f9b43e713aeb9ac2938785538538a99c Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 19:24:47 +0100 Subject: [PATCH 39/62] [fix] static content paths --- searx/templates/courgette/result_templates/default.html | 2 +- searx/templates/default/result_templates/default.html | 2 +- searx/templates/oscar/result_templates/default.html | 2 +- searx/tests/test_webapp.py | 2 +- searx/webapp.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html index b46f95e9f..710b0a8e7 100644 --- a/searx/templates/courgette/result_templates/default.html +++ b/searx/templates/courgette/result_templates/default.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index 73e9af1a9..85882e56a 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,5 +1,5 @@
-

{% 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 }}

{{ 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/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 3c8e6255d..b84430814 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

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

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py index a979e786d..d26b75e8f 100644 --- a/searx/tests/test_webapp.py +++ b/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '

youtubeSecond Test

', # noqa + '

youtubeSecond Test

', # noqa result.data ) self.assertIn( diff --git a/searx/webapp.py b/searx/webapp.py index fca42d48e..6ee9af745 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -73,7 +73,7 @@ babel = Babel(app) global_favicons = [] for indice, theme in enumerate(themes): global_favicons.append([]) - theme_img_path = searx_dir+"/static/"+theme+"/img/icons/" + theme_img_path = searx_dir+"/static/themes/"+theme+"/img/icons/" for (dirpath, dirnames, filenames) in os.walk(theme_img_path): global_favicons[indice].extend(filenames) @@ -506,7 +506,7 @@ def opensearch(): @app.route('/favicon.ico') def favicon(): return send_from_directory(os.path.join(app.root_path, - 'static', + 'static/themes', get_current_theme_name(), 'img'), 'favicon.png', From e5a323b2883848b5eb26ca0c42d451eabb4dc183 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 1 Jan 2015 19:52:05 +0100 Subject: [PATCH 40/62] [fix] favicon paths --- searx/templates/courgette/result_templates/map.html | 2 +- searx/templates/courgette/result_templates/videos.html | 2 +- searx/templates/default/result_templates/map.html | 2 +- searx/templates/default/result_templates/torrent.html | 3 +++ searx/templates/default/result_templates/videos.html | 2 +- searx/templates/oscar/result_templates/default.html | 2 +- searx/templates/oscar/result_templates/map.html | 2 +- searx/templates/oscar/result_templates/torrent.html | 2 +- searx/templates/oscar/result_templates/videos.html | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html index b46f95e9f..4919954e0 100644 --- a/searx/templates/courgette/result_templates/map.html +++ b/searx/templates/courgette/result_templates/map.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index 7b8bf6653..bb711caab 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -1,6 +1,6 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}

{{ result.title|safe }}

diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index d361ddb01..b3669f895 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html index 5925f1313..fb8988680 100644 --- a/searx/templates/default/result_templates/torrent.html +++ b/searx/templates/default/result_templates/torrent.html @@ -1,4 +1,7 @@
+ {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} + {% endif %}

{{ result.title|safe }}

{{ result.pretty_url }}

{% if result.content %}

{{ result.content|safe }}

{% endif %} diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 08575e847..75f965c80 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,5 +1,5 @@
-

{% 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.url }}

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index b84430814..6ab26132e 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

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

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index a0858c0ce..c08e2e72b 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

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

{% if result.publishedDate %}{% endif %} diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index b6753f704..bfb6cdbe6 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

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

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 2b9568847..ef4c5dd83 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

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

+

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

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} From c5ff2ef9f1160df2d3c4902802d91e914e32c96e Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:01:56 +0100 Subject: [PATCH 41/62] [doc] release date ++ formatting --- CHANGELOG.rst | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 364f704bf..e411fc4a0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,22 +1,23 @@ -0.6.0 -===== +0.6.0 - 2014.12.25 +================== -- Changelog added -- New engines - - Flickr (api) - - Subtitleseeker - - photon - - 500px - - Searchcode - - Searchcode doc - - Kickass torrent -- Precise search request timeout handling -- Better favicon support -- Stricter config parsing -- Translation updates -- Multiple ui fixes -- Flickr (noapi) engine fix -- Pep8 fixes +- Changelog added +- New engines + + - Flickr (api) + - Subtitleseeker + - photon + - 500px + - Searchcode + - Searchcode doc + - Kickass torrent +- Precise search request timeout handling +- Better favicon support +- Stricter config parsing +- Translation updates +- Multiple ui fixes +- Flickr (noapi) engine fix +- Pep8 fixes News From 041fad20d6c1f5ea4c5ab380d0d959bb597fe870 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:23:59 +0100 Subject: [PATCH 42/62] [doc] nested list fix --- README.rst | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index bd6896aa1..d483058ed 100644 --- a/README.rst +++ b/README.rst @@ -14,16 +14,17 @@ See the `wiki `__ for more information. Features ~~~~~~~~ -- Tracking free -- Supports multiple output formats - - json ``curl https://searx.me/?format=json&q=[query]`` - - csv ``curl https://searx.me/?format=csv&q=[query]`` - - opensearch/rss ``curl https://searx.me/?format=rss&q=[query]`` -- Opensearch support (you can set as default search engine) -- Configurable search engines/categories -- Different search languages -- Duckduckgo like !bang functionality with engine shortcuts -- Parallel queries - relatively fast +- Tracking free +- Supports multiple output formats + + - json ``curl https://searx.me/?format=json&q=[query]`` + - csv ``curl https://searx.me/?format=csv&q=[query]`` + - opensearch/rss ``curl https://searx.me/?format=rss&q=[query]`` +- Opensearch support (you can set as default search engine) +- Configurable search engines/categories +- Different search languages +- Duckduckgo like !bang functionality with engine shortcuts +- Parallel queries - relatively fast Installation ~~~~~~~~~~~~ From 56c15023b5f35463aa05bca1024139343598baee Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:26:21 +0100 Subject: [PATCH 43/62] [enh] tox.ini added to rewrite standard pep8 rules --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tox.ini diff --git a/tox.ini b/tox.ini new file mode 100644 index 000000000..6deafc261 --- /dev/null +++ b/tox.ini @@ -0,0 +1,2 @@ +[flake8] +max-line-length = 120 From cc4e17b6686dbefe0d57862e045f98f72a4e58fc Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:33:40 +0100 Subject: [PATCH 44/62] [fix] pep8 --- searx/engines/flickr-noapi.py | 6 +++--- searx/engines/subtitleseeker.py | 6 +++--- searx/engines/wikidata.py | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/searx/engines/flickr-noapi.py b/searx/engines/flickr-noapi.py index f90903647..aa2fa5d3b 100644 --- a/searx/engines/flickr-noapi.py +++ b/searx/engines/flickr-noapi.py @@ -81,9 +81,9 @@ def response(resp): if 'description' in photo: content = content +\ - '' +\ - photo['description'] +\ - '' + '' +\ + photo['description'] +\ + '' # append result results.append({'url': url, diff --git a/searx/engines/subtitleseeker.py b/searx/engines/subtitleseeker.py index c413dcf26..9aaf1947b 100644 --- a/searx/engines/subtitleseeker.py +++ b/searx/engines/subtitleseeker.py @@ -65,9 +65,9 @@ def response(resp): if result.xpath(".//span") != []: content = content +\ - " - (" +\ - result.xpath(".//span//text()")[0].strip() +\ - ")" + " - (" +\ + result.xpath(".//span//text()")[0].strip() +\ + ")" # append result results.append({'url': href, diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py index bda80cdca..df976ae35 100644 --- a/searx/engines/wikidata.py +++ b/searx/engines/wikidata.py @@ -2,7 +2,6 @@ import json from requests import get from urllib import urlencode import locale -import time import dateutil.parser result_count = 1 @@ -38,7 +37,7 @@ def response(resp): language = resp.search_params['language'].split('_')[0] if language == 'all': language = 'en' - + try: locale.setlocale(locale.LC_ALL, str(resp.search_params['language'])) except: @@ -47,7 +46,7 @@ def response(resp): except: pass pass - + url = url_detail.format(query=urlencode({'ids': '|'.join(wikidata_ids), 'languages': language + '|en'})) From 0d36dcbf4c23bc75eaae2724844afed27b40d893 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:36:09 +0100 Subject: [PATCH 45/62] [enh] pep8 check added to tests --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7d40a8127..5d4ccd148 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,6 @@ $(python): virtualenv -p python$(version) --no-site-packages . @touch $@ -tests: .installed.cfg - @bin/test - @grunt test --gruntfile searx/static/themes/oscar/gruntfile.js - robot: .installed.cfg @bin/robot @@ -29,6 +25,10 @@ flake8: .installed.cfg @bin/flake8 setup.py @bin/flake8 ./searx/ +tests: .installed.cfg flake8 + @bin/test + @grunt test --gruntfile searx/static/themes/oscar/gruntfile.js + coverage: .installed.cfg @bin/coverage run bin/test @bin/coverage report From bc38dc8ab9d0cbe4a176d429ae5fb6a87d494994 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:39:31 +0100 Subject: [PATCH 46/62] [doc] todo updates --- README.rst | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index d483058ed..669741ef3 100644 --- a/README.rst +++ b/README.rst @@ -132,14 +132,11 @@ next time you run any other ``make`` command it will rebuild everithing. TODO ~~~~ -- Moar engines -- Better ui -- Browser integration -- Documentation -- Fix ``flake8`` errors, ``make flake8`` will be merged into - ``make tests`` when it does not fail anymore -- Tests -- When we have more tests, we can integrate Travis-CI +- Moar engines +- Better ui +- Browser integration +- Documentation +- Tests Bugs ~~~~ From 592d801af95dbf107ab88c1b66653bf7b16afcd6 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:49:05 +0100 Subject: [PATCH 47/62] [doc] @vincib added to authors --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 0cb072e9b..3f991b2ac 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -30,3 +30,4 @@ generally made searx better: - @Cqoicebordel - @Reventl0v - Caner Başaran +- Benjamin Sonntag From 7b531c6fcefe1c0c5cc19967454cdddb6e1c8fbd Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 2 Jan 2015 12:49:17 +0100 Subject: [PATCH 48/62] [doc] @opi added to authors --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 3f991b2ac..6af81acab 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -31,3 +31,4 @@ generally made searx better: - @Reventl0v - Caner Başaran - Benjamin Sonntag +- @opi From 4450ed5503ab9f7b4d0dc1849837523bbe3b56dd Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sat, 3 Jan 2015 23:54:02 +0100 Subject: [PATCH 49/62] Digg correction Return no result instead of crashing if no result --- searx/engines/digg.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/searx/engines/digg.py b/searx/engines/digg.py index 241234fdb..8c457d6b9 100644 --- a/searx/engines/digg.py +++ b/searx/engines/digg.py @@ -44,6 +44,9 @@ def response(resp): search_result = loads(resp.text) + if search_result['html'] == '': + return results + dom = html.fromstring(search_result['html']) # parse results From 3aa3a4633f50fa50693636113a4141e266db90d7 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sat, 3 Jan 2015 23:55:50 +0100 Subject: [PATCH 50/62] Few fixes on Vimeo Change URL from https to http Change way of handling text xpath --- searx/engines/vimeo.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/searx/engines/vimeo.py b/searx/engines/vimeo.py index c66c4148a..3949a7299 100644 --- a/searx/engines/vimeo.py +++ b/searx/engines/vimeo.py @@ -13,24 +13,23 @@ # @todo set content-parameter with correct data from urllib import urlencode -from HTMLParser import HTMLParser from lxml import html -from searx.engines.xpath import extract_text from dateutil import parser +from cgi import escape # engine dependent config categories = ['videos'] paging = True # search-url -base_url = 'https://vimeo.com' +base_url = 'http://vimeo.com' search_url = base_url + '/search/page:{pageno}?{query}' # specific xpath variables -url_xpath = './a/@href' -content_xpath = './a/img/@src' -title_xpath = './a/div[@class="data"]/p[@class="title"]/text()' results_xpath = '//div[@id="browse_content"]/ol/li' +url_xpath = './a/@href' +title_xpath = './a/div[@class="data"]/p[@class="title"]' +content_xpath = './a/img/@src' publishedDate_xpath = './/p[@class="meta"]//attribute::datetime' @@ -39,10 +38,6 @@ def request(query, params): params['url'] = search_url.format(pageno=params['pageno'], query=urlencode({'q': query})) - # TODO required? - params['cookies']['__utma'] =\ - '00000000.000#0000000.0000000000.0000000000.0000000000.0' - return params @@ -52,15 +47,12 @@ def response(resp): dom = html.fromstring(resp.text) - p = HTMLParser() - # parse results for result in dom.xpath(results_xpath): url = base_url + result.xpath(url_xpath)[0] - title = p.unescape(extract_text(result.xpath(title_xpath))) - thumbnail = extract_text(result.xpath(content_xpath)[0]) - publishedDate = parser.parse(extract_text( - result.xpath(publishedDate_xpath)[0])) + title = escape(html.tostring(result.xpath(title_xpath)[0], method='text', encoding='UTF-8').decode("utf-8")) + thumbnail = result.xpath(content_xpath)[0] + publishedDate = parser.parse(result.xpath(publishedDate_xpath)[0]) # append result results.append({'url': url, From 4a195e0b28fdd940e046c442032c816095416fec Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 5 Jan 2015 02:04:23 +0100 Subject: [PATCH 51/62] Integrated media in results + Deezer Engine New "embedded" item for the results, allow to give an iframe to display the media directly in the results. Note that the attributes src of the iframes are not set, but instead data-src is set, allowing to only load the iframe when clicked. Deezer engine based on public API (no key). --- searx/engines/dailymotion.py | 15 +++-- searx/engines/deezer.py | 62 +++++++++++++++++++ searx/engines/soundcloud.py | 14 ++++- searx/engines/vimeo.py | 11 +++- searx/engines/youtube.py | 13 +++- searx/settings.yml | 4 ++ searx/static/themes/oscar/js/searx.min.js | 4 +- .../oscar/js/searx_src/element_modifiers.js | 12 ++++ .../oscar/result_templates/default.html | 12 ++++ .../oscar/result_templates/videos.html | 12 ++++ 10 files changed, 147 insertions(+), 12 deletions(-) create mode 100644 searx/engines/deezer.py diff --git a/searx/engines/dailymotion.py b/searx/engines/dailymotion.py index a5bffa866..03b1dbb8b 100644 --- a/searx/engines/dailymotion.py +++ b/searx/engines/dailymotion.py @@ -6,12 +6,14 @@ # @using-api yes # @results JSON # @stable yes -# @parse url, title, thumbnail +# @parse url, title, thumbnail, publishedDate, embedded # # @todo set content-parameter with correct data from urllib import urlencode from json import loads +from cgi import escape +from datetime import datetime # engine dependent config categories = ['videos'] @@ -20,7 +22,9 @@ language_support = True # search-url # see http://www.dailymotion.com/doc/api/obj-video.html -search_url = 'https://api.dailymotion.com/videos?fields=title,description,duration,url,thumbnail_360_url&sort=relevance&limit=5&page={pageno}&{query}' # noqa +search_url = 'https://api.dailymotion.com/videos?fields=created_time,title,description,duration,url,thumbnail_360_url,id&sort=relevance&limit=5&page={pageno}&{query}' # noqa +embedded_url = '' # do search-request @@ -51,14 +55,17 @@ def response(resp): for res in search_res['list']: title = res['title'] url = res['url'] - #content = res['description'] - content = '' + content = escape(res['description']) thumbnail = res['thumbnail_360_url'] + publishedDate = datetime.fromtimestamp(res['created_time'], None) + embedded = embedded_url.format(videoid=res['id']) results.append({'template': 'videos.html', 'url': url, 'title': title, 'content': content, + 'publishedDate': publishedDate, + 'embedded': embedded, 'thumbnail': thumbnail}) # return results diff --git a/searx/engines/deezer.py b/searx/engines/deezer.py new file mode 100644 index 000000000..6c26b6aeb --- /dev/null +++ b/searx/engines/deezer.py @@ -0,0 +1,62 @@ +## Deezer (Music) +# +# @website https://deezer.com +# @provide-api yes (http://developers.deezer.com/api/) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title, content, embedded + +from json import loads +from urllib import urlencode + +# engine dependent config +categories = ['music'] +paging = True + +# search-url +url = 'http://api.deezer.com/' +search_url = url + 'search?{query}&index={offset}' + +embedded_url = '' + + +# do search-request +def request(query, params): + offset = (params['pageno'] - 1) * 25 + + params['url'] = search_url.format(query=urlencode({'q': query}), + offset=offset) + + return params + + +# get response from search-request +def response(resp): + results = [] + + search_res = loads(resp.text) + + # parse results + for result in search_res.get('data', []): + if result['type'] == 'track': + print result + title = result['title'] + url = result['link'] + content = result['artist']['name'] +\ + " • " +\ + result['album']['title'] +\ + " • " + result['title'] + embedded = embedded_url.format(audioid=result['id']) + + # append result + results.append({'url': url, + 'title': title, + 'embedded': embedded, + 'content': content}) + + # return results + return results diff --git a/searx/engines/soundcloud.py b/searx/engines/soundcloud.py index 164a569a3..44374af6f 100644 --- a/searx/engines/soundcloud.py +++ b/searx/engines/soundcloud.py @@ -6,10 +6,11 @@ # @using-api yes # @results JSON # @stable yes -# @parse url, title, content +# @parse url, title, content, publishedDate, embedded from json import loads -from urllib import urlencode +from urllib import urlencode, quote_plus +from dateutil import parser # engine dependent config categories = ['music'] @@ -27,6 +28,10 @@ search_url = url + 'search?{query}'\ '&linked_partitioning=1'\ '&client_id={client_id}' # noqa +embedded_url = '' + # do search-request def request(query, params): @@ -50,10 +55,15 @@ def response(resp): if result['kind'] in ('track', 'playlist'): title = result['title'] content = result['description'] + publishedDate = parser.parse(result['last_modified']) + uri = quote_plus(result['uri']) + embedded = embedded_url.format(uri=uri) # append result results.append({'url': result['permalink_url'], 'title': title, + 'publishedDate': publishedDate, + 'embedded': embedded, 'content': content}) # return results diff --git a/searx/engines/vimeo.py b/searx/engines/vimeo.py index c66c4148a..fd945b319 100644 --- a/searx/engines/vimeo.py +++ b/searx/engines/vimeo.py @@ -7,7 +7,7 @@ # @using-api no (TODO, rewrite to api) # @results HTML (using search portal) # @stable no (HTML can change) -# @parse url, title, publishedDate, thumbnail +# @parse url, title, publishedDate, thumbnail, embedded # # @todo rewrite to api # @todo set content-parameter with correct data @@ -33,6 +33,10 @@ title_xpath = './a/div[@class="data"]/p[@class="title"]/text()' results_xpath = '//div[@id="browse_content"]/ol/li' publishedDate_xpath = './/p[@class="meta"]//attribute::datetime' +embedded_url = '' + # do search-request def request(query, params): @@ -56,11 +60,13 @@ def response(resp): # parse results for result in dom.xpath(results_xpath): - url = base_url + result.xpath(url_xpath)[0] + videoid = result.xpath(url_xpath)[0] + url = base_url + videoid title = p.unescape(extract_text(result.xpath(title_xpath))) thumbnail = extract_text(result.xpath(content_xpath)[0]) publishedDate = parser.parse(extract_text( result.xpath(publishedDate_xpath)[0])) + embedded = embedded_url.format(videoid=videoid) # append result results.append({'url': url, @@ -68,6 +74,7 @@ def response(resp): 'content': '', 'template': 'videos.html', 'publishedDate': publishedDate, + 'embedded': embedded, 'thumbnail': thumbnail}) # return results diff --git a/searx/engines/youtube.py b/searx/engines/youtube.py index 973e799f8..59f07c574 100644 --- a/searx/engines/youtube.py +++ b/searx/engines/youtube.py @@ -6,7 +6,7 @@ # @using-api yes # @results JSON # @stable yes -# @parse url, title, content, publishedDate, thumbnail +# @parse url, title, content, publishedDate, thumbnail, embedded from json import loads from urllib import urlencode @@ -19,7 +19,11 @@ language_support = True # search-url base_url = 'https://gdata.youtube.com/feeds/api/videos' -search_url = base_url + '?alt=json&{query}&start-index={index}&max-results=5' # noqa +search_url = base_url + '?alt=json&{query}&start-index={index}&max-results=5' + +embedded_url = '' # do search-request @@ -60,6 +64,8 @@ def response(resp): if url.endswith('&'): url = url[:-1] + videoid = url[32:] + title = result['title']['$t'] content = '' thumbnail = '' @@ -72,12 +78,15 @@ def response(resp): content = result['content']['$t'] + embedded = embedded_url.format(videoid=videoid) + # append result results.append({'url': url, 'title': title, 'content': content, 'template': 'videos.html', 'publishedDate': publishedDate, + 'embedded': embedded, 'thumbnail': thumbnail}) # return results diff --git a/searx/settings.yml b/searx/settings.yml index e30c52256..70c56fccd 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -35,6 +35,10 @@ engines: engine : currency_convert categories : general shortcut : cc + + - name : deezer + engine : deezer + shortcut : dz - name : deviantart engine : deviantart diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index 34a44f51b..c2006d27d 100644 --- a/searx/static/themes/oscar/js/searx.min.js +++ b/searx/static/themes/oscar/js/searx.min.js @@ -1,2 +1,2 @@ -/*! oscar/searx.min.js | 19-12-2014 | 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")}),$(".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/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)})}); +/*! oscar/searx.min.js | 04-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 diff --git a/searx/static/themes/oscar/js/searx_src/element_modifiers.js b/searx/static/themes/oscar/js/searx_src/element_modifiers.js index dd45b77e0..00c7f09a6 100644 --- a/searx/static/themes/oscar/js/searx_src/element_modifiers.js +++ b/searx/static/themes/oscar/js/searx_src/element_modifiers.js @@ -63,6 +63,18 @@ $(document).ready(function(){ $(this).toggleClass(btnClass); $(this).toggleClass('btn-default'); }); + + /** + * change text during btn-toggle click if possible + */ + $('.media-loader').click(function() { + var target = $(this).data('target'); + var iframe_load = $(target + ' > iframe'); + var srctest = iframe_load.attr('src'); + if(srctest === undefined || srctest === false){ + iframe_load.attr('src', iframe_load.data('src')); + } + }); /** * Select or deselect every categories on double clic diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 6ab26132e..3e58588cc 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -5,8 +5,20 @@ {% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} +{% if result.embedded %} + • +{% endif %} + {% if result.content %}

{{ result.content|safe }}

{% endif %} +{% if result.embedded %} +
+{% autoescape false %} + {{ result.embedded }} +{% endautoescape %} +
+{% endif %} +
{{ result.engine }} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index ef4c5dd83..187f5dfed 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -5,6 +5,10 @@ {% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} +{% if result.embedded %} + • +{% endif %} +
{{ result.title|striptags }} {{ result.engine }} @@ -12,6 +16,14 @@
+{% if result.embedded %} +
+{% autoescape false %} + {{ result.embedded }} +{% endautoescape %} +
+{% endif %} +
{{ result.engine }} From b918cd2b8e842f06beb7ce7be65321422772950e Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 5 Jan 2015 02:09:11 +0100 Subject: [PATCH 52/62] Whitespace correction --- searx/static/themes/oscar/js/searx.min.js | 2 +- searx/static/themes/oscar/js/searx_src/element_modifiers.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index c2006d27d..d0640f110 100644 --- a/searx/static/themes/oscar/js/searx.min.js +++ b/searx/static/themes/oscar/js/searx.min.js @@ -1,2 +1,2 @@ -/*! oscar/searx.min.js | 04-01-2015 | https://github.com/asciimoo/searx */ +/*! oscar/searx.min.js | 05-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 diff --git a/searx/static/themes/oscar/js/searx_src/element_modifiers.js b/searx/static/themes/oscar/js/searx_src/element_modifiers.js index 00c7f09a6..8e4280548 100644 --- a/searx/static/themes/oscar/js/searx_src/element_modifiers.js +++ b/searx/static/themes/oscar/js/searx_src/element_modifiers.js @@ -70,10 +70,10 @@ $(document).ready(function(){ $('.media-loader').click(function() { var target = $(this).data('target'); var iframe_load = $(target + ' > iframe'); - var srctest = iframe_load.attr('src'); - if(srctest === undefined || srctest === false){ + var srctest = iframe_load.attr('src'); + if(srctest === undefined || srctest === false){ iframe_load.attr('src', iframe_load.data('src')); - } + } }); /** From 0ca04be55dec06c5ef737febb128d3dc36c3b5d7 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 5 Jan 2015 20:24:33 +0100 Subject: [PATCH 53/62] Remove print --- searx/engines/deezer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/searx/engines/deezer.py b/searx/engines/deezer.py index 6c26b6aeb..433ceffa1 100644 --- a/searx/engines/deezer.py +++ b/searx/engines/deezer.py @@ -43,7 +43,6 @@ def response(resp): # parse results for result in search_res.get('data', []): if result['type'] == 'track': - print result title = result['title'] url = result['link'] content = result['artist']['name'] +\ From 67bd68b5e56a2285bc9cd39cf2e206f95fe1ab2b Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 5 Jan 2015 20:25:47 +0100 Subject: [PATCH 54/62] Put media above result content Mimick more closely usual video viewer (video above, details below) --- .../templates/oscar/result_templates/default.html | 4 ++-- searx/templates/oscar/result_templates/videos.html | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 3e58588cc..25506b2f5 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -9,8 +9,6 @@ • {% endif %} -{% if result.content %}

{{ result.content|safe }}

{% endif %} - {% if result.embedded %}
{% autoescape false %} @@ -19,6 +17,8 @@
{% endif %} +{% if result.content %}

{{ result.content|safe }}

{% endif %} +
{{ result.engine }} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 187f5dfed..32000e662 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -9,13 +9,6 @@ • {% endif %} -
-
- {{ result.title|striptags }} {{ result.engine }} - {% if result.content %}

{{ result.content|safe }}

{% endif %} -
-
- {% if result.embedded %}
{% autoescape false %} @@ -24,6 +17,13 @@
{% endif %} +
+
+ {{ result.title|striptags }} {{ result.engine }} + {% if result.content %}

{{ result.content|safe }}

{% endif %} +
+
+
{{ result.engine }} From cacdb064db434d7775ffa9bf2e88433de3a5e6e8 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 5 Jan 2015 20:26:49 +0100 Subject: [PATCH 55/62] Updated translations --- searx/translations/de/LC_MESSAGES/messages.mo | Bin 5402 -> 5402 bytes searx/translations/de/LC_MESSAGES/messages.po | 38 ++++++-- searx/translations/en/LC_MESSAGES/messages.mo | Bin 5000 -> 5152 bytes searx/translations/en/LC_MESSAGES/messages.po | 34 +++++-- searx/translations/es/LC_MESSAGES/messages.mo | Bin 5207 -> 5131 bytes searx/translations/es/LC_MESSAGES/messages.po | 44 ++++++---- searx/translations/fr/LC_MESSAGES/messages.mo | Bin 5496 -> 5675 bytes searx/translations/fr/LC_MESSAGES/messages.po | 34 +++++-- searx/translations/hu/LC_MESSAGES/messages.mo | Bin 5168 -> 5168 bytes searx/translations/hu/LC_MESSAGES/messages.po | 38 ++++++-- searx/translations/it/LC_MESSAGES/messages.mo | Bin 5172 -> 5101 bytes searx/translations/it/LC_MESSAGES/messages.po | 44 ++++++---- searx/translations/ja/LC_MESSAGES/messages.mo | Bin 5115 -> 5028 bytes searx/translations/ja/LC_MESSAGES/messages.po | 44 ++++++---- searx/translations/nl/LC_MESSAGES/messages.mo | Bin 5198 -> 5198 bytes searx/translations/nl/LC_MESSAGES/messages.po | 38 ++++++-- searx/translations/tr/LC_MESSAGES/messages.mo | Bin 5415 -> 5415 bytes searx/translations/tr/LC_MESSAGES/messages.po | 83 ++++++++++++------ 18 files changed, 281 insertions(+), 116 deletions(-) diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo index bcfe9dd56290a0156a2f610016a0bd979d74be74..071aa02ad9e4ce7e3b5de935f1a7eb6acd733c38 100644 GIT binary patch delta 26 hcmbQGHA`!Q1P`yNu7RPhfvJL#ft8`zW>ucA8~|LM2EzaV delta 26 hcmbQGHA`!Q1P`x?uAz~xk-37QiIuVCW>ucA8~|Mw2G9Ti diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 1639d7898..084e91112 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"POT-Creation-Date: 2015-01-05 20:16+0100\n" "PO-Revision-Date: 2014-12-27 10:30+0000\n" "Last-Translator: pointhi\n" "Language-Team: German " @@ -21,11 +21,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" @@ -173,31 +173,31 @@ msgstr "Zurück" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "Such-URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "Ergebnisse herunterladen" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "Vorschläge" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "vorherige Seite" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "nächste Seite" @@ -276,7 +276,7 @@ msgstr "ändere das Aussehen von searx" msgid "Search results" msgstr "Suchergebnisse" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "Links" @@ -360,6 +360,16 @@ msgstr "Irgendetwas ist falsch gelaufen." msgid "cached" msgstr "Im Cache" +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "show media" +msgstr "Karte anzeigen" + +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "hide media" +msgstr "Karte verstecken" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "Bild ansehen" @@ -392,6 +402,16 @@ msgstr "Seeder" msgid "Leecher" msgstr "Leecher" +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "show video" +msgstr "Details anzeigen" + +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "hide video" +msgstr "Details verstecken" + msgid "Localization" msgstr "Übersetzung" diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo index 9d746c2b2788519a1ad87fe37f8eefbdd13d9c88..466f1956051c0f6c9f11d449e06eb56541fdb250 100644 GIT binary patch delta 1612 zcmb8vOGwmF6vy#XzNW@kqh^Sjf;cWT$3z!aqC)l}FvSFuq|j2Lj0#&+P7frJGQu82 z58SwtlCX_o5=o$lD}%I!hKnpvBd916>ie?`tsDN{&z=9h|8vg0|2ua0d$NKvzR=so zrHM7pozc{jKpzVgHy<5b2J|Oh`sm)#z#1-~oJ#Dj=WgG=Do1+V-IeuBGu~ zBZlC03wpPz8KIC0Ibk{fR5T zXsXcJ2th3<0aaKqm9~UVE^2E}qAERy3UC$mV3!;3K{mnqkk~eeEY`+Q^QTb%M`lq4 zFQX21EI~A$i7GG$$rH39H&Bk54D3an>NBWQJ&IhG!Ln6YA!-F>sDk&PANQjUSsMoM zGHOQ#P={?0Rlu;j{~9Co`yZ#HiY8Hk-=hM5a(+bx_>Bq>%CfYjUR1(pR3aa0-UigG zOFf@VQ&booq>i!*=_Vsst+01T?5+p6f zE(&Q>#0rx_`a{HoA|tU2FGgg65L8}OHxbtNCl55{`+45y-#PDjA9pj{8%lmG&b?}U zTKEg{_clj&|37CvW_+!S%L=@JKD>klIE;L4luJI|!4!^R2_DEZ+l)ssjD5(EJ;wEB zNqa`4n2s#2#syr7i>N?eqAGA17rJaCmSTnLuR|r$=-i76+=|+_9V@XL`C6Kb5_p6@ z;@eXi+W0l<;is_(-=m&r9+wis2JRQpi}egD(LJd3EvR(~)cA4qV<#43FRsF2)co5R zB);9Jp^T?6fOBrbFH{BopaK=}m|7UX3Jl_Y+=T~m2$jGO)O-(Fu+)lB39aQ4!Y#NQ zW0f9qo|D^pyp4Y=08VOa1s^Z6>8rp)VvuaH=9Kz z_{mHCRif{1!f#Z7zo-B{X6ZhF+Nc~AD2#Ee#xV9^8Q#Nl%gi#U`8(NMiSI`3(~L?W zff{e~Q-1|&rz3@@QLiG%i_)pBK?R7T7Mwv&t(`|5t{bSc@eqk=8C0NYRNxP&gy&I* z_M7X^;Xo)6Z_+i^paO3|Z5+W$Y(#Bz5|uzFDnK_by&_b}2T|{S2=zdBaVaru;68&C z)pF@nqJ^mS$#pceupBiZiWI@>ku?@WlC}hD!70s6(4iP!4U<4$)8o6I`_54eAMIQ3=gq2*08ZRWaqM!BSL3nox%;hDtE*`dd+z zJAz864Yltn)ch{Y)Bk@D4VCaBD!^sb#{H;?*HG{3Ix4{wszPIK`~@n&Br3p+yU(Kb z`GQJp0ps`+!`MXm^rL1cXpE=*b)G9FiGhxi^gy-mus>Q=8>xzH+f*Cfv32|Sh_5-% Gjs64OD1-t4 diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po index 07948d1a8..8973cecb3 100644 --- a/searx/translations/en/LC_MESSAGES/messages.po +++ b/searx/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"POT-Creation-Date: 2015-01-05 20:16+0100\n" "PO-Revision-Date: 2014-01-30 15:22+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -17,11 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" @@ -165,31 +165,31 @@ msgstr "" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "" @@ -265,7 +265,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "" @@ -346,6 +346,14 @@ msgstr "" msgid "cached" msgstr "" +#: searx/templates/oscar/result_templates/default.html:9 +msgid "show media" +msgstr "" + +#: searx/templates/oscar/result_templates/default.html:9 +msgid "hide media" +msgstr "" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "" @@ -378,6 +386,14 @@ msgstr "" msgid "Leecher" msgstr "" +#: searx/templates/oscar/result_templates/videos.html:9 +msgid "show video" +msgstr "" + +#: searx/templates/oscar/result_templates/videos.html:9 +msgid "hide video" +msgstr "" + msgid "Localization" msgstr "" diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo index e737b1cd7042b7779538d6355a895e2eb4d17f08..96e743c5756f064022f4741a75065eca53685bb1 100644 GIT binary patch delta 1430 zcmYM!Ur1Cz6vy#X?rQ3q>-q(~^sh^VlTC<22bqKq(vdMF|&5Wxid{%WA*?)}W2J2U6Z+0l1_GlA$>ny1_N zY~h>1_t9)U{r~LrnsHepw*=gWK0Jbn*n(UZ<2DC7un#-Yk7e;@%drXr*o?fg9?Ue0 zS}%<>Iv(IWe2K|8h6?lz6?hW4Y=+w+jHgrmncS2}o^ur{@LJTmo3RjgBbS}!rUbgt zM|`_PLknL=ZT=R{$2+JUJ;lF?VFk})n1orpRH6l_`K73N8&L0SFa>vDDmLLoJGzH(&&nz#G)~FUS!4iArb+SD=@N zI4r_wkVc4xO0pL{*o4Zk+4YB!OaP-wxB(wf0Y0Gud`B%Xfpz#B16a-Mbd2E5StNoQzmdh1XeDah8g2^Ih9EIDsT){vJPB|1GoT3kkf19n2R&0z`6X;vJiDh*SO~@ z)XwXjji|T>qcrrJpG2L~PSgTJs05y&Dl+2wM^PmnN6q_;+SwE?!8lH81ujGFbQfy= zVP^z2?zDR!y+T8o-9V~hcahE5FzPpbjrzav9+mL~DsUnvP4BZ%0rF9$UX4n;9P@D# zR^w4@#)rsdEBV`GeAL#{&<-k58P}pp-hetpr!a`^s6_9h0uMW1pyt0qRc;iO(75aW zfjWGXsQJ^Vb>rEM$MzGHh9;(>7D`8Dn2lPf7}>OyqsG;`{%xr72T(gchIJUm0(_2( v@t1$F)!XZh3-1Yc4f(fr#gcncN{WJ^qF_mOad2IzbTH4?mf$(@@BPI;odSg& delta 1507 zcmYM!Ur1Cz6vy#XxtY3K`Dati$fRs5E&qWeXoB@pRHS8P2uWH=$wDhZnQW+#U=m`H z{Urn|5EYY5&>*ldFo+5YdaxdR2r{A~At~$o+itX6?`Q7ZnK@_9&f4O8;|os2gk3T| zrTiuF_iV17{(sK6%($$cTR1kN8(S~}JCMsdxh=rE*oFNVi+ksrt-xdG!&c;#4dODh zppDRoq2nzs#!nc9v#3CkL{;E;ZgkmlT!N`ie?BUaEsi@;f%l`BXJWimFQN~{8H4sa@2c2dhj$Z!e(5E9jNhl zFp2oqOG6otqZi*f1HPjw@Dmj%f^BM|7gI3_ORxwJ;AK<--%#USWWiL6MkSQUZ8fgK zdAJ>e88mj$P)Qmv44YAbTAluj$foToDxpr)!hNXmL#Xi&Q5AfQ3NVIRcN{hD1(KV+ zMkV+@lKQJeQ_g@HRDj>80B%O<*^62z1r^AL#kc`|*nsiajlFZsMp5%mu(%ShL&a(2 z#w%+>y}#k1{=~A|baY`qhE6SCROr;A0<@wM7(|tD1ef9@#-YAoPP2J&C1#@n?{hqe zInXTU2|W)ny;>;tk%n?{x1#R=2@2{$U?HK@S(sP`qP0A;9BA3-G^ zz*IbiJMb3P==cAb2A7rdW7PydY6o?wjGIs;zkoVa4=@9VQHf5W0#7^sLd_2&yHJHt z33*ZdDX7D^4kPsY&!C}&^PCq2sEI|W3ENN!?nW(i7%7GYP~)1M{`08uSCDVXI#D~n zhZ;A8#rO!\n" "Language-Team: Spanish " @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "hace {hours} hora(s) y {minutes} minuto(s)" @@ -171,31 +171,31 @@ msgstr "Atrás" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "Buscar URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "Descargar resultados" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "Sugerencias" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "Página anterior" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "Página siguiente" @@ -271,7 +271,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "" @@ -352,6 +352,16 @@ msgstr "" msgid "cached" msgstr "" +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "show media" +msgstr "Medios sociales" + +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "hide media" +msgstr "Medios sociales" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "" @@ -384,6 +394,16 @@ msgstr "" msgid "Leecher" msgstr "" +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "show video" +msgstr "Vídeos" + +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "hide video" +msgstr "Vídeos" + msgid "Localization" msgstr "" @@ -404,15 +424,9 @@ msgstr "General" msgid "music" msgstr "Música" -msgid "social media" -msgstr "Medios sociales" - msgid "images" msgstr "Imágenes" -msgid "videos" -msgstr "Vídeos" - msgid "it" msgstr "TIC" diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo index ed0d6a4ecc504db1f8e490db19ef6095df10c467..c79c56f5b5ee71398382ee3d79ba5e02e4ab3cef 100644 GIT binary patch delta 1636 zcmYMzTSyd99LMp$rKPQIscX_^sgY^5OKY)07c>HcBFKs^bV0nVC@E%vMG!-TJwzA6 zGDLcciV_hLDxxUbm!gD%APefjii9k?P#E>l_qUvCnLVF#X3m`d|NLiWd_ix>d!3bh z*7$AbpT~c6f=2&;w^PhG><-OjjAJ@J!ZaL04jZOP#Sy%SUoacbO)@LQUM#^ub~>tdOv0`zJ*iq0s3(W zHUB;45#K)1QN}*Dk%RfD2~ku9R-gi{apyPVJjOe56CS}G_#BnM60+0$N@QumC!J1;W6Z}apy#$>V7}!{%ll5gQ$SB zP;m-T^NM}cpQJ6s2@WfxQOQ=h300_on^6I4Q2}>5+uilUsD)3W0-wQ+*n=hb33D-* z#jYipEkeZ|&Y=G4j1pB7ejszr&x6vAgQ$RW@Ggdtx7I#7eLUDw#`95uci=*-MXh%d z^;KO$Z7hy@d7q-zAMsr0Giu^EDxnb^Lt zVoy+|e}Msfg-Y}*&P4AgohmvxygAxw11i%t)Pf%B-&&C#{>UJFUhMgz=@DkqWGd5QI&9XKI@h5BSEB;$K_zeqcVP#H@C^oW+Vp{gDHSP! zrutYxORT=B#v0Xar)llHF{L`t*t*|c*r#sd!a%^6oRkp_M@qwyXu;yhveL4FqV(^R u3+ig>8e@A4n*Xl#cU+_U;#XQbX9PNnY8o1v{!NQtQOy6R{>|(S4E_PlzqFkI delta 1459 zcmYMzPe@cz6vy$SIhx~``Dci@6JW5!`;IVE5x`tTwqVlQ%7gws;IjkoYVrejmQ*;+h-`4~oS*$A#S z3)vGIX>?5Ea{Pu#xQGhmC8`2va-z$!aRuhN{%xp4>YRH}fe)hAZNWlpM-IEoNeK+2 zkNEbOh8BK>+WZ?##VOQ|X7FEPSi|)qda;_DO0*s|zY#Srh`N6glkp6uU^gzqUex%0 z%p$%G(NM+{=*LfPz#OUqzfpk_*`_A?F%PqFKi1+QypBrX2Wq^BESPGksDuKX*5f){ zg1a$PLZg9(O45OG*o_JlcKuh8Od#LdbQR7EZ6&ynac!^qf0yXX}lAFCp zCHUD({Z*n_H(&u3;14Q*k5RhzqZZ0V1LSd97Dftfgn4`R$-paPv{aoLW#e*w8= z5!8l;lBqwjY=n-d_#AmF?HmtE-o#QIMFswj8*v`BU@i|m7lG@vFnp(=C?Rq7VZz*DG1&*Lf#<6ay< zZFB*ZsD~Ft>xI&3=;d39+_NIofbFh-7iyPKJ%cLsFH}Mv zzQqFcVKY|XQGNe6Xsn?lhAgP6<)9`OqXJf871pA58p1m4M3wS2D!@BbMW&r!-2GYP zuz60Zq?c^9ZUE!;{pZq9NjIQMve^yT>aKU9DpKz}fNaW+qY`aJJ+dy>--oK?9n`v` zsDR@b#3?Mq5+(%{FzAmy@>F|zQj&tvj-=R_\n" "Language-Team: French " @@ -22,11 +22,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "il y a {hours} heure(s), {minutes} minute(s)" @@ -174,31 +174,31 @@ msgstr "retour" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "URL de recherche" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "Télécharger les résultats" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "Suggestions" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "page précédente" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "page suivante" @@ -277,7 +277,7 @@ msgstr "Modifier l'affichage de searx" msgid "Search results" msgstr "Résultats de recherche" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "Liens" @@ -362,6 +362,14 @@ msgstr "Il y a un problème." msgid "cached" msgstr "en cache" +#: searx/templates/oscar/result_templates/default.html:9 +msgid "show media" +msgstr "afficher le média" + +#: searx/templates/oscar/result_templates/default.html:9 +msgid "hide media" +msgstr "cacher le media" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "Voir l'image" @@ -394,6 +402,14 @@ msgstr "Sources" msgid "Leecher" msgstr "Téléchargeurs" +#: searx/templates/oscar/result_templates/videos.html:9 +msgid "show video" +msgstr "afficher la vidéo" + +#: searx/templates/oscar/result_templates/videos.html:9 +msgid "hide video" +msgstr "cacher la vidéo" + msgid "Localization" msgstr "Localisation" diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo index 69d4257b6a512ca65cf2188090844d48626add32..779684804f19a54a2a537b97c4483c7a2c38c456 100644 GIT binary patch delta 26 hcmdm>u|Z>l1P`yNu7RPhfvJL#ft8`zW>p?;4gg-Y1_1y7 delta 26 hcmdm>u|Z>l1P`x?uAz~xk-37QiIuVCW>p?;4gg;+1`YrK diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index d750a5350..0fd7a3481 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"POT-Creation-Date: 2015-01-05 20:16+0100\n" "PO-Revision-Date: 2014-12-22 16:11+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: Hungarian " @@ -20,11 +20,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "{minutes} perce" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} óra, {minutes} perce" @@ -170,31 +170,31 @@ msgstr "vissza" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "Keresési URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "Találatok letöltése" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "Javaslatok" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "előző oldal" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "következő oldal" @@ -273,7 +273,7 @@ msgstr "Megjelenés" msgid "Search results" msgstr "Keresési eredmények" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "Linkek" @@ -354,6 +354,16 @@ msgstr "Hiba történt" msgid "cached" msgstr "tárolt" +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "show media" +msgstr "Térkép" + +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "hide media" +msgstr "Térkép elrejtése" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "Kép megjelenítése" @@ -386,6 +396,16 @@ msgstr "Seeder" msgid "Leecher" msgstr "Leecher" +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "show video" +msgstr "Részletek" + +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "hide video" +msgstr "Részletek elrejtése" + msgid "Localization" msgstr "Nyelv" diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo index 5c102b87133f3c8a8e089279f0a5dbff76cf9105..1d79ba16196ee52aa7f2863ed7bb52acb9d67a5e 100644 GIT binary patch delta 1429 zcmYM!T}YEr9LMpKx|wscbZJ3K%F>N;wuP=2&~_CA=>_ctYJ#&a3=_H-IP79zL=p6c zEP|}7MuGI^vWp6oh=Q`Ku#2b(ML}6q7b2BV-(MU^9-q%S=Q+>$|Ihz9dN=UZpUzhl zWeh*N_^symVS#%8f8q{fxJ(zfVmyFu?86dFA(t8Awir)h7SE#>H#m){!*&c{Kk~?2 zz#3!HW`srs1NU($zQ9t4L2oHZ(WB9ya~1LHf+Rh`ywN5NeVXfEXFJw^(+(1<%hgx_NRpO_p)BOxpski9Ej~GQ4CssRe zx9&kDkU&+g4|P`3$7pDQj2*awY{uM11)MP1t}D z+>2eq(NmNo$zN}w5)aVz>UhB`z?Foa1|pe$%uRbn?6hDexY_?3Y92=W$M8=OvgmrjazUZUP2Wxfr@uf1&_oLz;qT-*Tc5o1t;00>lAynL3 zq&D*oRp6&c_Fr4{%?3=O63n0yL=&Zc9BQH!s6<{Y!qw=-CUoOX?3-iEb5x=_CRgD> zT#BcVsZA$po}L)?UxED$bmJq`t2oGu(y6USC1^(#@C?&%5cR6YQ1LUUckJS#!iAhw!ZXVK3tU}%2geq{W zwHUR4a!kj=Sc>PdOn?7lH29iA%ICG2{ip(}P!%6V4+c?(>N;j(4=T|JD*g+qfbXc4 z{kG$(QgIQexOmiIOrGuY{?lk^3w@|9&O}YL7FBs3s=xwNL8Z1|j*4$UC1^w?IBol_ z_I{`J8WwTC7gKNw<26Cjl7YRBD-L(yP_@4%rM9x7+HdL`{0;TySan5ZpsmbR+_od? eVoZ)NE8Ca7E+s1`cg^~NA5k^o|9!;oI`\n" "Language-Team: Italian " @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "di {minutes} minuti fa" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "di {ore} h e {minutes} minuti fa" @@ -171,31 +171,31 @@ msgstr "indietro" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "URL della ricerca" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "Scarica i risultati" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "Suggerimenti" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "pagina precedente" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "pagina successiva" @@ -271,7 +271,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "" @@ -352,6 +352,16 @@ msgstr "" msgid "cached" msgstr "" +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "show media" +msgstr "social media" + +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "hide media" +msgstr "social media" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "" @@ -384,6 +394,16 @@ msgstr "" msgid "Leecher" msgstr "" +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "show video" +msgstr "video" + +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "hide video" +msgstr "video" + msgid "Localization" msgstr "" @@ -404,15 +424,9 @@ msgstr "generale" msgid "music" msgstr "musica" -msgid "social media" -msgstr "social media" - msgid "images" msgstr "immagini" -msgid "videos" -msgstr "video" - msgid "it" msgstr "it" diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo index d44ee77a7a2b0aa7e6e5fb7b5ed9d3661b4e30ec..8d77e298ebf294bfd4a02a0ec5deee202aa32e95 100644 GIT binary patch delta 1429 zcmYM!Pe{{Y9LMpe+|+dI&qO8Emc*Qjqb*P?Fr-5r!i4FmW|Sik!b3T5Mf8JRvO`7L zB52Y@Y2jg*5Fvp<(Lw8ylprw)ipV7BU_nOp{;UTYzx`g%zu)uy{=R$IdT>1Giz%3+{SR3K5iu#M-QICO_)S3lj2s2BRGLKumanQjj6{Y*ocG3l(~&{ z#yBQJ!^gl3ZpBwvj(Jp|6;$9K$YuU;tHNRiHD1R}i3F^>QGxfN_U*zJJc(T9DmNvN zMi24LT^iari+cGSZo`MDH+qhR#ITco9?Q_rq!MjLJ>Q0Ut^+mSjb1#4TW|n3V-mIg zGS(8`T%)0kC$SP|?SeO`3cN!F`fSJ7uz~(B?7>~U{&5^eC9r^6{}EYYzM&HOi9vMJ zDZ&ssVHyz{DoH=OZ~&FzpdC*jFKsTM5=x;qzK&Xd2ep0-Rl#vofcvO@CsFIBkQ~e- zRDw^-sJ}||(k@s+1z1J}SVe8HhEZI{Mm);X)i{jV4J3kEx0lV7=mFF|hfo1~Q1gAL zpCXPEIOL`ND*bkT7@g7(DnK{tfh2ND%_Y=f%3uxVP;W4g3bcp{`~ekk6?I6z+i@>Z zHC}1;qvAF>G`LI$w-)TeLa9*+q)-7yP$f>IN}NIc*7s1AnnE4Y8SKP)q*%topq{I? z?m#^kK+QYtG+1j6TBAtPrXTg-S=9eR5|wcpbx0rB`B_wgFKmCox`YjkzegR?QljdR z#!v}7=0*h_Ge<*j@D`QPG6r!4b%=b_J&aYTK!;JK>_sJb!j7M|0kuGXl z&_kLjXm*h-P@jrQ46=eAq8pr~hb#(-z+&zDlYy4A^O-YeX8!+~GrKoZ{-k(5LkYJdIrD7KIYH zkD`l@Cx&_4`_YBFc&J1RP~%HcoE*lFap~!9D7my z2Qi-bW|WFDp1~OWXgmBu?Z97Dpb(a+fiakj@mPX;@G$nE5?Da>4nT!j zGp@oy^kh;wKt)^P#Q#`7G+)zeerc9O}@1 z$2?p@Hr3?OsB!zPo?tPT3YVFu&=&epD{!&DN+=pra3ktaIQ1?mpJ{y%tE-FAi>P!@& zURe!lTmu&4aZJD&jL^^G>sVRfwZPc=qtz9)iFH+#)fJ|(siLXTG*?$v)psUDAL%^k zJ|C8ok(Hg1y)7{-XZzONv7hd=;8e#u<@hEY?*qrz@A!rt-*v~=>UjGdZ=aoFuD$z9 K*FGNxt# diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index 0a329ca09..a2143906d 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"POT-Creation-Date: 2015-01-05 20:16+0100\n" "PO-Revision-Date: 2014-11-26 20:38+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: Japanese " @@ -20,11 +20,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "{minutes}分前" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours}時間と{minutes}分前" @@ -168,31 +168,31 @@ msgstr "バック" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "ダウンロードの結果" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "提案" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "前のページ" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "次のページ" @@ -268,7 +268,7 @@ msgstr "" msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "" @@ -349,6 +349,16 @@ msgstr "" msgid "cached" msgstr "" +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "show media" +msgstr "ソーシャルメディア" + +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "hide media" +msgstr "ソーシャルメディア" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "" @@ -381,6 +391,16 @@ msgstr "" msgid "Leecher" msgstr "" +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "show video" +msgstr "動画" + +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "hide video" +msgstr "動画" + msgid "Localization" msgstr "" @@ -401,15 +421,9 @@ msgstr "ウェブ" msgid "music" msgstr "音楽" -msgid "social media" -msgstr "ソーシャルメディア" - msgid "images" msgstr "画像" -msgid "videos" -msgstr "動画" - msgid "it" msgstr "情報技術" diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo index afa9438e1987ad141c07e68f40aaeb2ed611e02f..8035ab8c813b301cd621c763c2b9fa44e614c77b 100644 GIT binary patch delta 26 hcmX@7aZY1{1P`yNu7RPhfvJL#ft8`zW>p?d4gh4$23r6C delta 26 hcmX@7aZY1{1P`x?uAz~xk-37QiIuVCW>p?d4gh6F250~P diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index 3d3a9def9..ab22b36e5 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"POT-Creation-Date: 2015-01-05 20:16+0100\n" "PO-Revision-Date: 2014-12-11 13:50+0000\n" "Last-Translator: André Koot \n" "Language-Team: Dutch " @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "{minutes} min geleden" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} uur, {minutes} min geleden" @@ -171,31 +171,31 @@ msgstr "terug" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "Zoek URL" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "Downloaden zoekresultaten" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "Suggesties" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "vorige pagina" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "volgende pagina" @@ -274,7 +274,7 @@ msgstr "Wijzig searx layout" msgid "Search results" msgstr "Zoekresultaten" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "Links" @@ -357,6 +357,16 @@ msgstr "Er ging iets fout." msgid "cached" msgstr "gecached" +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "show media" +msgstr "toon kaart" + +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "hide media" +msgstr "verberg kaart" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "Toon afbeelding" @@ -389,6 +399,16 @@ msgstr "Aanbieder" msgid "Leecher" msgstr "Ophaler" +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "show video" +msgstr "toon details" + +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "hide video" +msgstr "verberg details" + msgid "Localization" msgstr "Vertaling" diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.mo index 5d6c0498f81fcdd744b53dcc188371196d418697..71d7aa114e02075ba3c0587f71451a375b12f952 100644 GIT binary patch delta 26 hcmZ3kwOnh11P`yNu7RPhfvJL#ft8`zW>p?0P5@m(1?vC+ delta 26 hcmZ3kwOnh11P`x?uAz~xk-37QiIuVCW>p?0P5@oI1^55} diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po index a39ae3fd8..eb5655b76 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.po +++ b/searx/translations/tr/LC_MESSAGES/messages.po @@ -1,30 +1,30 @@ -# English translations for PROJECT. +# English translations for . # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# +# This file is distributed under the same license as the project. +# # Translators: # Caner Başaran , 2014 # FIRST AUTHOR , 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-12-27 14:39+0100\n" +"POT-Creation-Date: 2015-01-05 20:16+0100\n" "PO-Revision-Date: 2014-12-28 08:20+0000\n" "Last-Translator: Caner Başaran \n" -"Language-Team: Turkish (http://www.transifex.com/projects/p/searx/language/tr/)\n" +"Language-Team: Turkish " +"(http://www.transifex.com/projects/p/searx/language/tr/)\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -"Language: tr\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: searx/webapp.py:247 +#: searx/webapp.py:263 msgid "{minutes} minute(s) ago" msgstr "{minutes} dakika() önce" -#: searx/webapp.py:249 +#: searx/webapp.py:265 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} saat(), {minutes} dakika() önce" @@ -142,9 +142,11 @@ msgstr "Engelle" #: searx/templates/default/preferences.html:92 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store this " -"data about you." -msgstr "Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda veri saklamak için değil." +"These settings are stored in your cookies, this allows us not to store " +"this data about you." +msgstr "" +"Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda " +"veri saklamak için değil." #: searx/templates/courgette/preferences.html:94 #: searx/templates/default/preferences.html:94 @@ -168,31 +170,31 @@ msgstr "geri" #: searx/templates/courgette/results.html:12 #: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/oscar/results.html:87 msgid "Search URL" msgstr "Arama Bağlantısı" #: searx/templates/courgette/results.html:16 #: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/oscar/results.html:92 msgid "Download results" msgstr "Arama sonuçlarını indir" #: searx/templates/courgette/results.html:34 #: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/oscar/results.html:67 msgid "Suggestions" msgstr "Öneriler" #: searx/templates/courgette/results.html:62 #: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/oscar/results.html:41 msgid "previous page" msgstr "önceki sayfa" #: searx/templates/courgette/results.html:73 #: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/oscar/results.html:49 msgid "next page" msgstr "sonraki sayfa" @@ -221,7 +223,9 @@ msgstr "Gücümün kaynağı" #: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta arama motoru" +msgstr "" +"kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta " +"arama motoru" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" @@ -258,7 +262,10 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "Aramaların nasıl gönderildiğini değiştir, istek yöntemleri hakkında daha fazla bilgi" +msgstr "" +"Aramaların nasıl gönderildiğini değiştir, istek yöntemleri hakkında daha fazla bilgi" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -268,12 +275,11 @@ msgstr "searx yerleşim düzenini değiştir" msgid "Search results" msgstr "Arama sonuçları" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:82 msgid "Links" msgstr "Bağlantılar" -#: searx/templates/oscar/search.html:6 -#: searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Aramayı başlat" @@ -311,7 +317,9 @@ msgstr "Uyarı!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i etkinleştirin." +msgstr "" +"Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i " +"etkinleştirin." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -325,7 +333,9 @@ msgstr "Üzgünüz!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "herhangi bir sonuç bulamadık. Lütfen, başka sorgu kullanın veya daha fazla kategoride arama yapın." +msgstr "" +"herhangi bir sonuç bulamadık. Lütfen, başka sorgu kullanın veya daha " +"fazla kategoride arama yapın." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -350,6 +360,16 @@ msgstr "Bazı bazı şeylerde problem olmuş." msgid "cached" msgstr "önbellek" +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "show media" +msgstr "haritayı göster" + +#: searx/templates/oscar/result_templates/default.html:9 +#, fuzzy +msgid "hide media" +msgstr "haritayı gizle" + #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" msgstr "Görseli indir" @@ -382,6 +402,16 @@ msgstr "Besleyenler" msgid "Leecher" msgstr "Sömürenler" +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "show video" +msgstr "ayrıntıları göster" + +#: searx/templates/oscar/result_templates/videos.html:9 +#, fuzzy +msgid "hide video" +msgstr "ayrıntıları gizle" + msgid "Localization" msgstr "" @@ -419,3 +449,4 @@ msgstr "haberler" msgid "map" msgstr "harita" + From 5e26ce63be9a04b3029dd77c94d39fe8f6902fc6 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 5 Jan 2015 20:55:56 +0100 Subject: [PATCH 56/62] Don't create fuzzy translation --- utils/update-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/update-translations.sh b/utils/update-translations.sh index bac7d3c4c..2f9ab218f 100755 --- a/utils/update-translations.sh +++ b/utils/update-translations.sh @@ -9,7 +9,7 @@ SEARX_DIR='searx' pybabel extract -F babel.cfg -o messages.pot $SEARX_DIR for f in `ls $SEARX_DIR'/translations/'`; do - pybabel update -i messages.pot -d $SEARX_DIR'/translations/' -l $f + pybabel update -N -i messages.pot -d $SEARX_DIR'/translations/' -l $f # TODO - need to fix category translations sed -i 's/#~ //' $SEARX_DIR'/translations/'$f'/LC_MESSAGES/messages.po' done From a723936ad4d36a8454f98017cf611ebd02343147 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 5 Jan 2015 20:56:48 +0100 Subject: [PATCH 57/62] Updated translations without fuzzy translations --- searx/translations/de/LC_MESSAGES/messages.mo | Bin 5402 -> 5554 bytes searx/translations/de/LC_MESSAGES/messages.po | 14 +++++--------- searx/translations/en/LC_MESSAGES/messages.mo | Bin 5152 -> 5152 bytes searx/translations/en/LC_MESSAGES/messages.po | 2 +- searx/translations/es/LC_MESSAGES/messages.mo | Bin 5131 -> 5283 bytes searx/translations/es/LC_MESSAGES/messages.po | 14 +++++--------- searx/translations/fr/LC_MESSAGES/messages.mo | Bin 5675 -> 5675 bytes searx/translations/fr/LC_MESSAGES/messages.po | 2 +- searx/translations/hu/LC_MESSAGES/messages.mo | Bin 5168 -> 5320 bytes searx/translations/hu/LC_MESSAGES/messages.po | 14 +++++--------- searx/translations/it/LC_MESSAGES/messages.mo | Bin 5101 -> 5253 bytes searx/translations/it/LC_MESSAGES/messages.po | 14 +++++--------- searx/translations/ja/LC_MESSAGES/messages.mo | Bin 5028 -> 5180 bytes searx/translations/ja/LC_MESSAGES/messages.po | 14 +++++--------- searx/translations/nl/LC_MESSAGES/messages.mo | Bin 5198 -> 5350 bytes searx/translations/nl/LC_MESSAGES/messages.po | 14 +++++--------- searx/translations/tr/LC_MESSAGES/messages.mo | Bin 5415 -> 5567 bytes searx/translations/tr/LC_MESSAGES/messages.po | 14 +++++--------- 18 files changed, 37 insertions(+), 65 deletions(-) diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo index 071aa02ad9e4ce7e3b5de935f1a7eb6acd733c38..d380018653fa024634aa208c9e03c8a0c520a2ef 100644 GIT binary patch delta 1597 zcmZY9Sx8k;6vpx8l(V<=nkJe`=9F4gijazi5%~~SNMV8$8cN805Nx!YgcU)FXp<87 z5(QC#LP97sAwtBRFOh22+UAx2{bDo_n_*+CknS|hH-WA1q;Dv@qy4=V6&)V>d~0G}b3&C@7>Ul>Dt zTcV?lBS>F|_uv|gM=r~v2_%M<+*e=}`ca8qL9M@mT6f2dKgL+@pP~mRF%D-?^FL!M z@oj;QGLGgLiI|R>P>iZT87j~o_q-0Xxo^M&cmWUNG%A5@WT*MNkgaVWD&cyX9BjrA zyo&xUbb9HiBrh-&Cs7GZx##bYBH4RXLUX8%zay9Zc7_mD>*G-C6HpaRK?O`h#mPj? z%ZaA`By9ye;Ia}Lm29V*P>Tv!hYENU74W#T!;N>LHok@m+>iTl5OZ+>lQ4AgcBtjJ*a<1CD?_%sFNqKn*!yb5-CNUv-W8Lb8&D@KLIo;DmAuqhfvQL~D$!ch zNgGioZ$l;2iHdUx;gM;~R;S3NLtDy%Zh+uGEe z(bnA5dc<1P?V$1XjYc(kTYM+nK)bqufe~-CCn&gh`^d(av*C$>1^=xbO6X1utXLWO Kx419MyZ9HhBBJvE delta 1447 zcmYMzT}V@59LMp$)480}rEM-`WiM=+Sr$k)C5VSRsfps}6LbIy65=l^of?k?}EPE3{Noi{#B z{KEXkT{`>!X?2_NwKfhOJc&L$g9X@&d@apk4qnHrcn9aRs6;k7ZbJp$i`w@P*5C=`Yl9q=z&-R4 z--Z}y$#~!H>1`!q1H8{?jOb?JdS?sz+&u0%^$!p z@$D7^WjuyKeD6${L3Q94Do_DsYGDwg7{;Br5%=K*R07{n^W9{@QY%3vRL-FiBbbX@ zF|mrlb_Qxm67#SF6{yp>-h&iveW--esEu!<=HExnA3=5S5h}nF)V^b=c@s!(_8OJo z2QU3si>93kKTrXFqXPJtrSl+aqa~<7Rk#Cdu?mwI!W-C=WA+fWeh-@~-~rS-(}LWx zBoe~T7SVrAxX6Vp_Txf~^Pnp57}n@MYQbaF{Rz~|^%du1E)Q6(52MakB3oGlD&bwY z4ELkrokkVbonW9$FQcCQHPpK>jBD{Fs`WnJKy@I1T3C*{UWsaLEh=CgYQGIgZngy* zFper9jhZ)zN-QzNK$VQ57EU@7rckY#Ms4&RwZKD}E3g=q=sH}4jYzI`1QnniwZ03L z=p~F|KgRJHw(I{NA-XCbKm{5>B{GhxbQ1LlKB8VOKT+$k6xGT`RDd{Y-9hKP#kqeJ zS!!)a4c3k7#1+if|NkZfZJa^1IO{l!s$dkA*mG26?@*O~MkVkQwXr+!Z(f;W1hu{n u)wvjUVFOm<8w}~$xiSyjF?Y&e*qlig7Uj5BugRSAwR%!Z1E*3Wftf$>z=Dea diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 084e91112..6c6a53da8 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-12-27 10:30+0000\n" "Last-Translator: pointhi\n" "Language-Team: German " @@ -361,14 +361,12 @@ msgid "cached" msgstr "Im Cache" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "show media" -msgstr "Karte anzeigen" +msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "hide media" -msgstr "Karte verstecken" +msgstr "" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -403,14 +401,12 @@ msgid "Leecher" msgstr "Leecher" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "show video" -msgstr "Details anzeigen" +msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "hide video" -msgstr "Details verstecken" +msgstr "" msgid "Localization" msgstr "Übersetzung" diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo index 466f1956051c0f6c9f11d449e06eb56541fdb250..c3099bf2422418b5b018e597e5cf5ea9897b62dc 100644 GIT binary patch delta 15 WcmZ3Wu|Q+P3?3#^lg+bu+SmatWCb<= delta 15 WcmZ3Wu|Q+P3?3#!v(2-3+SmatR0T8u diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po index 8973cecb3..cd807e6ac 100644 --- a/searx/translations/en/LC_MESSAGES/messages.po +++ b/searx/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-01-30 15:22+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo index 96e743c5756f064022f4741a75065eca53685bb1..8a36374f603a6295546ffef4af0d58369525d1f7 100644 GIT binary patch delta 1567 zcmZ|PTS(MF6vy$Ssax*aMOTY5vCzB_V$qU>p+xo)N*F{KA)=NRn?z*zQ2QEMSc!C@ ziz$*M2C;%-K_rApR8%NZ;)@R!fm%iniq!XK1HIJp-}%hWe`e14pZ{o6W=B?NB0j3s z_#Eb&%y&Fezy5x1N1Jik9U2dIpbxuo1@@ zvyhF`iDzIQS7RJeyqJOtl#L3!lZGi)fJwN|jUPoNQthlm1#Up?dl|Q48*fvW_4Sq*GQ54NmVpz!U6pY1kRH7$P>+4bL&b#}~7{~8hxC*;)CHAA{ z4`DL#?F}7e{1p@Nmz$8tW2pkks6bh$g#p}x`FId3@d);z5=bCB%}++Uz9 z_P>Uz^gUGK-N+#h*<(5-42)qAGx(#WYptjS4^U4KMrHgIRq`R!p_;*5oI@p=Mixpe z#~DDa&&Q<-p%N-y8t46&(b2}0&Qqw<*?`*c0xHl&H+~7V(N)yOH&F?Y|9EU`Qs|_ZJ5m@7~XO&wI{!p7ZSJ<k{B#0k{APpF+u;UY}sq}JjR)K1$` z^Y=T$sBy>L`^Y64%IrE)6&ph~W8AI&#lq++)aN0aZ`cz diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index 5f00782ac..6f336bf11 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-11-26 20:38+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: Spanish " @@ -353,14 +353,12 @@ msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "show media" -msgstr "Medios sociales" +msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "hide media" -msgstr "Medios sociales" +msgstr "" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -395,14 +393,12 @@ msgid "Leecher" msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "show video" -msgstr "Vídeos" +msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "hide video" -msgstr "Vídeos" +msgstr "" msgid "Localization" msgstr "" diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo index c79c56f5b5ee71398382ee3d79ba5e02e4ab3cef..37507f2f4353f663144124692a8e20ff6c150336 100644 GIT binary patch delta 15 WcmZ3jvs!0EKM#|s$>xbXvp4}RtOZyA delta 15 WcmZ3jvs!0EKM#|k+2)Bnvp4}RoCQ_@ diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po index 4d2c3d587..6afff3871 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.po +++ b/searx/translations/fr/LC_MESSAGES/messages.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-12-14 21:00+0000\n" "Last-Translator: Cqoicebordel \n" "Language-Team: French " diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo index 779684804f19a54a2a537b97c4483c7a2c38c456..f4d56666f2ad70ad1564b0daa16204c83f364724 100644 GIT binary patch delta 1597 zcmZY9O-R&17{~F)w={Rva@Q<#Q6qH&E5Q_k5HmaEr7|SaK*|?ZBP0t$skSIP1Q}r# zy&Z!fB0)&$1tKMckRl|lL&QSpp;iovqz-+5+kl5;oX`Ac{xi=r^B)}wPHYH&%1j(I zej51A<@am6o|b-|C7Ds|IaM-_p%-7{a-2bmMW|A64)5Ut`tZgwvjTj8L7YT}>?a1y z!uE$oCLKAfz5+L*2P;v5YLR05sd&|za22+>{?n*L`kYr#fp4PLeTXIa0x9;5N(uZx zFY)a+4K18P`r3R3uEb2F*m|m1VpzpR?DquY-;9*q2BhGF&eh#&8KPvDwti#(F#3*KCHj53# znQcaWiqC1BzY>@yY7Q8f?j(&WLO7IJ6!Fi-u8aJ{81E@r6QR~#9PU3)jZbBV> z8|rR!xaU)-zmD)(8Z|Tqa5c^#o3RB{BATTgc~PGxi0ZFEB~p#rQ5`CQkbCaLbv*Z> z*1M0IH-ftCW5~&dZQ2b)Q2&6U*oGd`Q(|4HPcwoF^bU0*bEtsd-S{HvQu$eZJFY>U zOe5;OX7}9T>_Xi?>!qQEFCxY6Q0bcwIiI2~-z(HYZ&0`Tz3cyg3LJ6cv&bGSirTrp zqfRaZl~4e+ej%o4ho!D#tFs1~Yr9bsn^6;wVLtYt?!qn9Cm0>>NvcZnx3{$BA8l=E zKV%^_yQw+{MpB#nq0W-`IsKcTz; delta 1447 zcmYM!O-PhM9LMp$FT19$Z|iQB8QMa+f|y-86&cwj6X^vtLg-KuXmlt7!`j%b5MmFp zhEmXr5ecCw+k1K{QraNuAl1PN!c*cwA`sd7{$!x#+4;;oGtd10GtcbK)Q*QEbN=k> z#;1*M1>g6XYW@H8dCa)%JVg%1(1%ws7l)9`hAGzI2;RpDEX8)O*(U79FvgKCdx{&) zA~s3I&yBBGj0>2LX;h#*qAGA11-Gmc*J8E1zXO%X9%m~m@L|-vC$SDMBA1O)D1j&F zBfh<&qKRivi~oQn_zAV5pSYSBHquUG9`2-5iS9)`--ddw6V-nT3-BBkVLuk)5NiAb ztRTLPQBlSz4B|I8;5TXqR#1U*S*9KgVl`IaLEMc;a1fQi5^B7MEO^vPPzjY&)Zk{! z!WN7)P}xsKTN1@=>_-KPyZZykqU{DMp<&d-k5J>EqsC96cJK`l^$1}`cqqh1ClPh2h%Q230 z*$8Suj|hP|i>W5{K9De7_C?#hh53{s1;% z4X(o;BsaT^N+dEsMJu|4EZ!zv$2(*$n?O$>EA1dG#*B?h6q7mGMqo|!(M2-97+G(ekER;|o zYTj~GVht2JTTSTI@4tnLPVFJr(T)mqbajB)aU@ymL9O%xYNz6;1a6{MdJi@67;@P& z3XMyl#(lvm{DFGanH+#31*%HE@HBc7Mfsh{XnsLP=GJY=Yre{y#M{!-iPk{xKhRl& A=>Px# diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index 0fd7a3481..16f021740 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-12-22 16:11+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: Hungarian " @@ -355,14 +355,12 @@ msgid "cached" msgstr "tárolt" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "show media" -msgstr "Térkép" +msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "hide media" -msgstr "Térkép elrejtése" +msgstr "" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -397,14 +395,12 @@ msgid "Leecher" msgstr "Leecher" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "show video" -msgstr "Részletek" +msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "hide video" -msgstr "Részletek elrejtése" +msgstr "" msgid "Localization" msgstr "Nyelv" diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo index 1d79ba16196ee52aa7f2863ed7bb52acb9d67a5e..ce22605aef9e11b1ea6f1c1a52e979c234e618d7 100644 GIT binary patch delta 1567 zcmZ|PTS$~a7{>8e^H8o<>S{%sX{DMx zzzo3@BXB{HuJ$Iou;{`H5)lkKQDQ|GTGap1fo^Kqo!@-(&CL7GK|lMiWd$Y@B5oO< zqx^jQ#>4gW_j4!GjIZ6Lh{pREi+#8Rhmfy@C>G-gcH;|7#HJ{-G;G04>_=YNOI%|X zuyHC0G|b|1j3bH%Q&536q5|hp(8cmG8TY&PW2i)`o%N`|&8T@>F&jIPuZ>bDfia9F zzP+KMiQl6ZKaKJD6}6%WiuuH_faes9!E#ihr%>Y?QR6PS_t!Cw=MG$kJ-8HyQ2n2v zkNEbCiZcF$N%-4!NMc#q0Us(*7HVKFX5el-jFni1gQx@&$xi*#k*RD8D&buee%yzP zunq$`RL)S*mULkR_MigwyY?Wm88(bcD1@5$Ir6pF&MDORFR1a~P&+z{3it~ZCyeaW zFWSTYleERspp26#v}NmDha6PETvWil$Q)MaJc63A0*mn^X5uiez$ttfW;Tb4)63*q zNDx=z<2d$T6OPfKj3-eY-(fe-ppK@UgVQbULj@Q`1^$5>@F(i%(l}`K&qJMgA%!k$ z87lBuRGf3J{c^y)xQzFh;K6vWjyg1W_TQ4_^;BbC4^)DEphO`MI|@@=TwzXP>% z2XH+WV*xgz79JRMl@Ka{QPkGGLS3e5)C6HX=sAXh#hMQla1-kP##U6qhfq6F>E1V^ z61?PWMJ=EMGxYc0MWuv>r+6IGNSmr%L5|ICq7vvtW&8mB7(`vFam>L^`Dw?>&c>;Ai>*hOfW~ePakJ|E!sEMzlR?>n>xD7Q=w|jns z>K{S{96=>EhUzyV)2V!*qK@CO7-umR4|*3a&uQ;KX=Hw+x3;P}wXV9Vw!&&uZKSAg qYmX`S*3>t-7Y(W|yeLa7Z7cHJ3(ws?Fyonv`uFIM2@U@ned7<);icFB delta 1418 zcmYM!T}YEr9LMpKxs`LXbZS9L$;z!VQ;<~`>aJoSR%lez2D-X1#3&dz>f!-Iil8^f zB6_=O6i9E5by0y5QBZajb`dq9DCiCALc|Q}`-=mOXV2%Hv-6z)|NNh$!)w0>okB%% z#_-w6w}$VdBK7`%VlHF2Oq|;y+>c)D#}Z5-ml@)=7*Apr&!ZnVxs9pA4h-P{@{_rM zwZ=H+3XKW|9^g`ZiKSRT1^R*tJd0fB54UP`GpO-eZc1d0bt5Y97Sy_(*nmCAWlnQb z0vYrY-(04lg>RxZe+SEP6t$x#_%AVx&@Z3|SMsA0U59!;jC!sW_4{`8;a*&VeOQJm z)cg}zLws|FhB6+(Djc&DCQ%i5iwgAFj?Z8{{omM)0k*#n2T=*ULe2k(Off%E3H`z# zy67y#4d^t{Xr`f(B(NC!P#F%`@g%Zoa}<@(5NhGGsQDLB^RJ>RcpVks25Q|A)VzC0 z4(2{8!Eq1uSBWOXynPz%gp7tUh{xAF8c9K_oTNCdTT8;dE?C@#kx$Rp+; zD#0Xb-Z9MLu#fty^y_&sI;HKX0KKTdr*Ji%L%o_jYW@qqH$ID`><}r!<9nAd5=i7OEmS)WYMa5rfkL#Ciq01cL&xnQ=Dq?%eyabhDIVz!m?Kh%cNdy&OD=Lw0J08O>`UzZxdDIzr k?ay6uwY$>Oo_IP@I#<*j&c(g+?(`x55&C=5ot2ya0+~XA+5i9m diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index 9b47f59ff..3a49ca7fe 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-11-26 20:38+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: Italian " @@ -353,14 +353,12 @@ msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "show media" -msgstr "social media" +msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "hide media" -msgstr "social media" +msgstr "" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -395,14 +393,12 @@ msgid "Leecher" msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "show video" -msgstr "video" +msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "hide video" -msgstr "video" +msgstr "" msgid "Localization" msgstr "" diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo index 8d77e298ebf294bfd4a02a0ec5deee202aa32e95..0b25be7a6e33c284a08441b5189dc65e5f70b991 100644 GIT binary patch delta 1568 zcmZ|POGuSL7{>8e^K$eYyXZLvdFeu4Di<1=5Rp>orh+gMD?%(K4aB0*T-5181WJUM zM3PXca4Kw(L26OqCJRzr6hUSSC8WUUwlTW=pW{G_NIvH`GvCa-@60#ao%Jv~IFT6D zZv2$C1Spw+0r1r!XiLQKXI*S`;yNVT&b6}Snt?gh-jYsh0SD3riU z^bz0QP|?EEsLg-EMfe4^qbQ1SVpv2w9pkYAmFOYV{07v#6Yl**OrYI?3owN9u^%=5 zDW($NMyM#`j~Kw;Za{!-=>$?yfmWd==3^#q#GQBm_u_q20!d`2@fpZcmWN7s14R}V z<2i=M#Kky?p$M}dsBzsa zu8rJ6t$R0t^H&0o>Ck{@sBbljJ@^jwY0mNCbc?T`0z5#CpF(c2eL!6{50g_c1&L_| zs6bm#fp?(dm7^~4{-Ar&g3Xp$1*93umE+E!Q)gk@vO5MHL=wV=t9=EJI+VQW^DvD?=9;8#uO^y2qx!CVeV@J8V*=qh|4eU9Z28~x=08ivp`QQ% delta 1418 zcmYM!T}abm6vy$Cxn*5Fvs=(S_EPlprw)ib$mB!lD+Bk!H`7Cb6N2oV?j`_r}gMJQu7-CY1Zbv=eih8acHQ$9LcnCM*0B*n-YW)SQ zBEDUrp^V3|3}@Ve*Qg4-MFslg##gb9{%`ETZM^+hl}IEo7J0JZNpYTX2qgFQwi z_|!-JRic+}!6GWa5-Pw7YJ*km#$Q;E2YI>zhcUB;L{RH?vY8UyjoN1)Dqs(4K7#rw z`f&`;lu&<_ehWX0PH7V=Ko{zP7;;MOJnAr|u@bYWH<&{OT0jMUj|#YgI;7v+cnMK8 zUgiv;;x@!-a9KOIM(o6VsZj|ePyt3zB~GDAoJRfD_fVCZKpoO4?7%ssSmtL?&s8|L zqMoZo&Bxnlu-5iEyOE?VihA%A>VF}I$~c8Oqz~Qv3@X7Fu0QWw#5%^`p$=&gQFTcB zPzgNYMg`+GOG9t)29?nghH)8nhyv8T8Ou?D_M=MKi%Rf_8$aR3PrLp()V>!{313I8 z&$#()zJHv5JU8*oP0XSyvf#!)y8dU^|AR`zLpc;6fcmK_u^VeJghQx(ZUiT9d-iye dUwn~dwD?CsOY3CBf8U!d4PK&uG#M;y_y\n" "Language-Team: Japanese " @@ -350,14 +350,12 @@ msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "show media" -msgstr "ソーシャルメディア" +msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "hide media" -msgstr "ソーシャルメディア" +msgstr "" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -392,14 +390,12 @@ msgid "Leecher" msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "show video" -msgstr "動画" +msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "hide video" -msgstr "動画" +msgstr "" msgid "Localization" msgstr "" diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo index 8035ab8c813b301cd621c763c2b9fa44e614c77b..df5e7f45bbd75c9846e1f9f89f3194f29bafdf14 100644 GIT binary patch delta 1596 zcmZwGT}V_x7{>AOdv(>#-BnApRQ!Yu12qW3Bnl}C%&-qFwNg6QYwPfizqKjBF!KpSc(46Hqb@Maei~=%)IYAbIwi_d@S_8b4T_Y z{%ZJ7=l@H%?*9IbMj69p9@50%6O6~_7>kq0WoBp`IE&Zu8+!0kv@uyYgatT`JTgBp z!x+C=qT^;Djp)m8H9D~jm1rw+ncXx@HT9T+&33#KRmd6ZIaK1ysJO%E!$-(v=4e#F zBF2;71nDTSgYva`7bc+_xl9gCs4y(&z6|5gk1Dhqwf-V%-BtViHYRXCf-W4xM4Uv; z|Agt}H}iBV$H5(V6H&y~^#l z0uQ0Sp-xmGJ*bTh`01$P0P3qAK~?q&xy&?;3iyml{2g^d4x+8Y6jb6$)CufC&9AfL zEvTbEiYn+hYQx>AUx&Y+P6eGo`(VKuL=_gz7quJ{P=)0on>9uDzRccNpc3!GY-~V6 zm@ZVJK2*FLsGZ+J3h|oNiD&Z(9(K9>#0=2W()+toH z_oz4vsJKDYMq|By;v`|*CI(ijgN4=-J7EJV@ix@LDy+g9)DaJ(PUdBxBdR>g+uGQa zd8Dba^?+$nx1FY~_g-ARx25f*eQ-?O(1U>2=?V)kEeYhtyJC_<3;tPK>^bq@wY>wL F!QXLTr4IlA delta 1451 zcmYMzTS!z<6vpwT&ZN#I^D<6_-3GJ~gbFIkilhiZD$Bs3LLs52&|WGitf?u;2$^b% zM0`moyHFX{pjHqW6c|N5^ia?Rq=!&~G6E6n|H+1iGv~MWKKtyo_B!W$D}NJ>e=6`? zF@E*@OZdOeRPX<<)oaFK$2n!=X$;_b%*77mux?H{coVPV11!YYEVCte0HfHBT(UGS zFpJw08U+k|z&SXMew;=H@)1>m!<-nhMOchwZhQkOkuAUEjUA}@ zJy=3~yGKJA4`T>Fy9vKh6_`Q=%4M6nF@$AUg1c}t?!~L91b(6Bd&z=ZEgzN8d`?TT z6ti#}#+TFBNkb(`paF|PKm~Y-T6Y*V?;Vnx zy+BqA@pN5*6StDnNi)>W5GZMNomFScl6niU|zk9lVucHiWvrnZ;Skj-X0^ z3b|w#P>FN}slOUG80f`b)T7wPY<&%fu@o<%D$tLM@fqq-eZ_hB2lbBR^PrVT1eJIt zD&cC>OS>JF*nZ@&mN;i6Z~_&$4avc}a4p_O1s+9JU<@_?ryHL_mD)peC6t5O@j}$w zUyjwd-i@DeCQ*sSJ88_NaSfH(AhH=7a{Uq4|A-3w9V0k_92Vw{Q=lkn!F8yeZ$c$f zi`u{*tiUF0z$7;6`yZ#F%(t?No=p>~0xhV8T2VKiL%m#ST!jOum+A+qG83o`OrjFa zqMYgnks?_!YTYu_{FONK{a4b^!qx6V4QeMloH5h_ji?>9pcXoc+SyrDqDgnX%k_Iu zfgYmf4PqTWM^!LX#9upD(>LI)@}~0q4SflJFe7ut>b{GCyzErE@K7q@52s>9$$w$J BgDn66 diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index ab22b36e5..e3be7a90e 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-12-11 13:50+0000\n" "Last-Translator: André Koot \n" "Language-Team: Dutch " @@ -358,14 +358,12 @@ msgid "cached" msgstr "gecached" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "show media" -msgstr "toon kaart" +msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "hide media" -msgstr "verberg kaart" +msgstr "" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -400,14 +398,12 @@ msgid "Leecher" msgstr "Ophaler" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "show video" -msgstr "toon details" +msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "hide video" -msgstr "verberg details" +msgstr "" msgid "Localization" msgstr "Vertaling" diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.mo index 71d7aa114e02075ba3c0587f71451a375b12f952..2ea37052366783ea40e2b382abe921e057e117e6 100644 GIT binary patch delta 1596 zcmZwHSxA*Z7{>9}-8?R-M-7+EaKnr;vx^XsP)M(=P}3q?R1^^}DkDk`(sI$Fl(tb3 z1Q`_(B@swc7=d6?P>>h|8B#=Q1!Z7C|3?P8C>iHBGvCa-Gw=85^_)k`d~ag{&lo?o z{3i4J*<^N=Yq}B@D^s{DDudDV2YW~ ze$j|wAd%e{;&Sw05h_qQQmmSasaA*a*yzSPPzO2U>_!E?fZF#q=Hg?d*c6ox@Eya6 zZ*w%XaVW>v<)bhfV~}F$RPzVJV){iGhCb9mkD=C|MXkH+p5MU;`U4n+!x)KUsQDi- znfNwMLnrodjW|q2O(;NRpb!qON*bqVC?!J}h{LD@jJokxNRn(Eb)X5<#xqEBF#!|U?7pAb z3RK+52=cF+%@9=|%PcBT7%xiWv8WA`a0r)TI!>LbLU;Z4>i9Zb%AHd z*7g#$-+T0;Z<>Zu6~LFHfhtsLT2Kr3BE=3;=_BnzZFCj2(LJQtAQf4*=a`CbP&c1L zWh9>T>Ukj&($*t!d{#q48Q6vT`dhFJJFyW*kUeY_(Pas0ewA|@>J>DiKB{iqjJ>Ff zOu6w{*Z+k|eK5BT(%*j+4c$DBN;k_v-E6J16t$qj^=n+e9+jb1=N>nH0QD*kqYiM| z^)I33-$eZbyNl5!G=^y?;J9-V^^U)wHu{Y^fQR%np%=5U1NDyk`u7JF2YH+88gOdAi{@;Fs!K&LKviC z3dM&W3^9|E5T%<1l@%Cvd8ml6h#|&&ozShZM4qnDCypD5m$857jcn~Alirlh6 zTwoTpJDlV*@D_7%60>jyl_-;}N?gE!Aq(R?EOFzjQH88?Zb2okL&ZIWrFatg+EorJ zU;w@3x7(a3@DtSHpJ5)pM6Ku({woYCxt_sHT*FNjx)Jq!4eGgi)cpqZ;W5m?7R<(W z)ckG?k>9RyqKZc_fbZRepQsM}K_$vynR+mQB^bi(xE6O}8>)cssQDhM;8Dv%6%^#K z6pL{dZo=paPO3RkOJbOYEvQ7TZu~s5XzM@~)QJk*hnjx_HGc@z!H1{>k5O?)Q1f0O zwb?6FfgdvIzgqOgO_)X{NTL#WnWgIhDo_zBQ3SVP8AdRM1=x!NDP|8)i5dy6!kbZh zA&!cB(T#We=)VH?F>oITaS1l^qDnLom0%cEz*j8BA6SS%UThG{k(zBY&c`}bq9dpR zPT)d3jf&HSgs|QyCwlM}D&R0`#ba2G6Ye_94x~0KMcrS8n!g^kfZfPc+mDKO6#W=O zb*jx>kE1%1L_HVHV8>|FfSybyg zP_4d%>O>D}VRzmAQPlpk*KXh=swET7DL4Kb)%sMTC}A$@I*6JdLH$E2LoK8V^@?gy y^Y)?&I*bRf3ALclSg6Xg`)_(GJ&ByG`unMZij>b diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po index eb5655b76..22190141e 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.po +++ b/searx/translations/tr/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:16+0100\n" +"POT-Creation-Date: 2015-01-05 20:54+0100\n" "PO-Revision-Date: 2014-12-28 08:20+0000\n" "Last-Translator: Caner Başaran \n" "Language-Team: Turkish " @@ -361,14 +361,12 @@ msgid "cached" msgstr "önbellek" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "show media" -msgstr "haritayı göster" +msgstr "" #: searx/templates/oscar/result_templates/default.html:9 -#, fuzzy msgid "hide media" -msgstr "haritayı gizle" +msgstr "" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -403,14 +401,12 @@ msgid "Leecher" msgstr "Sömürenler" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "show video" -msgstr "ayrıntıları göster" +msgstr "" #: searx/templates/oscar/result_templates/videos.html:9 -#, fuzzy msgid "hide video" -msgstr "ayrıntıları gizle" +msgstr "" msgid "Localization" msgstr "" From 6cbd29f674c1a4c585ea4e6b208ab9d53a141ee7 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 9 Jan 2015 04:01:31 +0100 Subject: [PATCH 58/62] [enh] logging added --- searx/__init__.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/searx/__init__.py b/searx/__init__.py index 46685817a..110f46af8 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -15,9 +15,9 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2013- by Adam Tauber, ''' +import logging from os import environ from os.path import realpath, dirname, join, abspath -from searx.https_rewrite import load_https_rules try: from yaml import load except: @@ -45,7 +45,17 @@ else: with open(settings_path) as settings_yaml: settings = load(settings_yaml) +if settings.get('server', {}).get('debug'): + logging.basicConfig(level=logging.DEBUG) +else: + logging.basicConfig(level=logging.WARNING) + +logger = logging.getLogger('searx') + # load https rules only if https rewrite is enabled if settings.get('server', {}).get('https_rewrite'): # loade https rules + from searx.https_rewrite import load_https_rules load_https_rules(https_rewrite_path) + +logger.info('Initialisation done') From 425a576f28e1afd3d8e65097ecfe225a25d9eafb Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 9 Jan 2015 04:05:39 +0100 Subject: [PATCH 59/62] [fix] template syntax --- searx/templates/default/result_templates/map.html | 2 +- searx/templates/default/result_templates/torrent.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index b3669f895..d37c2f374 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html index fb8988680..4c79a0a39 100644 --- a/searx/templates/default/result_templates/torrent.html +++ b/searx/templates/default/result_templates/torrent.html @@ -1,6 +1,6 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}

{{ result.title|safe }}

{{ result.pretty_url }}

From 299a80a1eb2eecb80f5c50da261a9eab1900b572 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 9 Jan 2015 04:13:05 +0100 Subject: [PATCH 60/62] [enh] using the logger --- searx/engines/__init__.py | 11 +++++++---- searx/https_rewrite.py | 7 +++++-- searx/search.py | 7 +++++-- searx/webapp.py | 5 +++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index 9bc5cdfd4..643b107a5 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -22,6 +22,10 @@ from imp import load_source from flask.ext.babel import gettext from operator import itemgetter from searx import settings +from searx import logger + + +logger = logger.getChild('engines') engine_dir = dirname(realpath(__file__)) @@ -81,7 +85,7 @@ def load_engine(engine_data): if engine_attr.startswith('_'): continue if getattr(engine, engine_attr) is None: - print('[E] Engine config error: Missing attribute "{0}.{1}"' + logger.error('Missing engine config attribute: "{0}.{1}"' .format(engine.name, engine_attr)) sys.exit(1) @@ -100,9 +104,8 @@ def load_engine(engine_data): categories['general'].append(engine) if engine.shortcut: - # TODO check duplications if engine.shortcut in engine_shortcuts: - print('[E] Engine config error: ambigious shortcut: {0}' + logger.error('Engine config error: ambigious shortcut: {0}' .format(engine.shortcut)) sys.exit(1) engine_shortcuts[engine.shortcut] = engine.name @@ -199,7 +202,7 @@ def get_engines_stats(): if 'engines' not in settings or not settings['engines']: - print '[E] Error no engines found. Edit your settings.yml' + logger.error('No engines found. Edit your settings.yml') exit(2) for engine_data in settings['engines']: diff --git a/searx/https_rewrite.py b/searx/https_rewrite.py index d873b406d..71aec1c9b 100644 --- a/searx/https_rewrite.py +++ b/searx/https_rewrite.py @@ -20,8 +20,11 @@ from urlparse import urlparse from lxml import etree from os import listdir from os.path import isfile, isdir, join +from searx import logger +logger = logger.getChild("https_rewrite") + # https://gitweb.torproject.org/\ # pde/https-everywhere.git/tree/4.0:/src/chrome/content/rules @@ -131,7 +134,7 @@ def load_single_https_ruleset(filepath): def load_https_rules(rules_path): # check if directory exists if not isdir(rules_path): - print("[E] directory not found: '" + rules_path + "'") + logger.error("directory not found: '" + rules_path + "'") return # search all xml files which are stored in the https rule directory @@ -151,7 +154,7 @@ def load_https_rules(rules_path): # append ruleset https_rules.append(ruleset) - print(' * {n} https-rules loaded'.format(n=len(https_rules))) + logger.info('{n} rules loaded'.format(n=len(https_rules))) def https_url_rewrite(result): diff --git a/searx/search.py b/searx/search.py index fbbf3fe41..a31d8eace 100644 --- a/searx/search.py +++ b/searx/search.py @@ -29,8 +29,11 @@ from searx.engines import ( from searx.languages import language_codes from searx.utils import gen_useragent from searx.query import Query +from searx import logger +logger = logger.getChild('search') + number_of_searches = 0 @@ -42,7 +45,7 @@ def search_request_wrapper(fn, url, engine_name, **kwargs): engines[engine_name].stats['errors'] += 1 # print engine name and specific error message - print('[E] Error with engine "{0}":\n\t{1}'.format( + logger.warning('engine crash: {0}\n\t{1}'.format( engine_name, str(e))) return @@ -66,7 +69,7 @@ def threaded_requests(requests): remaining_time = max(0.0, timeout_limit - (time() - search_start)) th.join(remaining_time) if th.isAlive(): - print('engine timeout: {0}'.format(th._engine_name)) + logger.warning('engine timeout: {0}'.format(th._engine_name)) # get default reqest parameter diff --git a/searx/webapp.py b/searx/webapp.py index 6ee9af745..24d329858 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -47,8 +47,11 @@ from searx.https_rewrite import https_url_rewrite from searx.search import Search from searx.query import Query from searx.autocomplete import backends as autocomplete_backends +from searx import logger +logger = logger.getChild('webapp') + static_path, templates_path, themes =\ get_themes(settings['themes_path'] if settings.get('themes_path') @@ -68,6 +71,8 @@ app = Flask( app.secret_key = settings['server']['secret_key'] +app.logger.addHandler(logger) + babel = Babel(app) global_favicons = [] From 23b4a53248527a1228af13a7a4f7f380a08d1c09 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 9 Jan 2015 04:30:55 +0100 Subject: [PATCH 61/62] [enh] engine exception traceback --- searx/search.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/searx/search.py b/searx/search.py index a31d8eace..f58b6167c 100644 --- a/searx/search.py +++ b/searx/search.py @@ -40,13 +40,12 @@ number_of_searches = 0 def search_request_wrapper(fn, url, engine_name, **kwargs): try: return fn(url, **kwargs) - except Exception, e: + except: # increase errors stats engines[engine_name].stats['errors'] += 1 # print engine name and specific error message - logger.warning('engine crash: {0}\n\t{1}'.format( - engine_name, str(e))) + logger.exception('engine crash: {0}'.format(engine_name)) return From c8be128e97479ea6c871c4b6fbf014fa8136e708 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Fri, 9 Jan 2015 11:21:46 +0100 Subject: [PATCH 62/62] [mod] ignore startpage unicode errors --- searx/engines/startpage.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 16da728cd..70b193952 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -66,7 +66,10 @@ def response(resp): continue link = links[0] url = link.attrib.get('href') - title = escape(link.text_content()) + try: + title = escape(link.text_content()) + except UnicodeDecodeError: + continue # block google-ad url's if re.match("^http(s|)://www.google.[a-z]+/aclk.*$", url):