diff options
Diffstat (limited to 'searx')
70 files changed, 4227 insertions, 1762 deletions
diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py index 9d1c22f5a..b8c61c151 100644 --- a/searx/engines/bing_images.py +++ b/searx/engines/bing_images.py @@ -21,12 +21,18 @@ import re # engine dependent config categories = ['images'] paging = True +safesearch = True # search-url base_url = 'https://www.bing.com/' search_string = 'images/search?{query}&count=10&first={offset}' thumb_url = "http://ts1.mm.bing.net/th?id={ihk}" +# safesearch definitions +safesearch_types = {2: 'STRICT', + 1: 'DEMOTE', + 0: 'OFF'} + # do search-request def request(query, params): @@ -43,7 +49,8 @@ def request(query, params): offset=offset) params['cookies']['SRCHHPGUSR'] = \ - 'NEWWND=0&NRSLT=-1&SRCHLANG=' + language.split('-')[0] + 'NEWWND=0&NRSLT=-1&SRCHLANG=' + language.split('-')[0] +\ + '&ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE') params['url'] = base_url + search_path diff --git a/searx/engines/blekko_images.py b/searx/engines/blekko_images.py new file mode 100644 index 000000000..2e7ec904f --- /dev/null +++ b/searx/engines/blekko_images.py @@ -0,0 +1,68 @@ +## Blekko (Images) +# +# @website https://blekko.com +# @provide-api yes (inofficial) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title, img_src + +from json import loads +from urllib import urlencode + +# engine dependent config +categories = ['images'] +paging = True +safesearch = True + +# search-url +base_url = 'https://blekko.com' +search_url = '/api/images?{query}&c={c}' + +# safesearch definitions +safesearch_types = {2: '1', + 1: '', + 0: '0'} + + +# do search-request +def request(query, params): + c = (params['pageno'] - 1) * 48 + + params['url'] = base_url +\ + search_url.format(query=urlencode({'q': query}), + c=c) + + if params['pageno'] != 1: + params['url'] += '&page={pageno}'.format(pageno=(params['pageno']-1)) + + # let Blekko know we wan't have profiling + params['cookies']['tag_lesslogging'] = '1' + + # parse safesearch argument + params['cookies']['safesearch'] = safesearch_types.get(params['safesearch'], '') + + return params + + +# get response from search-request +def response(resp): + results = [] + + search_results = loads(resp.text) + + # return empty array if there are no results + if not search_results: + return [] + + for result in search_results: + # append result + results.append({'url': result['page_url'], + 'title': result['title'], + 'content': '', + 'img_src': result['url'], + 'template': 'images.html'}) + + # return results + return results diff --git a/searx/engines/gigablast.py b/searx/engines/gigablast.py new file mode 100644 index 000000000..8749c3256 --- /dev/null +++ b/searx/engines/gigablast.py @@ -0,0 +1,63 @@ +## Gigablast (Web) +# +# @website http://gigablast.com +# @provide-api yes (http://gigablast.com/api.html) +# +# @using-api yes +# @results XML +# @stable yes +# @parse url, title, content + +from urllib import urlencode +from cgi import escape +from lxml import etree + +# engine dependent config +categories = ['general'] +paging = True +number_of_results = 5 + +# search-url +base_url = 'http://gigablast.com/' +search_string = 'search?{query}&n={number_of_results}&s={offset}&xml=1&qh=0' + +# specific xpath variables +results_xpath = '//response//result' +url_xpath = './/url' +title_xpath = './/title' +content_xpath = './/sum' + + +# do search-request +def request(query, params): + offset = (params['pageno'] - 1) * number_of_results + + search_path = search_string.format( + query=urlencode({'q': query}), + offset=offset, + number_of_results=number_of_results) + + params['url'] = base_url + search_path + + return params + + +# get response from search-request +def response(resp): + results = [] + + dom = etree.fromstring(resp.content) + + # parse results + for result in dom.xpath(results_xpath): + url = result.xpath(url_xpath)[0].text + title = result.xpath(title_xpath)[0].text + content = escape(result.xpath(content_xpath)[0].text) + + # append result + results.append({'url': url, + 'title': title, + 'content': content}) + + # return results + return results diff --git a/searx/engines/google_images.py b/searx/engines/google_images.py index 092ae6639..1c0e62f5c 100644 --- a/searx/engines/google_images.py +++ b/searx/engines/google_images.py @@ -15,18 +15,25 @@ from json import loads # engine dependent config categories = ['images'] paging = True +safesearch = True # search-url url = 'https://ajax.googleapis.com/' -search_url = url + 'ajax/services/search/images?v=1.0&start={offset}&rsz=large&safe=off&filter=off&{query}' +search_url = url + 'ajax/services/search/images?v=1.0&start={offset}&rsz=large&safe={safesearch}&filter=off&{query}' # do search-request def request(query, params): offset = (params['pageno'] - 1) * 8 + if params['safesearch'] == 0: + safesearch = 'off' + else: + safesearch = 'on' + params['url'] = search_url.format(query=urlencode({'q': query}), - offset=offset) + offset=offset, + safesearch=safesearch) return params diff --git a/searx/engines/piratebay.py b/searx/engines/piratebay.py index 207df276c..fa5c61128 100644 --- a/searx/engines/piratebay.py +++ b/searx/engines/piratebay.py @@ -20,7 +20,7 @@ categories = ['videos', 'music', 'files'] paging = True # search-url -url = 'https://thepiratebay.cr/' +url = 'https://thepiratebay.se/' search_url = url + 'search/{search_term}/{pageno}/99/{search_type}' # piratebay specific type-definitions diff --git a/searx/query.py b/searx/query.py index 567c49e92..e79e760a3 100644 --- a/searx/query.py +++ b/searx/query.py @@ -107,7 +107,7 @@ class Query(object): self.engines.extend({'category': prefix, 'name': engine.name} for engine in categories[prefix] - if engine not in self.blocked_engines) + if (engine.name, prefix) not in self.blocked_engines) if query_part[0] == '!': self.specific = True diff --git a/searx/search.py b/searx/search.py index c16346f45..79a8ae0a9 100644 --- a/searx/search.py +++ b/searx/search.py @@ -411,9 +411,9 @@ class Search(object): # declared under the specific categories for categ in self.categories: self.engines.extend({'category': categ, - 'name': x.name} - for x in categories[categ] - if x.name not in self.blocked_engines) + 'name': engine.name} + for engine in categories[categ] + if (engine.name, categ) not in self.blocked_engines) # do search-request def search(self, request): @@ -457,6 +457,11 @@ class Search(object): request_params['started'] = time() request_params['pageno'] = self.pageno request_params['language'] = self.lang + try: + # 0 = None, 1 = Moderate, 2 = Strict + request_params['safesearch'] = int(request.cookies.get('safesearch', 1)) + except ValueError: + request_params['safesearch'] = 1 # update request parameters dependent on # search-engine (contained in engines folder) diff --git a/searx/settings.yml b/searx/settings.yml index 8c9941b36..8e2833ef0 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -33,6 +33,11 @@ engines: locale : en-US shortcut : bin + - name : blekko images + engine : blekko_images + locale : en-US + shortcut : bli + - name : btdigg engine : btdigg shortcut : bt @@ -103,6 +108,10 @@ engines: shortcut : gf disabled : True + - name : gigablast + engine : gigablast + shortcut : gb + - name : github engine : github shortcut : gh @@ -254,6 +263,7 @@ engines: locales: en : English de : Deutsch + he : Hebrew hu : Magyar fr : Français es : Español diff --git a/searx/static/themes/courgette/css/style-rtl.css b/searx/static/themes/courgette/css/style-rtl.css new file mode 100644 index 000000000..a725ac1e8 --- /dev/null +++ b/searx/static/themes/courgette/css/style-rtl.css @@ -0,0 +1 @@ +.q{padding:.5em 1em .5em 3em}#search_submit{left:0;right:auto}.result .favicon{float:right;margin-left:.5em;margin-right:0}#sidebar{right:auto;left:0}#results{padding:0 32px 0 272px}.search.center{padding-right:0;padding-left:17em}.right{right:auto;left:0}#pagination form+form{float:left;margin-top:-2em}.engine-table{text-align:right}
\ No newline at end of file diff --git a/searx/static/themes/courgette/css/style.css b/searx/static/themes/courgette/css/style.css index 5aa6d96c8..74fbd2ac9 100644 --- a/searx/static/themes/courgette/css/style.css +++ b/searx/static/themes/courgette/css/style.css @@ -1 +1 @@ -*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]{-webkit-appearance:textfield}h2{color:#666;text-transform:uppercase}body{font-family:sans-serif;line-height:1.5;margin:0;background:#eee}html{position:relative;min-height:100%}a{color:#666}.title h1{font-size:7em;color:#3498db;margin:0 auto;line-height:100px;margin-top:-20px;padding-bottom:20px}.center{max-width:70em;text-align:center;background:rgba(255,255,255,0.6);padding:2em;margin:7% auto 0;position:relative}.center.search{position:static;width:auto;background:none;margin:auto;padding-top:1.8em}@media screen and (min-width:1001px){.center:after{content:"";z-index:-1;background:url(../img/bg-body-index.jpg) no-repeat;background-size:cover;width:100%;height:100%;top:0;left:0;position:fixed}.center.search:after{content:none}}.autocompleter-choices{position:absolute;margin:0;padding:0;background:#fff}.autocompleter-choices li{padding:.5em 1em}.autocompleter-choices li:hover{background:#3498db;color:#fff;cursor:pointer}#categories{text-align:center}.top_margin{position:absolute;bottom:-3.5em;width:100%;left:0}.top_margin a{display:inline-block;margin-right:1em;color:#fff;text-decoration:none}.top_margin a:hover,.top_margin a:focus{text-decoration:underline}@media screen and (max-width:1000px){.center{background:none}.top_margin a{color:#333}}.checkbox_container{margin-top:1.5em}.checkbox_container label{padding:.5em 1em;color:#333;cursor:pointer;font-size:.9em}.checkbox_container label:hover{background:#3498db;color:#fff}.checkbox_container input[type="checkbox"]{position:absolute;top:-9999px}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}#categories_container>div{display:inline-block}#categories .hidden{display:none;position:absolute;bottom:1em;left:0;text-align:center;width:100%;font-size:.9em;font-style:italic;color:#333}#categories:hover .hidden{display:block}@media screen and (max-width:900px){#categories_container{letter-spacing:-5px}#categories_container>div{letter-spacing:normal;margin-top:1em}.checkbox_container{margin:0}.checkbox_container label{display:block;background:#ccc;padding:1em;border:1px solid #fff}.top_margin{position:static}#categories .hidden{position:static;display:block}}@media screen and (max-width:900px) and (min-width:501px){#categories_container>div{width:31%;margin-left:2.333%}#categories_container>div:nth-child(3n+1){margin-left:0}}@media screen and (max-width:500px){#categories_container>div{width:48%;margin-left:2%;font-size:.9em}#categories_container>div:nth-child(2n+1){margin-left:0}.title h1{background:url(../img/searx-mobile.png) no-repeat;width:200px;height:39px}}#search_wrapper{position:relative}.q{padding:.5em 3em .5em 1em;width:100%;font-size:1.5em;border:0;color:#666}#search_submit{position:absolute;top:0;right:0;border:0;background:url("../img/search-icon.png") no-repeat scroll center center / 65% auto #3498db;text-indent:-9999px;width:5em;height:100%;cursor:pointer}#search_submit:hover,#search_submit:focus{background-color:#0665a2}#sidebar{background:#3498db;position:fixed;top:0;right:0;width:15em;height:100%;padding:1.5em;text-align:right}.right{position:fixed;bottom:1.5em;width:15em;right:0;z-index:1;padding:0 1.5em;text-align:right}.right a{color:#fff;display:block;text-decoration:none}.right a:hover,.right a:focus{text-decoration:underline}#preferences{background:url(../img/preference-icon.png) no-repeat right 0 auto;padding-right:1.8em}#search_url input{border:0;padding:.5em}#sidebar>div{margin-bottom:1em;color:#fff}#sidebar form{display:inline-block}#sidebar input[type="submit"]{background:#ccc;border:0;padding:.5em 1em;cursor:pointer;margin-top:.5em}#sidebar input[type="submit"]:hover,#sidebar input[type="submit"]:focus{color:#fff;background-color:#0665a2}#results{padding-right:17em;padding-left:2em;padding:0 17em 0 2em}.result p{font-size:.9em}.result .content{margin:0;color:#666}.result .url{margin-top:0;color:#ff6530}.result .favicon{float:left;position:relative;top:.5em;margin-right:.5em}.definition_result{background:#ccc;padding:1em}.definition_result .result_title,.definition_result p{margin:0}.result_title{margin-bottom:0;font-weight:normal}.highlight{font-weight:bold}.result_title a{color:#3498db;text-decoration:none}.result_title a:hover,.result_title a:focus{text-decoration:underline}.cache_link{color:#666;font-size:.9em;font-style:italic}.search.center{padding-right:17em}#answers{border:2px solid #3498db;padding:20px;color:#666;text-align:center;max-width:70em;margin:0 auto 20px}#suggestions{margin-bottom:1em}#suggestions span{color:#666}#suggestions form{display:inline-block;vertical-align:top;margin-bottom:.5em}#suggestions input[type="submit"]{color:#333;padding:.5em 1em;border:0;background:#ccc;cursor:pointer}#suggestions input[type="submit"]:hover,#suggestions input[type="submit"]:focus{background:#3498db;color:#fff}#pagination{margin:1.5em 0 2em}#pagination form+form{float:right;margin-top:-2em}input[type="submit"]{display:inline-block;background:#3498db;color:#fff;border:0;padding:.6em 1em;cursor:pointer}input[type="submit"]:hover,input[type="submit"]:focus{background:#0665a2}.row{max-width:60em;margin:auto}.row a{color:#3498db}.row form{letter-spacing:-5px}.row form>*{letter-spacing:normal}.row p{margin:0}.row fieldset{display:inline-block;width:48%;vertical-align:top}.row fieldset:last-of-type{display:block;width:auto;background:none;padding:0}.row fieldset:nth-child(odd){margin-right:2%}.row fieldset:nth-child(2){min-height:10.5em}@media screen and (max-width:900px){.row{margin:0 1em}.row fieldset{width:49%}.row fieldset,.row fieldset:nth-child(odd){margin-right:0}.row fieldset:first-child{width:100%;margin-right:0}.row fieldset:nth-child(even){margin-right:2%}}@media screen and (max-width:800px){.row fieldset{width:100%}select{width:100%}table{font-size:.8em}.right{display:none}#sidebar{display:none}#results{padding:0 2em}.search.center{padding-right:2em}}@media screen and (max-width:400px){.row #categories_container>div{width:100%;margin-left:0}}fieldset{border:0;margin:1em 0;background:#ccc;padding:1.5em}table{width:100%;text-align:left;border:1px solid #ccc;border-collapse:collapse}table th{background:#999;color:#fff}table tr:nth-child(odd){background:#ccc}table th,table td{padding:.5em 1em;border:1px solid #fff}.engine_checkbox label{padding:.5em;background:#3498db;color:#fff;cursor:pointer}.engine_checkbox .deny{background:#3498db}.engine_checkbox .allow{display:none;background:#666}.engine_checkbox input{display:none}.engine_checkbox input:checked+.allow{display:inline}.engine_checkbox input:checked+.allow+.deny{display:none}.row input[type="submit"]{font-size:1em;margin:1em 0 2em}.row .right{position:static;display:inline-block}.row .right a{color:#333;width:auto;text-align:left;padding:0}.small_font{font-size:.8em}table th{padding:1em}legend{background:#eee;padding:0 1em;position:relative}select{border:1px solid #ddd;padding:.5em .8em;font-size:1em}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080;font-style:italic}.highlight .err{border:1px solid #f00}.highlight .k{color:#008000;font-weight:bold}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:#f00}.highlight .gh{color:#000080;font-weight:bold}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:#000080;font-weight:bold}.highlight .gs{font-weight:bold}.highlight .gu{color:#800080;font-weight:bold}.highlight .gt{color:#04d}.highlight .kc{color:#008000;font-weight:bold}.highlight .kd{color:#008000;font-weight:bold}.highlight .kn{color:#008000;font-weight:bold}.highlight .kp{color:#008000}.highlight .kr{color:#008000;font-weight:bold}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:#008000}.highlight .nc{color:#00f;font-weight:bold}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:bold}.highlight .ne{color:#d2413a;font-weight:bold}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00f;font-weight:bold}.highlight .nt{color:#008000;font-weight:bold}.highlight .nv{color:#19177c}.highlight .ow{color:#a2f;font-weight:bold}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#ba2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#b62;font-weight:bold}.highlight .sh{color:#ba2121}.highlight .si{color:#b68;font-weight:bold}.highlight .sx{color:#008000}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:#008000}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.highlight pre{overflow:auto}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:transparent}.highlight .lineno::-moz-selection{background:transparent}
\ No newline at end of file +*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]{-webkit-appearance:textfield}h2{color:#666;text-transform:uppercase}body{font-family:sans-serif;line-height:1.5;margin:0;background:#eee}html{position:relative;min-height:100%}a{color:#666}.title h1{font-size:7em;color:#3498db;margin:0 auto;line-height:100px;margin-top:-20px;padding-bottom:20px}.center{max-width:70em;text-align:center;background:rgba(255,255,255,0.6);padding:2em;margin:7% auto 0;position:relative}.center.search{position:static;width:auto;background:none;margin:auto;padding-top:1.8em}@media screen and (min-width:1001px){.center:after{content:"";z-index:-1;background:url(../img/bg-body-index.jpg) no-repeat;background-size:cover;width:100%;height:100%;top:0;left:0;position:fixed}.center.search:after{content:none}}.autocompleter-choices{position:absolute;margin:0;padding:0;background:#fff}.autocompleter-choices li{padding:.5em 1em}.autocompleter-choices li:hover{background:#3498db;color:#fff;cursor:pointer}#categories{text-align:center}.top_margin{position:absolute;bottom:-3.5em;width:100%;left:0}.top_margin a{display:inline-block;margin-right:1em;color:#fff;text-decoration:none}.top_margin a:hover,.top_margin a:focus{text-decoration:underline}@media screen and (max-width:1000px){.center{background:none}.top_margin a{color:#333}}.checkbox_container{margin-top:1.5em}.checkbox_container label{padding:.5em 1em;color:#333;cursor:pointer;font-size:.9em}.checkbox_container label:hover{background:#3498db;color:#fff}.checkbox_container input[type="checkbox"]{position:absolute;top:-9999px}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}#categories_container>div{display:inline-block}#categories .hidden{display:none;position:absolute;bottom:1em;left:0;text-align:center;width:100%;font-size:.9em;font-style:italic;color:#333}#categories:hover .hidden{display:block}@media screen and (max-width:900px){#categories_container{letter-spacing:-5px}#categories_container>div{letter-spacing:normal;margin-top:1em}.checkbox_container{margin:0}.checkbox_container label{display:block;background:#ccc;padding:1em;border:1px solid #fff}.top_margin{position:static}#categories .hidden{position:static;display:block}}@media screen and (max-width:900px) and (min-width:501px){#categories_container>div{width:31%;margin-left:2.333%}#categories_container>div:nth-child(3n+1){margin-left:0}}@media screen and (max-width:500px){#categories_container>div{width:48%;margin-left:2%;font-size:.9em}#categories_container>div:nth-child(2n+1){margin-left:0}.title h1{background:url(../img/searx-mobile.png) no-repeat;width:200px;height:39px}}#search_wrapper{position:relative}.q{padding:.5em 3em .5em 1em;width:100%;font-size:1.5em;border:0;color:#666}#search_submit{position:absolute;top:0;right:0;border:0;background:url("../img/search-icon.png") no-repeat scroll center center / 65% auto #3498db;text-indent:-9999px;width:5em;height:100%;cursor:pointer}#search_submit:hover,#search_submit:focus{background-color:#0665a2}#sidebar{background:#3498db;position:fixed;top:0;right:0;width:15em;height:100%;padding:1.5em;text-align:right}.right{position:fixed;bottom:1.5em;width:15em;right:0;z-index:1;padding:0 1.5em;text-align:right}.right a{color:#fff;display:block;text-decoration:none}.right a:hover,.right a:focus{text-decoration:underline}#preferences{background:url("../img/preference-icon.png") no-repeat right center / 12% auto;padding-right:1.8em}#search_url input{border:0;padding:.5em}#sidebar>div{margin-bottom:1em;color:#fff}#sidebar form{display:inline-block}#sidebar input[type="submit"]{background:#ccc;border:0;padding:.5em 1em;cursor:pointer;margin-top:.5em}#sidebar input[type="submit"]:hover,#sidebar input[type="submit"]:focus{color:#fff;background-color:#0665a2}#results{padding-right:17em;padding-left:2em;padding:0 17em 0 2em}.result p{font-size:.9em}.result .content{margin:0;color:#666}.result .url{margin-top:0;color:#ff6530}.result .favicon{float:left;position:relative;top:.5em;margin-right:.5em}.definition_result{background:#ccc;padding:1em}.definition_result .result_title,.definition_result p{margin:0}.result_title{margin-bottom:0;font-weight:normal}.highlight{font-weight:bold}.result_title a{color:#3498db;text-decoration:none}.result_title a:hover,.result_title a:focus{text-decoration:underline}.cache_link{color:#666;font-size:.9em;font-style:italic}.search.center{padding-right:17em}#answers{border:2px solid #3498db;padding:20px;color:#666;text-align:center;max-width:70em;margin:0 auto 20px}#suggestions{margin-bottom:1em}#suggestions span{color:#666}#suggestions form{display:inline-block;vertical-align:top;margin-bottom:.5em}#suggestions input[type="submit"]{color:#333;padding:.5em 1em;border:0;background:#ccc;cursor:pointer}#suggestions input[type="submit"]:hover,#suggestions input[type="submit"]:focus{background:#3498db;color:#fff}#pagination{margin:1.5em 0 2em}#pagination form+form{float:right;margin-top:-2em}input[type="submit"]{display:inline-block;background:#3498db;color:#fff;border:0;padding:.6em 1em;cursor:pointer}input[type="submit"]:hover,input[type="submit"]:focus{background:#0665a2}.row{max-width:60em;margin:auto}.row a{color:#3498db}.row form{letter-spacing:-5px}.row form>*{letter-spacing:normal}.row p{margin:0}.row fieldset{display:inline-block;width:48%;vertical-align:top}.row fieldset:last-of-type{display:block;width:auto;background:none;padding:0}.row fieldset:nth-child(odd){margin-right:2%}.row fieldset:nth-child(2){min-height:10.5em}@media screen and (max-width:900px){.row{margin:0 1em}.row fieldset{width:49%}.row fieldset,.row fieldset:nth-child(odd){margin-right:0}.row fieldset:first-child{width:100%;margin-right:0}.row fieldset:nth-child(even){margin-right:2%}}@media screen and (max-width:800px){.row fieldset{width:100%}select{width:100%}table{font-size:.8em}.right{display:none}#sidebar{display:none}#results{padding:0 2em}.search.center{padding-right:2em}}@media screen and (max-width:400px){.row #categories_container>div{width:100%;margin-left:0}}fieldset{border:0;margin:1em 0;background:#ccc;padding:1.5em}table{width:100%;text-align:left;border:1px solid #ccc;border-collapse:collapse}table th{background:#999;color:#fff}table tr:nth-child(odd){background:#ccc}table th,table td{padding:.5em 1em;border:1px solid #fff}.engine_checkbox label{padding:.5em;background:#3498db;color:#fff;cursor:pointer}.engine_checkbox .deny{background:#3498db}.engine_checkbox .allow{display:none;background:#666}.engine_checkbox input{display:none}.engine_checkbox input:checked+.allow{display:inline}.engine_checkbox input:checked+.allow+.deny{display:none}.row input[type="submit"]{font-size:1em;margin:1em 0 2em}.row .right{position:static;display:inline-block}.row .right a{color:#333;width:auto;text-align:left;padding:0}.small_font{font-size:.8em}table th{padding:1em}legend{background:#eee;padding:0 1em;position:relative}select{border:1px solid #ddd;padding:.5em .8em;font-size:1em}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080;font-style:italic}.highlight .err{border:1px solid #f00}.highlight .k{color:#008000;font-weight:bold}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:#f00}.highlight .gh{color:#000080;font-weight:bold}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:#000080;font-weight:bold}.highlight .gs{font-weight:bold}.highlight .gu{color:#800080;font-weight:bold}.highlight .gt{color:#04d}.highlight .kc{color:#008000;font-weight:bold}.highlight .kd{color:#008000;font-weight:bold}.highlight .kn{color:#008000;font-weight:bold}.highlight .kp{color:#008000}.highlight .kr{color:#008000;font-weight:bold}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:#008000}.highlight .nc{color:#00f;font-weight:bold}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:bold}.highlight .ne{color:#d2413a;font-weight:bold}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00f;font-weight:bold}.highlight .nt{color:#008000;font-weight:bold}.highlight .nv{color:#19177c}.highlight .ow{color:#a2f;font-weight:bold}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#ba2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#b62;font-weight:bold}.highlight .sh{color:#ba2121}.highlight .si{color:#b68;font-weight:bold}.highlight .sx{color:#008000}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:#008000}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.highlight pre{overflow:auto}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:transparent}.highlight .lineno::-moz-selection{background:transparent}
\ No newline at end of file diff --git a/searx/static/themes/courgette/less/style-rtl.less b/searx/static/themes/courgette/less/style-rtl.less new file mode 100644 index 000000000..3e357d3d8 --- /dev/null +++ b/searx/static/themes/courgette/less/style-rtl.less @@ -0,0 +1,42 @@ +.q { + padding: 0.5em 1em 0.5em 3em; +} + +#search_submit { + left: 0; + right:auto; +} + +.result .favicon { + float: right; + margin-left: 0.5em; + margin-right: 0; +} + +#sidebar { + right: auto; + left: 0; +} + +#results { + padding: 0px 32px 0px 272px; +} + +.search.center { + padding-right: 0; + padding-left: 17em; +} + +.right { + right: auto; + left: 0; +} + +#pagination form + form { + float: left; + margin-top: -2em; +} + +.engine-table { + text-align:right; +}
\ No newline at end of file diff --git a/searx/static/themes/courgette/less/style.less b/searx/static/themes/courgette/less/style.less index fab3bd8bd..0387af5c0 100644 --- a/searx/static/themes/courgette/less/style.less +++ b/searx/static/themes/courgette/less/style.less @@ -278,7 +278,7 @@ a { } #preferences { - background: url(../img/preference-icon.png) no-repeat right 0 / 12% auto; + background: url("../img/preference-icon.png") no-repeat right center / 12% auto; padding-right: 1.8em; } diff --git a/searx/static/themes/default/css/style-rtl.css b/searx/static/themes/default/css/style-rtl.css new file mode 100644 index 000000000..65ad6638e --- /dev/null +++ b/searx/static/themes/default/css/style-rtl.css @@ -0,0 +1 @@ +#search_submit{left:1px;right:auto}.result .favicon{float:right;margin-left:.5em;margin-right:0}
\ No newline at end of file diff --git a/searx/static/themes/default/less/style-rtl.less b/searx/static/themes/default/less/style-rtl.less new file mode 100644 index 000000000..eac53c1f8 --- /dev/null +++ b/searx/static/themes/default/less/style-rtl.less @@ -0,0 +1,11 @@ +#search_submit { + left: 1px; + right:auto; +} + +.result .favicon { + float: right; + margin-left: 0.5em; + margin-right: 0; +} + diff --git a/searx/templates/courgette/about.html b/searx/templates/courgette/about.html index 1c2e0635d..2945e1f7b 100644 --- a/searx/templates/courgette/about.html +++ b/searx/templates/courgette/about.html @@ -1,7 +1,7 @@ {% extends 'courgette/base.html' %} {% block content %} {% include 'courgette/github_ribbon.html' %} -<div class="row"> +<div class="row"{% if rtl %} dir="ltr"{% endif %}> <h1>About <a href="{{ url_for('index') }}">searx</a></h1> <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users. diff --git a/searx/templates/courgette/base.html b/searx/templates/courgette/base.html index 08f9bfa73..58957335d 100644 --- a/searx/templates/courgette/base.html +++ b/searx/templates/courgette/base.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" /> @@ -8,6 +8,9 @@ <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" /> <title>{% block title %}{% endblock %}searx</title> <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" /> + {% if rtl %} + <link rel="stylesheet" href="{{ url_for('static', filename='css/style-rtl.css') }}" type="text/css" media="screen" /> + {% endif %} {% if cookies['courgette-color'] %} <style type="text/css"> {% include 'courgette/color.css' %} diff --git a/searx/templates/courgette/index.html b/searx/templates/courgette/index.html index 810d75165..0d34e1cf6 100644 --- a/searx/templates/courgette/index.html +++ b/searx/templates/courgette/index.html @@ -5,8 +5,13 @@ <div class="title"><h1>searx</h1></div> {% include 'courgette/search.html' %} <p class="top_margin"> + {% if rtl %} + <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> + {% endif %} <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a> + {% if not rtl %} <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> + {% endif %} </p> </div> {% endblock %}
\ No newline at end of file diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html index 64da3fd1c..efa0f65fa 100644 --- a/searx/templates/courgette/preferences.html +++ b/searx/templates/courgette/preferences.html @@ -60,6 +60,16 @@ </p> </fieldset> <fieldset> + <legend>{{ _('SafeSearch') }}</legend> + <p> + <select name='safesearch'> + <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option> + <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option> + <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> + </select> + </p> + </fieldset> + <fieldset> <legend>{{ _('Themes') }}</legend> <p> <select name="theme"> @@ -85,7 +95,7 @@ <fieldset> <legend>{{ _('Currently used search engines') }}</legend> - <table> + <table class="engine-table"> <tr> <th>{{ _('Engine name') }}</th> <th>{{ _('Category') }}</th> @@ -96,10 +106,10 @@ {% if not search_engine.private %} <tr> - <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td> + <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td> <td>{{ _(categ) }}</td> <td class="engine_checkbox"> - <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} /> + <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} /> <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> </td> diff --git a/searx/templates/courgette/results.html b/searx/templates/courgette/results.html index de3c4e678..6d603fdee 100644 --- a/searx/templates/courgette/results.html +++ b/searx/templates/courgette/results.html @@ -8,7 +8,6 @@ </div> <div id="results"> <div id="sidebar"> - <div id="search_url"> {{ _('Search URL') }}: <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly /> diff --git a/searx/templates/default/about.html b/searx/templates/default/about.html index 01d6f444e..1b5fc34c0 100644 --- a/searx/templates/default/about.html +++ b/searx/templates/default/about.html @@ -1,7 +1,7 @@ {% extends 'default/base.html' %} {% block content %} {% include 'default/github_ribbon.html' %} -<div class="row"> +<div class="row"{% if rtl %} dir="ltr"{% endif %}> <h1>About <a href="{{ url_for('index') }}">searx</a></h1> <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users. diff --git a/searx/templates/default/base.html b/searx/templates/default/base.html index 4bca6a7e0..fa96d9437 100644 --- a/searx/templates/default/base.html +++ b/searx/templates/default/base.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" /> @@ -8,6 +8,9 @@ <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" /> <title>{% block title %}{% endblock %}searx</title> <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" /> + {% if rtl %} + <link rel="stylesheet" href="{{ url_for('static', filename='css/style-rtl.css') }}" type="text/css" media="screen" /> + {% endif %} <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" /> {% block styles %} {% endblock %} diff --git a/searx/templates/default/index.html b/searx/templates/default/index.html index 72fbec8ca..fc15a44b6 100644 --- a/searx/templates/default/index.html +++ b/searx/templates/default/index.html @@ -4,8 +4,13 @@ <div class="title"><h1>searx</h1></div> {% include 'default/search.html' %} <p class="top_margin"> + {% if rtl %} + <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> + {% endif %} <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a> + {% if not rtl %} <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a> + {% endif %} </p> </div> {% include 'default/github_ribbon.html' %} diff --git a/searx/templates/default/preferences.html b/searx/templates/default/preferences.html index 1fa8d88b7..43180fd5b 100644 --- a/searx/templates/default/preferences.html +++ b/searx/templates/default/preferences.html @@ -61,6 +61,16 @@ </p> </fieldset> <fieldset> + <legend>{{ _('SafeSearch') }}</legend> + <p> + <select name='safesearch'> + <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option> + <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option> + <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> + </select> + </p> + </fieldset> + <fieldset> <legend>{{ _('Themes') }}</legend> <p> <select name="theme"> @@ -84,10 +94,10 @@ {% if not search_engine.private %} <tr> - <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td> + <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td> <td>{{ _(categ) }}</td> <td class="engine_checkbox"> - <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} /> + <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} /> <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> </td> @@ -103,7 +113,7 @@ </p> <input type="submit" value="{{ _('save') }}" /> - <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div> + <div class="{% if rtl %}left{% else %}right{% endif %} preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div> </form> </div> {% endblock %} diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/default/result_templates/code.html index 0aba4684d..751fb3b56 100644 --- a/searx/templates/default/result_templates/code.html +++ b/searx/templates/default/result_templates/code.html @@ -1,6 +1,6 @@ <div class="result {{ result.class }}">
<h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
- <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
+ <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a></p>
{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
<p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
{% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index b7f9d3557..167db888b 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,6 +1,6 @@ <div class="result {{ result.class }}"> <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a> + <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p> <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p> </div> diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index 159e472b5..b0eda2be5 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -6,7 +6,7 @@ <div> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a> + <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p> <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p> </div> diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html index c83bf5c5d..3f7712e53 100644 --- a/searx/templates/default/results.html +++ b/searx/templates/default/results.html @@ -72,7 +72,7 @@ <div id="pagination"> {% if pageno > 1 %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <div class="left"> + <div class="{% if rtl %}right{% else %}left{% endif %}"> <input type="hidden" name="q" value="{{ q }}" /> {% for category in selected_categories %} <input type="hidden" name="category_{{ category }}" value="1"/> @@ -83,7 +83,7 @@ </form> {% endif %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <div class="right"> + <div class="{% if rtl %}left{% else %}right{% endif %}"> {% for category in selected_categories %} <input type="hidden" name="category_{{ category }}" value="1"/> {% endfor %} diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html index 6f9572546..e1f378294 100644 --- a/searx/templates/oscar/about.html +++ b/searx/templates/oscar/about.html @@ -2,7 +2,7 @@ {% block site_alert_warning_nojs %} {% endblock %} {% block title %}{{ _('about') }} - {% endblock %} {% block content %} -<div> +<div{% if rtl %} dir="ltr"{% endif %}> <h1>About <a href="{{ url_for('index') }}">searx</a></h1> <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users. diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 57c4d5593..df5c53965 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" /> diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html index f38cce5bd..834cffcce 100644 --- a/searx/templates/oscar/categories.html +++ b/searx/templates/oscar/categories.html @@ -1,6 +1,16 @@ <!-- used if scripts are disabled --> <noscript> <div id="categories" class="btn-group btn-toggle"> +{% if rtl %} +{% for category in categories | reverse %} + <!--<div class="checkbox">--> + <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_nojs" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /> + <label class="btn btn-sm btn-primary active label_hide_if_not_checked" for="checkbox_{{ category|replace(' ', '_') }}_nojs">{{ _(category) }}</label> + <label class="btn btn-sm btn-default label_hide_if_checked" for="checkbox_{{ category|replace(' ', '_') }}_nojs">{{ _(category) }}</label> + <!--</div>--> + {% if category in selected_categories %}<input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_dis_activation" name="category_{{ category }}" value="off" checked="checked"/>{% endif %} +{% endfor %} +{% else %} {% for category in categories %} <!--<div class="checkbox">--> <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_nojs" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /> @@ -9,14 +19,24 @@ <!--</div>--> {% if category in selected_categories %}<input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}_dis_activation" name="category_{{ category }}" value="off" checked="checked"/>{% endif %} {% endfor %} +{% endif %} </div> </noscript> <div id="categories" class="btn-group btn-toggle hide_if_nojs" data-toggle="buttons"> +{% if rtl %} +{% for category in categories | reverse %} + <label class="btn btn-sm {% if category in selected_categories %}btn-primary active{% else %}btn-default{% endif %}" data-btn-class="primary"> + <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />{{ _(category) }} + </label> +{% endfor %} +{% else %} {% for category in categories %} <label class="btn btn-sm {% if category in selected_categories %}btn-primary active{% else %}btn-default{% endif %}" data-btn-class="primary"> - <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />{{ _(category) }}</label> + <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />{{ _(category) }} + </label> {% endfor %} +{% endif %} </div> diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 9b253ad93..42721a812 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -28,3 +28,34 @@ <span class="label label-default pull-right">{{ result.engine }}</span>
<p class="text-muted">{{ result.pretty_url }}</p>
{%- endmacro %}
+
+<!-- Draw result footer -->
+{% macro result_footer_rtl(result) -%}
+ <div class="clearfix"></div>
+ <span class="label label-default pull-left">{{ result.engine }}</span>
+ <p class="text-muted">{{ result.pretty_url }}</p>
+{%- endmacro %}
+
+{% macro preferences_item_header(info, label, rtl) -%}
+ {% if rtl %}
+ <div class="row form-group">
+ <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>
+ <div class="col-sm-4 col-md-4">
+ {% else %}
+ <div class="row form-group">
+ <label class="col-sm-3 col-md-2">{{ label }}</label>
+ <div class="col-sm-4 col-md-4">
+ {% endif %}
+{%- endmacro %}
+
+{% macro preferences_item_footer(info, label, rtl) -%}
+ {% if rtl %}
+ </div>
+ <label class="col-sm-3 col-md-2">{{ label }}</label>
+ </div>
+ {% else %}
+ </div>
+ <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>
+ </div>
+ {% endif %}
+{%- endmacro %}
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html index db0d7818f..0c92b09dd 100644 --- a/searx/templates/oscar/navbar.html +++ b/searx/templates/oscar/navbar.html @@ -1,6 +1,24 @@ <!-- Static navbar --> <div class="navbar navbar-default" role="navigation"> <div class="container-fluid"> + {% if rtl %} + <div class="navbar-collapse collapse navbar-left"> + <ul class="nav navbar-nav navbar-left"> <!-- results.html --> + <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li> + <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li> + <li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li> + </ul> + </div> + <div class="navbar-header navbar-right"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> + <span class="sr-only">{{ _('Toggle navigation') }}</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="{{ url_for('index') }}">searx</a> + </div> + {% else %} <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <span class="sr-only">{{ _('Toggle navigation') }}</span> @@ -17,5 +35,6 @@ <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li> </ul> </div><!--/.nav-collapse --> + {% endif %} </div><!--/.container-fluid --> </div> diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index f6f14501e..b98100e8e 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -1,3 +1,4 @@ +{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl %} {% extends "oscar/base.html" %} {% block title %}{{ _('preferences') }} - {% endblock %} {% block site_alert_warning_nojs %} @@ -12,7 +13,7 @@ <form method="post" action="{{ url_for('preferences') }}" id="search_form"> <!-- Nav tabs --> - <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;"> + <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;"> <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li> <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li> </ul> @@ -26,85 +27,94 @@ <fieldset> <div class="container-fluid"> <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label> + {% if rtl %} <div class="col-sm-11 col-md-10"> {% include 'oscar/categories.html' %} </div> - </div> - <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ _('Search language') }}</label> - <div class="col-sm-4 col-md-4"> - <select class="form-control" name='language'> - <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> - {% for lang_id,lang_name,country_name in language_codes %} - <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> - {% endfor %} - </select> - </div> - <span class="col-sm-5 col-md-6 help-block">{{ _('What language do you prefer for search?') }}</span> - </div> - <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ _('Interface language') }}</label> - <div class="col-sm-4 col-md-4"> - <select class="form-control" name='locale'> - {% for locale_id,locale_name in locales.items() %} - <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> - {% endfor %} - </select> + <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label> + {% else %} + <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label> + <div class="col-sm-11 col-md-10"> + {% include 'oscar/categories.html' %} </div> - <span class="col-sm-5 col-md-6 help-block">{{ _('Change the language of the layout') }}</span> + {% endif %} </div> - <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ _('Autocomplete') }}</label> - <div class="col-sm-4 col-md-4"> + {% set language_label = _('Search language') %} + {% set language_info = _('What language do you prefer for search?') %} + {{ preferences_item_header(language_info, language_label, rtl) }} + <select class="form-control" name='language'> + <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> + {% for lang_id,lang_name,country_name in language_codes %} + <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> + {% endfor %} + </select> + {{ preferences_item_footer(language_info, language_label, rtl) }} - <select class="form-control" name="autocomplete"> - <option value=""> - </option> - {% for backend in autocomplete_backends %} - <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> - {% endfor %} - </select> - </div> - <span class="col-sm-5 col-md-6 help-block">{{ _('Find stuff as you type') }}</span> - </div> - <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ _('Image proxy') }}</label> - <div class="col-sm-4 col-md-4"> - <select class="form-control" name='image_proxy'> - <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> - <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option> - </select> - </div> - <span class="col-sm-5 col-md-6 help-block">{{ _('Proxying image results through searx') }}</span> - </div> - <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ _('Method') }}</label> - <div class="col-sm-4 col-md-4"> - <select class="form-control" name='method'> - <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> - <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> - </select> - </div> - <span class="col-sm-5 col-md-6 help-block">{{ _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') }}</span> - </div> - <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ _('Themes') }}</label> - <div class="col-sm-4 col-md-4"> - <select class="form-control" name="theme"> - {% for name in themes %} - <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> - {% endfor %} - </select> - </div> - <span class="col-sm-5 col-md-6 help-block">{{ _('Change searx layout') }}</span> - </div> + {% set locale_label = _('Interface language') %} + {% set locale_info = _('Change the language of the layout') %} + {{ preferences_item_header(locale_info, locale_label, rtl) }} + <select class="form-control" name='locale'> + {% for locale_id,locale_name in locales.items() %} + <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> + {% endfor %} + </select> + {{ preferences_item_footer(locale_info, locale_label, rtl) }} + + {% set autocomplete_label = _('Autocomplete') %} + {% set autocomplete_info = _('Find stuff as you type') %} + {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} + <select class="form-control" name="autocomplete"> + <option value=""> - </option> + {% for backend in autocomplete_backends %} + <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> + {% endfor %} + </select> + {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }} + + {% set image_proxy_label = _('Image proxy') %} + {% set image_proxy_info = _('Proxying image results through searx') %} + {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }} + <select class="form-control" name='image_proxy'> + <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> + <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option> + </select> + {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }} + + {% set method_label = _('Method') %} + {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %} + {{ preferences_item_header(method_info, method_label, rtl) }} + <select class="form-control" name='method'> + <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> + <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> + </select> + {{ preferences_item_footer(method_info, method_label, rtl) }} + + {% set safesearch_label = _('SafeSearch') %} + {% set safesearch_info = _('Filter content') %} + {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} + <select class="form-control" name='safesearch'> + <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option> + <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option> + <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> + </select> + {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }} + + {% set theme_label = _('Themes') %} + {% set theme_info = _('Change searx layout') %} + {{ preferences_item_header(theme_info, theme_label, rtl) }} + <select class="form-control" name="theme"> + {% for name in themes %} + <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> + {% endfor %} + </select> + {{ preferences_item_footer(theme_info, theme_label, rtl) }} </div> </fieldset> </div> <div class="tab-pane active_if_nojs" id="tab_engine"> <!-- Nav tabs --> - <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;"> + <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist" style="margin-bottom:20px;"> {% for (categ,search_engines) in categs %} <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li> {% endfor %} @@ -125,14 +135,19 @@ {% for search_engine in search_engines %} {% if not search_engine.private %} <div class="row"> + {% if not rtl %} <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div> + {% endif %} <div class="col-xs-6 col-sm-4 col-md-4"> <div class="checkbox"> - <input class="hidden" type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} /> + <input class="hidden" type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} /> <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label> <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label> </div> </div> + {% if rtl %} + <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</div> + {% endif %} </div> {% endif %} {% endfor %} @@ -143,7 +158,6 @@ </div> </div> </div> - <p class="text-muted" style="margin:20px 0;">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} <br /> {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html index e608bb04f..0ec0983b3 100644 --- a/searx/templates/oscar/result_templates/code.html +++ b/searx/templates/oscar/result_templates/code.html @@ -1,4 +1,4 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
@@ -9,4 +9,8 @@ {{ result.codelines|code_highlighter(result.code_language)|safe }}
+{% if rtl %}
+{{ result_footer_rtl(result) }}
+{% else %}
{{ result_footer(result) }}
+{% endif %}
diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 2be06642a..fc61b8ce0 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,4 +1,4 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
@@ -15,4 +15,8 @@ {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
+{% if rtl %}
+{{ result_footer_rtl(result) }}
+{% else %}
{{ result_footer(result) }}
+{% endif %}
diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index a2843525f..822c7cdea 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,4 +1,4 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
@@ -40,7 +40,7 @@ {% endif %}
{% if result.osm and (result.osm.type and result.osm.id) %}
- <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}">
+ <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}"{% if rtl %} dir="ltr"{% endif %}>
<div class="text-center" id="result-overpass-table-loading-{{ index }}"><img src="{{ url_for('static', filename='img/loader.gif') }}" alt="Loading ..."/></div>
<table class="table table-striped table-condensed hidden" id="result-overpass-table-{{ index }}">
<tr><th>key</th><th>value</th></tr>
@@ -65,4 +65,8 @@ </div>
{% endif %}
+{% if rtl %}
+{{ result_footer_rtl(result) }}
+{% else %}
{{ result_footer(result) }}
+{% endif %}
diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 53d8ed6fa..bc2b30fbe 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,4 +1,4 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} {{ result_header(result, favicons) }} {{ result_sub_header(result) }} @@ -18,4 +18,8 @@ </p> +{% if rtl %} +{{ result_footer_rtl(result) }} +{% else %} {{ result_footer(result) }} +{% endif %} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 2cf8b61df..ddf2894ac 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,4 +1,4 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}
+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
{{ result_header(result, favicons) }}
{{ result_sub_header(result) }}
@@ -20,4 +20,8 @@ </div>
</div>
+{% if rtl %}
+{{ result_footer_rtl(result) }}
+{% else %}
{{ result_footer(result) }}
+{% endif %}
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index b60c977a5..8303573f0 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -33,6 +33,27 @@ <div class="clearfix"></div>
{% if paging %}
+ {% if rtl %}
+ <div id="pagination">
+ <div class="pull-left">
+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
+ <input type="hidden" name="q" value="{{ q }}" />
+ {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
+ <input type="hidden" name="q" value="{{ q }}" />
+ <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-backward"></span> {{ _('next page') }}</button>
+ </form>
+ </div>
+ <div class="pull-right">
+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
+ {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
+ <input type="hidden" name="pageno" value="{{ pageno-1 }}" />
+ <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-forward"></span> {{ _('previous page') }}</button>
+ </form>
+ </div>
+ </div><!-- /#pagination -->
+ <div class="clearfix"></div>
+ {% else %}
<div id="pagination">
<div class="pull-left">
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
@@ -53,6 +74,7 @@ </div><!-- /#pagination -->
<div class="clearfix"></div>
{% endif %}
+ {% endif %}
</div><!-- /#main_results -->
<div class="col-sm-4" id="sidebar_results">
diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html index b1fe39eb2..26dae418c 100644 --- a/searx/templates/oscar/search_full.html +++ b/searx/templates/oscar/search_full.html @@ -1,7 +1,11 @@ {% from 'oscar/macros.html' import icon %}
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form" role="search">
+ {% if rtl %}
+ <div class="input-group">
+ {% else %}
<div class="input-group col-md-8 col-md-offset-2">
+ {% endif %}
<input type="search" name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}">
<span class="input-group-btn">
<button type="submit" class="btn btn-default input-lg"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
diff --git a/searx/tests/engines/test_bing_images.py b/searx/tests/engines/test_bing_images.py index 59c134623..a1d96b06e 100644 --- a/searx/tests/engines/test_bing_images.py +++ b/searx/tests/engines/test_bing_images.py @@ -12,6 +12,7 @@ class TestBingImagesEngine(SearxTestCase): dicto = defaultdict(dict) dicto['pageno'] = 1 dicto['language'] = 'fr_FR' + dicto['safesearch'] = 1 params = bing_images.request(query, dicto) self.assertTrue('url' in params) self.assertTrue(query in params['url']) diff --git a/searx/tests/engines/test_blekko_images.py b/searx/tests/engines/test_blekko_images.py new file mode 100644 index 000000000..793fadbad --- /dev/null +++ b/searx/tests/engines/test_blekko_images.py @@ -0,0 +1,66 @@ +from collections import defaultdict +import mock +from searx.engines import blekko_images +from searx.testing import SearxTestCase + + +class TestBlekkoImagesEngine(SearxTestCase): + + def test_request(self): + query = 'test_query' + dicto = defaultdict(dict) + dicto['pageno'] = 0 + dicto['safesearch'] = 1 + params = blekko_images.request(query, dicto) + self.assertTrue('url' in params) + self.assertTrue(query in params['url']) + self.assertTrue('blekko.com' in params['url']) + + def test_response(self): + self.assertRaises(AttributeError, blekko_images.response, None) + self.assertRaises(AttributeError, blekko_images.response, []) + self.assertRaises(AttributeError, blekko_images.response, '') + self.assertRaises(AttributeError, blekko_images.response, '[]') + + response = mock.Mock(text='[]') + self.assertEqual(blekko_images.response(response), []) + + json = """ + [ + { + "c": 1, + "page_url": "http://result_url.html", + "title": "Photo title", + "tn_url": "http://ts1.mm.bing.net/th?id=HN.608050619474382748&pid=15.1", + "url": "http://result_image.jpg" + }, + { + "c": 2, + "page_url": "http://companyorange.simpsite.nl/OSM", + "title": "OSM", + "tn_url": "http://ts2.mm.bing.net/th?id=HN.608048068264919461&pid=15.1", + "url": "http://simpsite.nl/userdata2/58985/Home/OSM.bmp" + }, + { + "c": 3, + "page_url": "http://invincible.webklik.nl/page/osm", + "title": "OSM", + "tn_url": "http://ts1.mm.bing.net/th?id=HN.608024514657649476&pid=15.1", + "url": "http://www.webklik.nl/user_files/2009_09/65324/osm.gif" + }, + { + "c": 4, + "page_url": "http://www.offshorenorway.no/event/companyDetail/id/12492", + "title": "Go to OSM Offshore AS homepage", + "tn_url": "http://ts2.mm.bing.net/th?id=HN.608054265899847285&pid=15.1", + "url": "http://www.offshorenorway.no/firmalogo/OSM-logo.png" + } + ] + """ + response = mock.Mock(text=json) + results = blekko_images.response(response) + self.assertEqual(type(results), list) + self.assertEqual(len(results), 4) + self.assertEqual(results[0]['title'], 'Photo title') + self.assertEqual(results[0]['url'], 'http://result_url.html') + self.assertEqual(results[0]['img_src'], 'http://result_image.jpg') diff --git a/searx/tests/engines/test_gigablast.py b/searx/tests/engines/test_gigablast.py new file mode 100644 index 000000000..38264913f --- /dev/null +++ b/searx/tests/engines/test_gigablast.py @@ -0,0 +1,57 @@ +from collections import defaultdict +import mock +from searx.engines import gigablast +from searx.testing import SearxTestCase + + +class TestGigablastEngine(SearxTestCase): + + def test_request(self): + query = 'test_query' + dicto = defaultdict(dict) + dicto['pageno'] = 0 + params = gigablast.request(query, dicto) + self.assertTrue('url' in params) + self.assertTrue(query in params['url']) + self.assertTrue('gigablast.com' in params['url']) + + def test_response(self): + self.assertRaises(AttributeError, gigablast.response, None) + self.assertRaises(AttributeError, gigablast.response, []) + self.assertRaises(AttributeError, gigablast.response, '') + self.assertRaises(AttributeError, gigablast.response, '[]') + + response = mock.Mock(content='<response></response>') + self.assertEqual(gigablast.response(response), []) + + response = mock.Mock(content='<response></response>') + self.assertEqual(gigablast.response(response), []) + + xml = """<?xml version="1.0" encoding="UTF-8" ?> + <response> + <hits>5941888</hits> + <moreResultsFollow>1</moreResultsFollow> + <result> + <title><![CDATA[This should be the title]]></title> + <sum><![CDATA[This should be the content.]]></sum> + <url><![CDATA[http://this.should.be.the.link/]]></url> + <size>90.5</size> + <docId>145414002633</docId> + <siteId>2660021087</siteId> + <domainId>2660021087</domainId> + <spidered>1320519373</spidered> + <indexed>1320519373</indexed> + <pubdate>4294967295</pubdate> + <isModDate>0</isModDate> + <language><![CDATA[English]]></language> + <charset><![CDATA[UTF-8]]></charset> + </result> + </response> + """ + response = mock.Mock(content=xml) + results = gigablast.response(response) + self.assertEqual(type(results), list) + self.assertEqual(len(results), 1) + self.assertEqual(results[0]['title'], 'This should be the title') + self.assertEqual(results[0]['url'], 'http://this.should.be.the.link/') + self.assertEqual(results[0]['content'], 'This should be the content.') diff --git a/searx/tests/engines/test_piratebay.py b/searx/tests/engines/test_piratebay.py index 7207c408a..17bc3a526 100644 --- a/searx/tests/engines/test_piratebay.py +++ b/searx/tests/engines/test_piratebay.py @@ -15,7 +15,7 @@ class TestPiratebayEngine(SearxTestCase): params = piratebay.request(query, dicto) self.assertIn('url', params) self.assertIn(query, params['url']) - self.assertIn('piratebay.cr', params['url']) + self.assertIn('piratebay.se', params['url']) self.assertIn('0', params['url']) dicto['category'] = 'music' @@ -72,7 +72,7 @@ class TestPiratebayEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 1) self.assertEqual(results[0]['title'], 'This is the title') - self.assertEqual(results[0]['url'], 'https://thepiratebay.cr/this.is.the.link') + self.assertEqual(results[0]['url'], 'https://thepiratebay.se/this.is.the.link') self.assertEqual(results[0]['content'], 'This is the content and should be OK') self.assertEqual(results[0]['seed'], 13) self.assertEqual(results[0]['leech'], 334) @@ -120,7 +120,7 @@ class TestPiratebayEngine(SearxTestCase): self.assertEqual(type(results), list) self.assertEqual(len(results), 1) self.assertEqual(results[0]['title'], 'This is the title') - self.assertEqual(results[0]['url'], 'https://thepiratebay.cr/this.is.the.link') + self.assertEqual(results[0]['url'], 'https://thepiratebay.se/this.is.the.link') self.assertEqual(results[0]['content'], 'This is the content and should be OK') self.assertEqual(results[0]['seed'], 0) self.assertEqual(results[0]['leech'], 0) diff --git a/searx/tests/test_engines.py b/searx/tests/test_engines.py index 81296c304..9b1c12cb1 100644 --- a/searx/tests/test_engines.py +++ b/searx/tests/test_engines.py @@ -1,6 +1,7 @@ from searx.tests.engines.test_bing import * # noqa from searx.tests.engines.test_bing_images import * # noqa from searx.tests.engines.test_bing_news import * # noqa +from searx.tests.engines.test_blekko_images import * # noqa from searx.tests.engines.test_btdigg import * # noqa from searx.tests.engines.test_currency_convert import * # noqa from searx.tests.engines.test_dailymotion import * # noqa @@ -13,6 +14,7 @@ from searx.tests.engines.test_dummy import * # noqa from searx.tests.engines.test_faroo import * # noqa from searx.tests.engines.test_flickr import * # noqa from searx.tests.engines.test_flickr_noapi import * # noqa +from searx.tests.engines.test_gigablast import * # noqa from searx.tests.engines.test_github import * # noqa from searx.tests.engines.test_google import * # noqa from searx.tests.engines.test_google_images import * # noqa diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo Binary files differindex d38001865..265f46788 100644 --- a/searx/translations/de/LC_MESSAGES/messages.mo +++ b/searx/translations/de/LC_MESSAGES/messages.mo diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 6c6a53da8..056bf8167 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -1,17 +1,17 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# German translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: -# pointhi, 2014 +# pointhi, 2014-2015 # rike, 2014 # stf <stefan.marsiske@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:54+0100\n" -"PO-Revision-Date: 2014-12-27 10:30+0000\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 17:41+0000\n" "Last-Translator: pointhi\n" "Language-Team: German " "(http://www.transifex.com/projects/p/searx/language/de/)\n" @@ -21,127 +21,238 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "Dateien" + +#: searx/webapp.py:101 +msgid "general" +msgstr "Allgemein" + +#: searx/webapp.py:102 +msgid "music" +msgstr "Musik" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "Soziale Medien" + +#: searx/webapp.py:104 +msgid "images" +msgstr "Bilder" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "Videos" + +#: searx/webapp.py:106 +msgid "it" +msgstr "IT" + +#: searx/webapp.py:107 +msgid "news" +msgstr "Neuigkeiten" + +#: searx/webapp.py:108 +msgid "map" +msgstr "Karte" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "Ladezeit (sek)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Trefferanzahl" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "Punkte" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "Punkte pro Treffer" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" msgstr "Fehler" -#: 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 "Über uns" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "Einstellungen" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "Über uns" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Einstellungen" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "Standardkategorien" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Suchsprache" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Automatisch" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "Oberflächensprache" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Autovervollständigung" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "Bilder Proxy" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "Aktiviert" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "Deaktiviert" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "Methode" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "Sichere Suche" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "Streng" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "Moderat" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "Keine" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Designs" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Farbe" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Blau (Standard)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Violett" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Grün" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Cyan" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Orange" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Rot" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Aktuell benutzte Suchmaschinen" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Suchmaschinenname" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "Kategorie" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "Erlauben" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Blockieren" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -149,9 +260,9 @@ 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:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -159,51 +270,56 @@ 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:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "Speichern" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "Zurück" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "Such-URL" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 msgid "Download results" msgstr "Ergebnisse herunterladen" #: searx/templates/courgette/results.html:34 -#: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "Antworten" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Vorschläge" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "vorherige Seite" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "nächste Seite" #: 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 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Suche nach..." @@ -212,53 +328,86 @@ msgstr "Suche nach..." msgid "Engine stats" msgstr "Suchmaschinenstatistiken" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "ursprüngliche Seite" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "Seeder" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "Leecher" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "magnet Link" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "torrent Datei" + #: 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/results.html:34 -msgid "Answers" -msgstr "Antworten" - -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "eine privatsphären-respektierende, hackbare Metasuchmaschine" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" -msgstr "Navigation umschalten" +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "Im Cache" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "Startseite" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "Navigation umschalten" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "Allgemein" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "Suchmaschinen" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "welche Sprache bevorzugst du für die Suche?" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "ändere die Sprache des Layouts" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "zeige Vorschläge während der Eingabe an" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "tunnel Bilder durch searx" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" @@ -268,27 +417,32 @@ msgstr "" "href=\"https://de.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-" "Anfragemethoden\" rel=\"external\">lerne mehr über Anfragemethoden</a>" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "ändere das Aussehen von searx" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Suchergebnisse" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 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:11 msgid "Start search" msgstr "Suche starten" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "Suchfilter anzeigen" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "Suchfilter verstecken" @@ -353,96 +507,74 @@ msgstr "Oh nein!" msgid "Something went wrong." msgstr "Irgendetwas ist falsch gelaufen." -#: 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 "Im Cache" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" -msgstr "" +msgstr "Medien anzeigen" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" -msgstr "" +msgstr "Medien verstecken" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "Bild ansehen" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "Seite besuchen" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "Karte anzeigen" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "Karte verstecken" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "Details anzeigen" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "Details verstecken" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" -msgstr "Seeder" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" +msgstr "Dateigröße" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Leecher" -msgstr "Leecher" - -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "show video" -msgstr "" - -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "hide video" -msgstr "" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" +msgstr "Bytes" -msgid "Localization" -msgstr "Übersetzung" - -msgid "Yes" -msgstr "Ja" - -msgid "No" -msgstr "Nein" - -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "Dateien" - -msgid "general" -msgstr "Allgemein" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "kiB" -msgid "music" -msgstr "Musik" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "MiB" -msgid "social media" -msgstr "Soziale Medien" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "GiB" -msgid "images" -msgstr "Bilder" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "TiB" -msgid "videos" -msgstr "Videos" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "Anzahl der Dateien" -msgid "it" -msgstr "IT" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "Video anzeigen" -msgid "news" -msgstr "Neuigkeiten" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "Video verstecken" -msgid "map" -msgstr "Karte" +#~ msgid "Filter explicite content" +#~ msgstr "explizite Inhalte filtern" diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo Binary files differindex c3099bf24..f1e013b35 100644 --- a/searx/translations/en/LC_MESSAGES/messages.mo +++ b/searx/translations/en/LC_MESSAGES/messages.mo diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po index cd807e6ac..eba5c86b2 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:54+0100\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" "PO-Revision-Date: 2014-01-30 15:22+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -17,185 +17,301 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "" + +#: searx/webapp.py:101 +msgid "general" +msgstr "" + +#: searx/webapp.py:102 +msgid "music" +msgstr "" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "" + +#: searx/webapp.py:104 +msgid "images" +msgstr "" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "" + +#: searx/webapp.py:106 +msgid "it" +msgstr "" + +#: searx/webapp.py:107 +msgid "news" +msgstr "" + +#: searx/webapp.py:108 +msgid "map" +msgstr "" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" 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 -msgid "about" +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 +msgid "preferences" msgstr "" -#: 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" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" msgstr "" #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 -msgid "Themes" +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" msgstr "" #: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 +msgid "Themes" +msgstr "" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." msgstr "" -#: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." msgstr "" -#: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 msgid "Download results" msgstr "" #: searx/templates/courgette/results.html:34 -#: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "" #: searx/templates/courgette/search.html:3 #: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 -#: searx/templates/oscar/search_full.html:5 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "" @@ -204,80 +320,118 @@ msgstr "" msgid "Engine stats" msgstr "" -#: searx/templates/default/categories.html:8 -msgid "Click on the magnifier to perform search" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" msgstr "" -#: searx/templates/default/results.html:34 -msgid "Answers" +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" msgstr "" -#: searx/templates/oscar/base.html:69 +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "" + +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" +#: searx/templates/oscar/macros.html:20 +msgid "cached" msgstr "" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" msgstr "" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 msgid "Links" msgstr "" -#: 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:11 msgid "Start search" msgstr "" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "" @@ -339,96 +493,80 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: 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 "" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" msgstr "" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" msgstr "" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Leecher" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "show video" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "hide video" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" msgstr "" -msgid "Localization" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" msgstr "" -msgid "Yes" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" msgstr "" -msgid "No" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" msgstr "" -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "" - -msgid "general" -msgstr "" - -msgid "music" -msgstr "" - -msgid "social media" -msgstr "" - -msgid "images" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" msgstr "" -msgid "videos" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" msgstr "" -msgid "it" -msgstr "" +#~ msgid "Localization" +#~ msgstr "" -msgid "news" -msgstr "" +#~ msgid "Yes" +#~ msgstr "" -msgid "map" -msgstr "" +#~ msgid "No" +#~ msgstr "" diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo Binary files differindex 8a36374f6..6089ea6d9 100644 --- a/searx/translations/es/LC_MESSAGES/messages.mo +++ b/searx/translations/es/LC_MESSAGES/messages.mo diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index 6f336bf11..866840e06 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -1,16 +1,16 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# Spanish translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: -# Alejandro León Aznar, 2014 +# Alejandro León Aznar, 2014-2015 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\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 <asciimoo@gmail.com>\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-11 12:51+0000\n" +"Last-Translator: Alejandro León Aznar\n" "Language-Team: Spanish " "(http://www.transifex.com/projects/p/searx/language/es/)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -19,127 +19,238 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "Archivos" + +#: searx/webapp.py:101 +msgid "general" +msgstr "General" + +#: searx/webapp.py:102 +msgid "music" +msgstr "Música" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "" + +#: searx/webapp.py:104 +msgid "images" +msgstr "Imágenes" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "" + +#: searx/webapp.py:106 +msgid "it" +msgstr "TIC" + +#: searx/webapp.py:107 +msgid "news" +msgstr "noticias" + +#: searx/webapp.py:108 +msgid "map" +msgstr "mapa" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "hace {hours} hora(s) y {minutes} minuto(s)" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "Tiempo de carga (segundos)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "Puntuaciones" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "Puntuaciones por resultado" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" msgstr "Errores" -#: 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 "acerca de" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "preferencias" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "acerca de" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Preferencias" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "Categorías predeterminadas" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Buscar idioma" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Automático" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "Idioma de la interfaz" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Autocompletar" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "Imagen proxy" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "Activado" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "Desactivado" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "Método" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "Búsqueda segura" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "Riguroso" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "Ninguno" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Temas" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Color" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Azul (predeterminado)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Violeta" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Verde" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Cian" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Naranja" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Rojo" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Motores de búsqueda actualmente en uso" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Nombre del motor de búsqueda" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "Categoría" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "Permitir" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Bloquear" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -147,9 +258,9 @@ msgstr "" "Esta configuración se guarda en sus cookies, lo que nos permite no " "almacenar dicha información sobre usted." -#: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -157,51 +268,56 @@ msgstr "" "Estas cookies son para su propia comodidad, no las utilizamos para " "rastrearle." -#: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "Guardar" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "Atrás" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "Buscar URL" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 msgid "Download results" msgstr "Descargar resultados" #: searx/templates/courgette/results.html:34 -#: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "Respuestas" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Sugerencias" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "Página anterior" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "Página siguiente" #: 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 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Buscar..." @@ -210,225 +326,252 @@ msgstr "Buscar..." msgid "Engine stats" msgstr "Estadísticas del motor de búsqueda" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "contexto original" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "Fuente" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "Descargador" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "magnet link (enlace sin archivo)" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "archivo torrent" + #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "Haz clic en la lupa para realizar la búsqueda" -#: searx/templates/default/results.html:34 -msgid "Answers" -msgstr "" - -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "Powered by" -msgstr "" +msgstr "Creado por" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" +msgstr "un metabuscador hackeable que respeta la privacidad" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" -msgstr "" +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "en caché" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" -msgstr "" +msgstr "inicio" + +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "Cambiar navegación" -#: searx/templates/oscar/preferences.html:11 #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" -msgstr "" +msgstr "General" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" -msgstr "" +msgstr "Motores" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" -msgstr "" +msgstr "¿Qué idioma prefieres para la búsqueda?" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" -msgstr "" +msgstr "Cambiar idioma de la interfaz" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" -msgstr "" +msgstr "Buscar mientras escribes" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "Filtrando resultados de imágenes en searx" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" msgstr "" +"Modifica cómo se envian los formularios <a " +"href=\"http://es.wikipedia.org/wiki/Hypertext_Transfer_Protocol#M.C3.A9todos_de_petici.C3.B3n\"" +" rel=\"external\">más información sobre métodos de peticiones</a>" -#: searx/templates/oscar/preferences.html:84 -msgid "Change searx layout" +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" msgstr "" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/preferences.html:103 +msgid "Change searx layout" +msgstr "Cambiar aspecto de searx" + +#: searx/templates/oscar/results.html:7 msgid "Search results" -msgstr "" +msgstr "Buscar" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 msgid "Links" -msgstr "" +msgstr "Enlaces" -#: 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:11 msgid "Start search" -msgstr "" +msgstr "Comenzar búsqueda" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" -msgstr "" +msgstr "Mostrar filtros de búsqueda" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" -msgstr "" +msgstr "Ocultar filtros de búsqueda" #: searx/templates/oscar/stats.html:2 msgid "stats" -msgstr "" +msgstr "estadísitcas" #: 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 "Cerrar" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "" +msgstr "¡Atención!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Parece que estás usando searx por primera vez." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "¡Cuidado!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" +msgstr "Por favor, activa JavaScript para poder usar esta página al 100%." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "" +msgstr "Actualmente no hay datos disponibles." #: searx/templates/oscar/messages/no_results.html:7 msgid "Sorry!" -msgstr "" +msgstr "¡Lo siento!" #: 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 "" +"No encontramos nada. Por favor, formule su búsqueda de otra forma o " +"busque en más categorías." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "¡Bien hecho!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "" +msgstr "Configuración guardada correctamente." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "¡Mecachis!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." -msgstr "" +msgstr "Algo ha ido mal." -#: 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 "" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" -msgstr "" +msgstr "mostrar multimedia" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" -msgstr "" +msgstr "ocultar multimedia" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" -msgstr "" +msgstr "Obtener imagen" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" -msgstr "" +msgstr "Ver fuente" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" -msgstr "" +msgstr "mostrar mapa" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" -msgstr "" +msgstr "ocultar mapa" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" -msgstr "" +msgstr "ver detalles" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" -msgstr "" - -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" -msgstr "" - -#: searx/templates/oscar/result_templates/torrent.html:8 -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 "" +msgstr "ocultar detalles" -msgid "Localization" -msgstr "" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" +msgstr "Tamaño de archivo" -msgid "Yes" -msgstr "" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" +msgstr "Bytes" -msgid "No" -msgstr "" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "KiB" -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "Archivos" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "MiB" -msgid "general" -msgstr "General" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "GiB" -msgid "music" -msgstr "Música" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "TiB" -msgid "images" -msgstr "Imágenes" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "Número de archivos" -msgid "it" -msgstr "TIC" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "mostrar vídeo" -msgid "news" -msgstr "noticias" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "ocultar video" -msgid "map" -msgstr "mapa" +#~ msgid "Filter explicite content" +#~ msgstr "Filtrar contenido explícito" diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo Binary files differindex 37507f2f4..3944fd77e 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.mo +++ b/searx/translations/fr/LC_MESSAGES/messages.mo diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po index 6afff3871..e17ecbad0 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.po +++ b/searx/translations/fr/LC_MESSAGES/messages.po @@ -1,18 +1,17 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# French translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: # Benjamin Sonntag <benjamin@sonntag.fr>, 2014 -# Cqoicebordel <david.barouh@wanadoo.fr>, 2014 -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014 +# Cqoicebordel <david.barouh@wanadoo.fr>, 2014-2015 # rike, 2014 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:54+0100\n" -"PO-Revision-Date: 2014-12-14 21:00+0000\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 17:01+0000\n" "Last-Translator: Cqoicebordel <david.barouh@wanadoo.fr>\n" "Language-Team: French " "(http://www.transifex.com/projects/p/searx/language/fr/)\n" @@ -22,127 +21,238 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "fichiers" + +#: searx/webapp.py:101 +msgid "general" +msgstr "général" + +#: searx/webapp.py:102 +msgid "music" +msgstr "musique" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "réseaux sociaux" + +#: searx/webapp.py:104 +msgid "images" +msgstr "images" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "vidéos" + +#: searx/webapp.py:106 +msgid "it" +msgstr "informatique" + +#: searx/webapp.py:107 +msgid "news" +msgstr "actus" + +#: searx/webapp.py:108 +msgid "map" +msgstr "carte" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "il y a {hours} heure(s), {minutes} minute(s)" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "Chargement de la page (sec)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Nombre de résultats" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "Score" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "Score par résultat" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" msgstr "Erreurs" -#: 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 "À propos" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "préférences" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "À propos" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Préférences" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "Catégories par défaut" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Langue de recherche" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Automatique" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "Langue de l'interface" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Complétion automatique" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "Proxy d'images" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "Activé" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "Désactivé" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "Méthode" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "Recherche sécurisée" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "Stricte" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "Moyen" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "Pas du tout" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Thème" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Couleur" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Bleu (défaut)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Violet" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Vert" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Cyan" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Orange" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Rouge" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Moteurs de recherche actuellement utilisés" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Nom du moteur" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "Catégorie" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "Autoriser" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Bloquer" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -150,9 +260,9 @@ 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:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -160,51 +270,56 @@ 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:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "enregistrer" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "retour" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "URL de recherche" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 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:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "Réponses" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Suggestions" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "page précédente" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "page suivante" #: 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 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Rechercher..." @@ -213,53 +328,86 @@ msgstr "Rechercher..." msgid "Engine stats" msgstr "Statistiques du moteur" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "contexte original" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "Sources" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "Téléchargeurs" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "lien magnet" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "fichier torrent" + #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" msgstr "Cliquez sur la loupe pour effectuer une recherche" -#: searx/templates/default/results.html:34 -msgid "Answers" -msgstr "Réponses" - -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "un meta-moteur de recherche hackable et respectueux de la vie privée" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" -msgstr "Afficher/Masquer la navigation" +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "en cache" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "accueil" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "Afficher/Masquer la navigation" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "Général" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "Moteurs" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "Dans quelle langue préférez-vous effectuer la recherche ?" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "Changer la langue d'affichage" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "Chercher au fil de la saisie" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "Proxifier les images de résultats à travers searx" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" @@ -269,27 +417,32 @@ msgstr "" "href=\"https://fr.wikipedia.org/wiki/Hypertext_Transfer_Protocol#M.C3.A9thodes\"" " rel=\"external\">en savoir plus sur les méthodes HTTP</a>" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "Modifier l'affichage de searx" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Résultats de recherche" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 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:11 msgid "Start search" msgstr "Lancer une recherche" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "Afficher les filtres de recherche" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "Cacher les filtres de recherche" @@ -355,96 +508,74 @@ msgstr "Oups !" msgid "Something went wrong." msgstr "Il y a un problème." -#: 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 "en cache" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" msgstr "afficher le média" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" msgstr "cacher le media" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "Voir l'image" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "Voir le source" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "afficher la carte" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "cacher la carte" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "afficher les détails" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "cacher les détails" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" -msgstr "Sources" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" +msgstr "Taille de fichier" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Leecher" -msgstr "Téléchargeurs" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" +msgstr "octets" -#: 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" - -msgid "Yes" -msgstr "Oui" - -msgid "No" -msgstr "Non" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "kio" -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "fichiers" - -msgid "general" -msgstr "général" - -msgid "music" -msgstr "musique" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "Mio" -msgid "social media" -msgstr "réseaux sociaux" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "Gio" -msgid "images" -msgstr "images" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "Tio" -msgid "videos" -msgstr "vidéos" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "Nombre de fichiers" -msgid "it" -msgstr "informatique" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "afficher la vidéo" -msgid "news" -msgstr "actus" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "cacher la vidéo" -msgid "map" -msgstr "carte" +#~ msgid "Filter explicite content" +#~ msgstr "Filtrer le contenu explicite" diff --git a/searx/translations/he/LC_MESSAGES/messages.mo b/searx/translations/he/LC_MESSAGES/messages.mo Binary files differnew file mode 100644 index 000000000..e0f26c913 --- /dev/null +++ b/searx/translations/he/LC_MESSAGES/messages.mo diff --git a/searx/translations/he/LC_MESSAGES/messages.po b/searx/translations/he/LC_MESSAGES/messages.po new file mode 100644 index 000000000..83723f9d4 --- /dev/null +++ b/searx/translations/he/LC_MESSAGES/messages.po @@ -0,0 +1,568 @@ +# Translations template for PROJECT. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# GenghisKhan <genghiskhan@gmx.ca>, 2015 +# GenghisKhan <genghiskhan@gmx.ca>, 2015 +# pointhi, 2014 +# rike, 2014 +# stf <stefan.marsiske@gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-11 13:31+0000\n" +"Last-Translator: pointhi\n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/searx/language/he/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 1.3\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: searx/webapp.py:100 +msgid "files" +msgstr "קבצים" + +#: searx/webapp.py:101 +msgid "general" +msgstr "כללי" + +#: searx/webapp.py:102 +msgid "music" +msgstr "מוזיקה" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "מדיה חברתית" + +#: searx/webapp.py:104 +msgid "images" +msgstr "תמונות" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "סרטונים" + +#: searx/webapp.py:106 +msgid "it" +msgstr "IT" + +#: searx/webapp.py:107 +msgid "news" +msgstr "חדשות" + +#: searx/webapp.py:108 +msgid "map" +msgstr "מפה" + +#: searx/webapp.py:361 +msgid "{minutes} minute(s) ago" +msgstr "לפני {minutes} דקות" + +#: searx/webapp.py:363 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "לפני {hours} שעות, {minutes} דקות" + +#: searx/engines/__init__.py:182 +msgid "Page loads (sec)" +msgstr "עומס עמוד (שניות)" + +#: searx/engines/__init__.py:186 +msgid "Number of results" +msgstr "מספר תוצאות" + +#: searx/engines/__init__.py:190 +msgid "Scores" +msgstr "דירוג" + +#: searx/engines/__init__.py:194 +msgid "Scores per result" +msgstr "דירוג לכל תוצאה" + +#: searx/engines/__init__.py:198 +msgid "Errors" +msgstr "שגיאות" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 +msgid "preferences" +msgstr "העדפות" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "אודות" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/default/preferences.html:5 +#: searx/templates/oscar/preferences.html:12 +msgid "Preferences" +msgstr "העדפות" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/default/preferences.html:9 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 +msgid "Default categories" +msgstr "קטגוריות ברירת מחדל" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 +msgid "Search language" +msgstr "שפת חיפוש" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 +msgid "Automatic" +msgstr "אוטומטי" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 +msgid "Interface language" +msgstr "שפת ממשק" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 +msgid "Autocomplete" +msgstr "השלמה אוטומטית" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "proxy תמונה" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "מאופשר" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "מנוטרל" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 +msgid "Method" +msgstr "שיטה" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "חיפוש בטוח" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "מחמיר" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "מתון" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "בלי" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 +msgid "Themes" +msgstr "מוטיבים" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "צבע" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "כחול (שגרתי)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "סגול" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "ירוק" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "ציאן" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "כתום" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "אדום" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 +msgid "Currently used search engines" +msgstr "מנועי חיפוש שבשימוש עתה" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 +msgid "Engine name" +msgstr "שם מנוע" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 +msgid "Category" +msgstr "קטגוריה" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 +msgid "Allow" +msgstr "התר" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 +msgid "Block" +msgstr "חסום" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "הגדרות אלו הינן מאוחסנות בתוך העוגיות שלך, אלו מאפשרות לנו לא לאחסן את מידע זה אודותייך." + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "עוגיות אלו משרתות את נוחיותך הבלעדית, אנחנו לא משתמשים בהן כדי לעקוב אחריך." + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 +msgid "save" +msgstr "שמור" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 +msgid "back" +msgstr "אחורה" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 +msgid "Search URL" +msgstr "URL חיפוש" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 +msgid "Download results" +msgstr "הורדת תוצאות" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "תשובות" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 +msgid "Suggestions" +msgstr "הצעות" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 +msgid "previous page" +msgstr "עמוד קודם" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 +msgid "next page" +msgstr "עמוד הבא" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 +#: searx/templates/oscar/search_full.html:9 +msgid "Search for..." +msgstr "חיפוש..." + +#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4 +#: searx/templates/oscar/stats.html:5 +msgid "Engine stats" +msgstr "סטטיסטיקות מנוע" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "הקשר מקורי" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "זורע" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "יונק" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "קישור magnet" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "קובץ torrent" + +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "לחצו על הזכוכית מגדלת כדי לבצע חיפוש" + +#: searx/templates/oscar/base.html:74 +msgid "Powered by" +msgstr "" + +#: searx/templates/oscar/base.html:74 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "" + +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "מוטמן" + +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 +msgid "home" +msgstr "בית" + +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "Toggle ניווט" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 +msgid "General" +msgstr "כללי" + +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 +msgid "Engines" +msgstr "מנועים" + +#: searx/templates/oscar/preferences.html:43 +msgid "What language do you prefer for search?" +msgstr "איזו שפה אתם מעדיפים לצורך חיפוש?" + +#: searx/templates/oscar/preferences.html:54 +msgid "Change the language of the layout" +msgstr "שינוי שפת הממשק" + +#: searx/templates/oscar/preferences.html:64 +msgid "Find stuff as you type" +msgstr "מציאת דברים בזמן הקלדה" + +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "Proxying תוצאות תמונה מבעד searx" + +#: searx/templates/oscar/preferences.html:84 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "שינוי האופן בו טפסים נשלחים, <a href=\"http://he.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">למדו עוד אודות שיטות בקשה (request methods)</a>" + +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 +msgid "Change searx layout" +msgstr "שינוי ממשק searx" + +#: searx/templates/oscar/results.html:7 +msgid "Search results" +msgstr "תוצאות חיפוש" + +#: searx/templates/oscar/results.html:105 +msgid "Links" +msgstr "קישורים" + +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:11 +msgid "Start search" +msgstr "התחל חיפוש" + +#: searx/templates/oscar/search_full.html:15 +msgid "Show search filters" +msgstr "הצג מסנני חיפוש" + +#: searx/templates/oscar/search_full.html:15 +msgid "Hide search filters" +msgstr "הסתר מסנני חיפוש" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "סטטיסטיקות" + +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/no_results.html:5 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "סגור" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "זהירות!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "נראה כי אתם משתמשים ב-searx בפעם הראשונה." + +#: searx/templates/oscar/messages/js_disabled.html:2 +msgid "Warning!" +msgstr "אזהרה!" + +#: searx/templates/oscar/messages/js_disabled.html:3 +msgid "Please enable JavaScript to use full functionality of this site." +msgstr "אנא אפשרו JavaScript כדי לנצל תפקודיות מלאה של אתר זה." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "אין כעת מידע זמין. " + +#: searx/templates/oscar/messages/no_results.html:7 +msgid "Sorry!" +msgstr "מצטערים!" + +#: searx/templates/oscar/messages/no_results.html:8 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "לא מצאנו תוצאות. אנא נסו שאילתא אחרת או חפשו בתוך יותר קטגוריות." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "כל הכבוד!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "הגדרות נשמרו בהצלחה." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "אבוי!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "משהו השתבש." + +#: searx/templates/oscar/result_templates/default.html:7 +msgid "show media" +msgstr "הצג מדיה" + +#: searx/templates/oscar/result_templates/default.html:7 +msgid "hide media" +msgstr "הסתר מדיה" + +#: searx/templates/oscar/result_templates/images.html:23 +msgid "Get image" +msgstr "השג תמונה" + +#: searx/templates/oscar/result_templates/images.html:24 +msgid "View source" +msgstr "צפה במקור" + +#: searx/templates/oscar/result_templates/map.html:7 +msgid "show map" +msgstr "הצג מפה" + +#: searx/templates/oscar/result_templates/map.html:7 +msgid "hide map" +msgstr "הסתר מפה" + +#: searx/templates/oscar/result_templates/map.html:11 +msgid "show details" +msgstr "הצג פרטים" + +#: searx/templates/oscar/result_templates/map.html:11 +msgid "hide details" +msgstr "הסתר פרטים" + +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" +msgstr "גודל קובץ" + +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" +msgstr "בייטים" + +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "קי״ב" + +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "מי״ב" + +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "גי״ב" + +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "טי״ב" + +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "מספר קבצים" + +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "הצג וידאו" + +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "הסתר וידאו" diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo Binary files differindex f4d56666f..45c7aa508 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.mo +++ b/searx/translations/hu/LC_MESSAGES/messages.mo diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index 16f021740..38ed56893 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -1,16 +1,15 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# Hungarian translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: -# Adam Tauber <asciimoo@gmail.com>, 2014 -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014 +# Adam Tauber <asciimoo@gmail.com>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:54+0100\n" -"PO-Revision-Date: 2014-12-22 16:11+0000\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 17:21+0000\n" "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Hungarian " "(http://www.transifex.com/projects/p/searx/language/hu/)\n" @@ -20,135 +19,246 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "fájlok" + +#: searx/webapp.py:101 +msgid "general" +msgstr "általános" + +#: searx/webapp.py:102 +msgid "music" +msgstr "zene" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "közösségi média" + +#: searx/webapp.py:104 +msgid "images" +msgstr "képek" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "videók" + +#: searx/webapp.py:106 +msgid "it" +msgstr "it" + +#: searx/webapp.py:107 +msgid "news" +msgstr "hírek" + +#: searx/webapp.py:108 +msgid "map" +msgstr "térkép" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "{minutes} perce" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} óra, {minutes} perce" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "Válaszidők (sec)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Találatok száma" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "Pontszámok" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "Pontszámok találatonként" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" msgstr "Hibák" -#: 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 "rólunk" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "beállítások" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "rólunk" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Beállítások" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "Alapértelmezett kategóriák" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Keresés nyelve" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Automatikus" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "Felület nyelve" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Automatikus kiegészítés" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "Kép proxy" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "Engedélyez" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "Inaktivál" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "Method" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "Felnőtt tartalom szűrés" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "Erős" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "Enyhe" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "Nincs" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Megjelenés" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Szín" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Kék" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Ibolya" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Zöld" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Türkisz" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Narancs" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Piros" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Jelenleg használt keresők" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Kereső neve" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "Kategória" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "Engedélyezés" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Tiltás" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "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:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -156,51 +266,56 @@ 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:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "mentés" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "vissza" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "Keresési URL" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 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:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "Válaszok" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Javaslatok" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "előző oldal" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "következő oldal" #: 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 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Keresés..." @@ -209,53 +324,86 @@ msgstr "Keresés..." msgid "Engine stats" msgstr "Kereső statisztikák" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "eredeti kontextus" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "Seeder" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "Leecher" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "magnet link" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "torrent fájl" + #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" msgstr "A nagyítóra kattintva indítható a keresés" -#: searx/templates/default/results.html:34 -msgid "Answers" -msgstr "Válaszok" - -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Az oldalt kiszolgálja: " -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "egy privátszféra tisztelő, könnyen módosítható metakereső" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" -msgstr "Navigáció megjelenítés" +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "tárolt" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "főoldal" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "Navigáció megjelenítés" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "Általános" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "Kereső motorok" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "Preferált keresési nyelv" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "Felület nyelve" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "Autómatikus kereső kifejezés kiegészítés" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "Kép találatok betöltése searx-ön keresztül" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" @@ -265,27 +413,32 @@ msgstr "" "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">bővebben</a>)" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "Megjelenés" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Keresési eredmények" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 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:11 msgid "Start search" msgstr "Keresés indítása" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "Keresési szűrők megjelenítése" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "Keresési szűrők elrejtése" @@ -347,96 +500,74 @@ msgstr "Oh!" msgid "Something went wrong." 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 "tárolt" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" -msgstr "" +msgstr "médium mutatása" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" -msgstr "" +msgstr "médium elrejtése" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "Kép megjelenítése" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "Forrás megtekintése" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "Térkép" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "Térkép elrejtése" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "Részletek" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "Részletek elrejtése" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" -msgstr "Seeder" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" +msgstr "Fájl méret" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Leecher" -msgstr "Leecher" - -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "show video" -msgstr "" - -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "hide video" -msgstr "" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" +msgstr "Byte" -msgid "Localization" -msgstr "Nyelv" - -msgid "Yes" -msgstr "Igen" - -msgid "No" -msgstr "Nem" - -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "fájlok" - -msgid "general" -msgstr "általános" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "kiB" -msgid "music" -msgstr "zene" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "MiB" -msgid "social media" -msgstr "közösségi média" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "GiB" -msgid "images" -msgstr "képek" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "TiB" -msgid "videos" -msgstr "videók" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "Fájlok száma" -msgid "it" -msgstr "it" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "video mutatása" -msgid "news" -msgstr "hírek" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "video elrejtése" -msgid "map" -msgstr "térkép" +#~ msgid "Filter explicite content" +#~ msgstr "Tartalom szűrés" diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo Binary files differindex ce22605ae..dac396304 100644 --- a/searx/translations/it/LC_MESSAGES/messages.mo +++ b/searx/translations/it/LC_MESSAGES/messages.mo diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index 3a49ca7fe..ba594d4ae 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -1,5 +1,5 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# Italian translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:54+0100\n" -"PO-Revision-Date: 2014-11-26 20:38+0000\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 16:50+0000\n" "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Italian " "(http://www.transifex.com/projects/p/searx/language/it/)\n" @@ -19,127 +19,238 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "documenti" + +#: searx/webapp.py:101 +msgid "general" +msgstr "generale" + +#: searx/webapp.py:102 +msgid "music" +msgstr "musica" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "" + +#: searx/webapp.py:104 +msgid "images" +msgstr "immagini" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "" + +#: searx/webapp.py:106 +msgid "it" +msgstr "it" + +#: searx/webapp.py:107 +msgid "news" +msgstr "notizie" + +#: searx/webapp.py:108 +msgid "map" +msgstr "mappe" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "di {minutes} minuti fa" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "di {ore} h e {minutes} minuti fa" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr " Caricamento della pagina (secondi)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Risultati ottenuti" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "Punteggio" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "Punteggio per risultato" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" msgstr "Errori" -#: 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 "informazioni" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "preferenze" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "informazioni" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Preferenze" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "Categorie predefinite" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Lingua di ricerca" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Automatico" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "Linguaggio dell'interfaccia" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Completamento automatico" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "Metodo" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Grafica" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Motori di ricerca attualmente in uso" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Nome del motore" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "Categoria" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "Autorizza" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Blocca" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -147,9 +258,9 @@ msgstr "" "Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non " "conservare dati su di te." -#: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -157,51 +268,56 @@ msgstr "" "I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie per" " sorvegliarti." -#: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "salva" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "indietro" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "URL della ricerca" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 msgid "Download results" msgstr "Scarica i risultati" #: searx/templates/courgette/results.html:34 -#: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Suggerimenti" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "pagina precedente" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "pagina successiva" #: 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 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Cerca…" @@ -210,80 +326,118 @@ msgstr "Cerca…" msgid "Engine stats" msgstr "Statistiche dei motori" -#: searx/templates/default/categories.html:8 -msgid "Click on the magnifier to perform search" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" msgstr "" -#: searx/templates/default/results.html:34 -msgid "Answers" +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" msgstr "" -#: searx/templates/oscar/base.html:69 +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "" + +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" +#: searx/templates/oscar/macros.html:20 +msgid "cached" msgstr "" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" msgstr "" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 msgid "Links" msgstr "" -#: 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:11 msgid "Start search" msgstr "" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "" @@ -345,90 +499,74 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: 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 "" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" msgstr "" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" msgstr "" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Leecher" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "show video" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "hide video" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" msgstr "" -msgid "Localization" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" msgstr "" -msgid "Yes" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" msgstr "" -msgid "No" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" msgstr "" -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "documenti" - -msgid "general" -msgstr "generale" - -msgid "music" -msgstr "musica" - -msgid "images" -msgstr "immagini" - -msgid "it" -msgstr "it" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "" -msgid "news" -msgstr "notizie" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "" -msgid "map" -msgstr "mappe" +#~ msgid "Filter explicite content" +#~ msgstr "" diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo Binary files differindex 0b25be7a6..6868cb7df 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.mo +++ b/searx/translations/ja/LC_MESSAGES/messages.mo diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index c91fd1f8f..d3350cdd3 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -1,17 +1,16 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# Japanese translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: -# pointhi, 2014 -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014 +# pointhi, 2014-2015 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\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 <asciimoo@gmail.com>\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 17:31+0000\n" +"Last-Translator: pointhi\n" "Language-Team: Japanese " "(http://www.transifex.com/projects/p/searx/language/ja/)\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -20,185 +19,301 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "ファイル" + +#: searx/webapp.py:101 +msgid "general" +msgstr "ウェブ" + +#: searx/webapp.py:102 +msgid "music" +msgstr "音楽" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "" + +#: searx/webapp.py:104 +msgid "images" +msgstr "画像" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "" + +#: searx/webapp.py:106 +msgid "it" +msgstr "情報技術" + +#: searx/webapp.py:107 +msgid "news" +msgstr "ニュース" + +#: searx/webapp.py:108 +msgid "map" +msgstr "地図" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "{minutes}分前" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours}時間と{minutes}分前" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" 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 -msgid "about" -msgstr "に関する" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "設定" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "に関する" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "設定" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "検索の言語" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "界面の言語" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 -msgid "Themes" +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" msgstr "" #: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 +msgid "Themes" +msgstr "" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "色" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "青色 (初期設定)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "菫色" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "緑色" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "シアン色" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "朽葉色" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "赤色" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "カテゴリー" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." msgstr "" -#: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." msgstr "" -#: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "保存" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "バック" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 msgid "Download results" msgstr "ダウンロードの結果" #: searx/templates/courgette/results.html:34 -#: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "提案" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "前のページ" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "次のページ" #: searx/templates/courgette/search.html:3 #: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 -#: searx/templates/oscar/search_full.html:5 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "検索する..." @@ -207,80 +322,118 @@ msgstr "検索する..." msgid "Engine stats" msgstr "" -#: searx/templates/default/categories.html:8 -msgid "Click on the magnifier to perform search" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" msgstr "" -#: searx/templates/default/results.html:34 -msgid "Answers" +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "" + +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" msgstr "" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" +#: searx/templates/oscar/macros.html:20 +msgid "cached" msgstr "" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "スタートページ" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" msgstr "" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 msgid "Links" msgstr "" -#: 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:11 msgid "Start search" msgstr "" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "" @@ -342,90 +495,74 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: 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 "" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" msgstr "" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" msgstr "" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Leecher" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "show video" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "hide video" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" msgstr "" -msgid "Localization" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" msgstr "" -msgid "Yes" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" msgstr "" -msgid "No" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" msgstr "" -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "ファイル" - -msgid "general" -msgstr "ウェブ" - -msgid "music" -msgstr "音楽" - -msgid "images" -msgstr "画像" - -msgid "it" -msgstr "情報技術" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "" -msgid "news" -msgstr "ニュース" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "" -msgid "map" -msgstr "地図" +#~ msgid "Filter explicite content" +#~ msgstr "" diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo Binary files differindex df5e7f45b..e03facda4 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.mo +++ b/searx/translations/nl/LC_MESSAGES/messages.mo diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index e3be7a90e..681c925df 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -1,5 +1,5 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# Dutch translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:54+0100\n" -"PO-Revision-Date: 2014-12-11 13:50+0000\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 16:50+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch " "(http://www.transifex.com/projects/p/searx/language/nl/)\n" @@ -19,127 +19,238 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "bestanden" + +#: searx/webapp.py:101 +msgid "general" +msgstr "algemeen" + +#: searx/webapp.py:102 +msgid "music" +msgstr "muziek" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "social media" + +#: searx/webapp.py:104 +msgid "images" +msgstr "afbeeldingen" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "video's" + +#: searx/webapp.py:106 +msgid "it" +msgstr "it" + +#: searx/webapp.py:107 +msgid "news" +msgstr "nieuws" + +#: searx/webapp.py:108 +msgid "map" +msgstr "kaart" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "{minutes} min geleden" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} uur, {minutes} min geleden" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "Pagina laadt (sec)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Aantal zoekresultaten" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "Scores" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "Scores per zoekresultaat" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" msgstr "Fouten" -#: 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 "over" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "voorkeuren" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "over" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Voorkeuren" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "Standaardcategorieën" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Zoektaal" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Automatisch" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "Interfacetaal" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Auto-aanvullen" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "Methode" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Thema's" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Momenteel gebruikte zoekmachines" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Naam zoekmachine" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "Categorie" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "Toestaan" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Blokkeren" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -147,9 +258,9 @@ 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:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -157,51 +268,56 @@ 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:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "bewaren" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "terug" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "Zoek URL" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 msgid "Download results" msgstr "Downloaden zoekresultaten" #: searx/templates/courgette/results.html:34 -#: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "Antwoorden" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Suggesties" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "vorige pagina" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "volgende pagina" #: 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 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Zoeken naar..." @@ -210,53 +326,86 @@ msgstr "Zoeken naar..." msgid "Engine stats" msgstr "Zoekmachinestatistieken" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "Aanbieder" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "Ophaler" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "" + #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" msgstr "Klik op het vergrootglas om te zoeken" -#: searx/templates/default/results.html:34 -msgid "Answers" -msgstr "Antwoorden" - -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Powered by" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "een privacy eerbiedigende, aanpasbare metazoekmachine" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" -msgstr "Omschakelen navigatie" +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "gecached" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "thuis" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "Omschakelen navigatie" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "Algemeen" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "Zoekmachines" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "Welke taal wil je gebruiken voor het zoeken?" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "Wijzig de taal van de layout" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "Zoek tijdens het typen" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" @@ -266,27 +415,32 @@ msgstr "" "href=\"http://nl.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-" "requests\" rel=\"external\">lees meer over request methodes</a>" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "Wijzig searx layout" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Zoekresultaten" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 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:11 msgid "Start search" msgstr "Start zoeken" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "Toon zoekfilters" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "Verberg zoekfilters" @@ -350,96 +504,74 @@ msgstr "Verdraaid!" msgid "Something went wrong." 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 "gecached" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" msgstr "" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" msgstr "" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "Toon afbeelding" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "Bekijk bron" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "toon kaart" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "verberg kaart" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "toon details" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "verberg details" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" -msgstr "Aanbieder" - -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Leecher" -msgstr "Ophaler" - -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "show video" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "hide video" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" msgstr "" -msgid "Localization" -msgstr "Vertaling" - -msgid "Yes" -msgstr "Ja" - -msgid "No" -msgstr "Nee" - -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "bestanden" - -msgid "general" -msgstr "algemeen" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "" -msgid "music" -msgstr "muziek" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "" -msgid "social media" -msgstr "social media" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "" -msgid "images" -msgstr "afbeeldingen" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "" -msgid "videos" -msgstr "video's" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "" -msgid "it" -msgstr "it" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "" -msgid "news" -msgstr "nieuws" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "" -msgid "map" -msgstr "kaart" +#~ msgid "Filter explicite content" +#~ msgstr "" diff --git a/searx/translations/ru/LC_MESSAGES/messages.mo b/searx/translations/ru/LC_MESSAGES/messages.mo Binary files differindex de4e8c5d4..b03eee4ff 100644 --- a/searx/translations/ru/LC_MESSAGES/messages.mo +++ b/searx/translations/ru/LC_MESSAGES/messages.mo diff --git a/searx/translations/ru/LC_MESSAGES/messages.po b/searx/translations/ru/LC_MESSAGES/messages.po index 7badde73f..4b75e3625 100644 --- a/searx/translations/ru/LC_MESSAGES/messages.po +++ b/searx/translations/ru/LC_MESSAGES/messages.po @@ -1,203 +1,324 @@ -# English translations for PROJECT. -# Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# +# Russian translations for . +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the project. +# # Translators: # dimqua <dimqua@riseup.net>, 2015 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" -"PO-Revision-Date: 2015-01-19 17:32+0000\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 17:01+0000\n" "Last-Translator: dimqua <dimqua@riseup.net>\n" -"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/searx/language/ru_RU/)\n" +"Language-Team: Russian (Russia) " +"(http://www.transifex.com/projects/p/searx/language/ru_RU/)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\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: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: searx/webapp.py:247 +#: searx/webapp.py:100 +msgid "files" +msgstr "файлы" + +#: searx/webapp.py:101 +msgid "general" +msgstr "общие" + +#: searx/webapp.py:102 +msgid "music" +msgstr "музыка" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "соцсети" + +#: searx/webapp.py:104 +msgid "images" +msgstr "картинки" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "видео" + +#: searx/webapp.py:106 +msgid "it" +msgstr "it" + +#: searx/webapp.py:107 +msgid "news" +msgstr "новости" + +#: searx/webapp.py:108 +msgid "map" +msgstr "карта" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "{minutes} минут назад" -#: searx/webapp.py:249 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} час, {minutes} минут назад" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "Время загрузки (сек)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Число результатов" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "Попаданий" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "Попаданий за результат" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 msgid "Errors" 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 -msgid "about" -msgstr "о сайте" - -#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8 -#: searx/templates/oscar/navbar.html:17 -#: searx/templates/oscar/preferences.html:2 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "опции" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "о сайте" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Опции" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 msgid "Default categories" msgstr "Категории по-умолчанию" -#: searx/templates/courgette/preferences.html:15 -#: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Язык поиска" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Выбирать автоматически" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 msgid "Interface language" msgstr "Язык интерфейса" -#: searx/templates/courgette/preferences.html:36 -#: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:53 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Авто-подсказки" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 msgid "Method" msgstr "Метод" -#: searx/templates/courgette/preferences.html:56 -#: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:76 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Темы" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Используемые поисковые движки" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Имя движка" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 msgid "Category" msgstr "Категория" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 msgid "Allow" msgstr "Разрешить" -#: 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Блокировать" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" -"These settings are stored in your cookies, this allows us not to store this " -"data about you." -msgstr "Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить эти сведения о Вас." +"These settings are stored in your cookies, this allows us not to store " +"this data about you." +msgstr "" +"Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить " +"эти сведения о Вас." -#: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:134 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Данные cookies применяются для вашего удобства, мы не используем их, чтобы отслеживать Вас." +msgstr "" +"Данные cookies применяются для вашего удобства, мы не используем их, " +"чтобы отслеживать Вас." -#: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:137 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "сохранить" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "назад" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:83 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 msgid "Search URL" msgstr "Ссылка на поиск" #: searx/templates/courgette/results.html:16 -#: searx/templates/default/results.html:16 -#: searx/templates/oscar/results.html:88 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 msgid "Download results" msgstr "Загрузить результаты" #: searx/templates/courgette/results.html:34 -#: searx/templates/default/results.html:42 -#: searx/templates/oscar/results.html:63 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "Ответы" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Предложения" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:37 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "предыдущая стр." -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:45 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "следующая стр. " #: searx/templates/courgette/search.html:3 #: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4 -#: searx/templates/oscar/search_full.html:5 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Искать..." @@ -206,81 +327,121 @@ msgstr "Искать..." msgid "Engine stats" msgstr "Статистика движков" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "Сидер" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "Личер" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "" + #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" msgstr "Нажмите на лупу, чтобы выполнить поиск" -#: searx/templates/default/results.html:34 -msgid "Answers" -msgstr "Ответы" - -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Используется" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 msgid "a privacy-respecting, hackable metasearch engine" msgstr "свободный движок метапоиска, уважающий вашу приватность" -#: searx/templates/oscar/navbar.html:6 -msgid "Toggle navigation" -msgstr "Переключить навигацию" +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "в архиве" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "главная" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "Переключить навигацию" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "Общие" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "Движки" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "На каком языке вы предпочитаете искать?" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "Изменить язык сайта" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "Поисковые предложения при наборе" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" -msgstr "Изменяет способ отправки запросов, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">более подробно о методах запросов</a>" +msgstr "" +"Изменяет способ отправки запросов, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">более подробно о методах запросов</a>" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "Изменить тему сайта" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Результаты поиска" -#: searx/templates/oscar/results.html:78 +#: searx/templates/oscar/results.html:105 msgid "Links" msgstr "Ссылки" #: searx/templates/oscar/search.html:6 -#: searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search_full.html:11 msgid "Start search" msgstr "Начать поиск" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "Показать фильтры поиска" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "Скрыть фильтры поиска" @@ -324,7 +485,9 @@ msgstr "Сожалеем!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "результатов не найдено. Попробуйте другой запрос или выберете больше категорий." +msgstr "" +"результатов не найдено. Попробуйте другой запрос или выберете больше " +"категорий." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -342,95 +505,74 @@ msgstr "Вот чёрт!" msgid "Something went wrong." msgstr "Что-то пошло не так." -#: 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 "в архиве" - -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" msgstr "показать медиа" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" msgstr "скрыть медиа" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "Скачать изображение" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "Посмотреть источник" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "показать карту" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "скрыть карту" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "показать подробности" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "hide details" msgstr "скрыть подробности" -#: searx/templates/oscar/result_templates/torrent.html:8 -msgid "Seeder" -msgstr "Сидер" - -#: searx/templates/oscar/result_templates/torrent.html:8 -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 "Локализация" - -msgid "Yes" -msgstr "Да" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" +msgstr "" -msgid "No" -msgstr "Нет" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" +msgstr "" -# categories - manually added -# TODO - automatically add -msgid "files" -msgstr "файлы" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" +msgstr "" -msgid "general" -msgstr "общие" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "" -msgid "music" -msgstr "музыка" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "" -msgid "social media" -msgstr "соцсети" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "" -msgid "images" -msgstr "картинки" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "" -msgid "videos" -msgstr "видео" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "показать видео" -msgid "it" -msgstr "it" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "скрыть видео" -msgid "news" -msgstr "новости" +#~ msgid "Filter explicite content" +#~ msgstr "" -msgid "map" -msgstr "карта" diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.mo Binary files differindex 2ea370523..ce447a3f7 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.mo +++ b/searx/translations/tr/LC_MESSAGES/messages.mo diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po index 22190141e..951cdb34c 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.po +++ b/searx/translations/tr/LC_MESSAGES/messages.po @@ -1,16 +1,15 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION +# Turkish translations for . +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the project. # # Translators: # Caner Başaran <basaran.caner@gmail.com>, 2014 -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-01-05 20:54+0100\n" -"PO-Revision-Date: 2014-12-28 08:20+0000\n" +"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"PO-Revision-Date: 2015-02-10 16:50+0000\n" "Last-Translator: Caner Başaran <basaran.caner@gmail.com>\n" "Language-Team: Turkish " "(http://www.transifex.com/projects/p/searx/language/tr/)\n" @@ -20,127 +19,238 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:263 +#: searx/webapp.py:100 +msgid "files" +msgstr "dosyalar" + +#: searx/webapp.py:101 +msgid "general" +msgstr "genel" + +#: searx/webapp.py:102 +msgid "music" +msgstr "müzik" + +#: searx/webapp.py:103 +msgid "social media" +msgstr "sosyal medya" + +#: searx/webapp.py:104 +msgid "images" +msgstr "görseller" + +#: searx/webapp.py:105 +msgid "videos" +msgstr "videolar" + +#: searx/webapp.py:106 +msgid "it" +msgstr "bilişim" + +#: searx/webapp.py:107 +msgid "news" +msgstr "haberler" + +#: searx/webapp.py:108 +msgid "map" +msgstr "harita" + +#: searx/webapp.py:361 msgid "{minutes} minute(s) ago" msgstr "{minutes} dakika() önce" -#: searx/webapp.py:265 +#: searx/webapp.py:363 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} saat(), {minutes} dakika() önce" -#: searx/engines/__init__.py:179 +#: searx/engines/__init__.py:182 msgid "Page loads (sec)" msgstr "Yüklenen sayfa (sn)" -#: searx/engines/__init__.py:183 +#: searx/engines/__init__.py:186 msgid "Number of results" msgstr "Sonuç sayısı" -#: searx/engines/__init__.py:187 +#: searx/engines/__init__.py:190 msgid "Scores" msgstr "" -#: searx/engines/__init__.py:191 +#: searx/engines/__init__.py:194 msgid "Scores per result" msgstr "" -#: searx/engines/__init__.py:195 +#: searx/engines/__init__.py:198 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 +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/default/index.html:8 searx/templates/default/index.html:12 +#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35 +#: searx/templates/oscar/preferences.html:3 msgid "preferences" msgstr "tercihler" +#: searx/templates/courgette/index.html:11 +#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3 +#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34 +msgid "about" +msgstr "hakkında" + #: searx/templates/courgette/preferences.html:5 #: searx/templates/default/preferences.html:5 -#: searx/templates/oscar/preferences.html:6 +#: searx/templates/oscar/preferences.html:12 msgid "Preferences" msgstr "Tercihler" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:24 +#: searx/templates/oscar/preferences.html:34 +#: searx/templates/oscar/preferences.html:36 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 +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/default/preferences.html:14 +#: searx/templates/oscar/preferences.html:42 msgid "Search language" msgstr "Arama dili" -#: searx/templates/courgette/preferences.html:18 -#: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:33 +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/default/preferences.html:17 +#: searx/templates/oscar/preferences.html:46 msgid "Automatic" msgstr "Otomatik" -#: searx/templates/courgette/preferences.html:26 -#: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:42 +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/default/preferences.html:25 +#: searx/templates/oscar/preferences.html:53 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 +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/default/preferences.html:35 +#: searx/templates/oscar/preferences.html:63 msgid "Autocomplete" msgstr "Otomatik tamamlama" -#: searx/templates/courgette/preferences.html:47 -#: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:66 +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/default/preferences.html:46 +#: searx/templates/oscar/preferences.html:74 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/default/preferences.html:49 +#: searx/templates/oscar/preferences.html:78 +msgid "Enabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/default/preferences.html:50 +#: searx/templates/oscar/preferences.html:79 +msgid "Disabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/default/preferences.html:55 +#: searx/templates/oscar/preferences.html:83 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 +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/default/preferences.html:64 +#: searx/templates/oscar/preferences.html:92 +msgid "SafeSearch" +msgstr "" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/default/preferences.html:67 +#: searx/templates/oscar/preferences.html:96 +msgid "Strict" +msgstr "" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/default/preferences.html:68 +#: searx/templates/oscar/preferences.html:97 +msgid "Moderate" +msgstr "" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/default/preferences.html:69 +#: searx/templates/oscar/preferences.html:98 +msgid "None" +msgstr "" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/default/preferences.html:74 +#: searx/templates/oscar/preferences.html:102 msgid "Themes" msgstr "Temalar" -#: searx/templates/courgette/preferences.html:66 -#: searx/templates/default/preferences.html:66 +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/default/preferences.html:84 msgid "Currently used search engines" msgstr "Şu anda kullanılan arama motorları" -#: searx/templates/courgette/preferences.html:70 -#: searx/templates/default/preferences.html:70 +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/default/preferences.html:88 msgid "Engine name" msgstr "Motor adı" -#: searx/templates/courgette/preferences.html:71 -#: searx/templates/default/preferences.html:71 +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/default/preferences.html:89 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:101 +#: searx/templates/oscar/preferences.html:145 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 +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/default/preferences.html:90 +#: searx/templates/default/preferences.html:102 +#: searx/templates/oscar/preferences.html:144 msgid "Block" msgstr "Engelle" -#: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:132 +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/default/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -148,59 +258,64 @@ 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 +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/default/preferences.html:112 +#: searx/templates/oscar/preferences.html:163 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 +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/default/preferences.html:115 +#: searx/templates/oscar/preferences.html:166 msgid "save" msgstr "kaydet" -#: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:138 +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/default/preferences.html:116 +#: searx/templates/oscar/preferences.html:167 msgid "back" msgstr "geri" #: searx/templates/courgette/results.html:12 -#: searx/templates/default/results.html:12 -#: searx/templates/oscar/results.html:87 +#: searx/templates/default/results.html:13 +#: searx/templates/oscar/results.html:110 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:92 +#: searx/templates/default/results.html:17 +#: searx/templates/oscar/results.html:115 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:67 +#: searx/templates/default/results.html:35 +msgid "Answers" +msgstr "" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/default/results.html:43 +#: searx/templates/oscar/results.html:90 msgid "Suggestions" msgstr "Öneriler" -#: searx/templates/courgette/results.html:62 -#: searx/templates/default/results.html:78 -#: searx/templates/oscar/results.html:41 +#: searx/templates/courgette/results.html:70 +#: searx/templates/default/results.html:81 +#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63 msgid "previous page" msgstr "önceki sayfa" -#: searx/templates/courgette/results.html:73 -#: searx/templates/default/results.html:89 -#: searx/templates/oscar/results.html:49 +#: searx/templates/courgette/results.html:81 +#: searx/templates/default/results.html:92 +#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71 msgid "next page" msgstr "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 +#: searx/templates/oscar/search_full.html:9 msgid "Search for..." msgstr "Aramak için..." @@ -209,55 +324,88 @@ msgstr "Aramak için..." msgid "Engine stats" msgstr "Arama motoru istatistikleri" +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/default/result_templates/images.html:4 +msgid "original context" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Seeder" +msgstr "Besleyenler" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/default/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +msgid "Leecher" +msgstr "Sömürenler" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/default/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:21 +msgid "magnet link" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/default/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:22 +msgid "torrent file" +msgstr "" + #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" msgstr "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 +#: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Gücümün kaynağı" -#: searx/templates/oscar/base.html:69 +#: searx/templates/oscar/base.html:74 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/macros.html:20 +msgid "cached" +msgstr "önbellek" -#: searx/templates/oscar/navbar.html:15 +#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "anasayfa" -#: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24 +msgid "Toggle navigation" +msgstr "" + #: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:23 msgid "General" msgstr "Genel" -#: searx/templates/oscar/preferences.html:12 -#: searx/templates/oscar/preferences.html:99 +#: searx/templates/oscar/preferences.html:18 +#: searx/templates/oscar/preferences.html:124 msgid "Engines" msgstr "Motorlar" -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:43 msgid "What language do you prefer for search?" msgstr "Arama için hangi dili tercih edersiniz?" -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:54 msgid "Change the language of the layout" msgstr "Yerleşim düzeninin dilini değiştir" -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:64 msgid "Find stuff as you type" msgstr "Leb demeden leblebiyi anlasın" -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:75 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:84 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" @@ -267,27 +415,32 @@ msgstr "" "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">istek yöntemleri hakkında daha fazla bilgi</a>" -#: searx/templates/oscar/preferences.html:84 +#: searx/templates/oscar/preferences.html:93 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:103 msgid "Change searx layout" msgstr "searx yerleşim düzenini değiştir" -#: searx/templates/oscar/results.html:6 +#: searx/templates/oscar/results.html:7 msgid "Search results" msgstr "Arama sonuçları" -#: searx/templates/oscar/results.html:82 +#: searx/templates/oscar/results.html:105 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:11 msgid "Start search" msgstr "Aramayı başlat" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Show search filters" msgstr "Arama filtrelerini göster" -#: searx/templates/oscar/search_full.html:11 +#: searx/templates/oscar/search_full.html:15 msgid "Hide search filters" msgstr "Arama filtrelerini gizle" @@ -353,96 +506,74 @@ msgstr "Tüh tüh!" 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/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "show media" msgstr "" -#: searx/templates/oscar/result_templates/default.html:9 +#: searx/templates/oscar/result_templates/default.html:7 msgid "hide media" msgstr "" -#: searx/templates/oscar/result_templates/images.html:21 +#: searx/templates/oscar/result_templates/images.html:23 msgid "Get image" msgstr "Görseli indir" -#: searx/templates/oscar/result_templates/images.html:22 +#: searx/templates/oscar/result_templates/images.html:24 msgid "View source" msgstr "Kaynağı göster" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "show map" msgstr "haritayı göster" -#: searx/templates/oscar/result_templates/map.html:10 +#: searx/templates/oscar/result_templates/map.html:7 msgid "hide map" msgstr "haritayı gizle" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 msgid "show details" msgstr "ayrıntıları göster" -#: searx/templates/oscar/result_templates/map.html:14 +#: searx/templates/oscar/result_templates/map.html:11 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" - -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "show video" +#: searx/templates/oscar/result_templates/torrent.html:7 +msgid "Filesize" msgstr "" -#: searx/templates/oscar/result_templates/videos.html:9 -msgid "hide video" +#: searx/templates/oscar/result_templates/torrent.html:9 +msgid "Bytes" msgstr "" -msgid "Localization" +#: searx/templates/oscar/result_templates/torrent.html:10 +msgid "kiB" 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" +#: searx/templates/oscar/result_templates/torrent.html:11 +msgid "MiB" +msgstr "" -msgid "social media" -msgstr "sosyal medya" +#: searx/templates/oscar/result_templates/torrent.html:12 +msgid "GiB" +msgstr "" -msgid "images" -msgstr "görseller" +#: searx/templates/oscar/result_templates/torrent.html:13 +msgid "TiB" +msgstr "" -msgid "videos" -msgstr "videolar" +#: searx/templates/oscar/result_templates/torrent.html:15 +msgid "Number of Files" +msgstr "" -msgid "it" -msgstr "bilişim" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "show video" +msgstr "" -msgid "news" -msgstr "haberler" +#: searx/templates/oscar/result_templates/videos.html:7 +msgid "hide video" +msgstr "" -msgid "map" -msgstr "harita" +#~ msgid "Filter explicite content" +#~ msgstr "" diff --git a/searx/utils.py b/searx/utils.py index c0afc94cb..e6c107e24 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -231,7 +231,22 @@ def prettify_url(url): def get_blocked_engines(engines, cookies): if 'blocked_engines' not in cookies: - return [engine for engine in engines if engines[engine].disabled] + return [(engine_name, category) for engine_name in engines + for category in engines[engine_name].categories if engines[engine_name].disabled] - return [engine for engine in cookies.get('blocked_engines', '').split(',') - if engine in engines] + blocked_engine_strings = cookies.get('blocked_engines', '').split(',') + blocked_engines = [] + + if not blocked_engine_strings: + return blocked_engines + + for engine_string in blocked_engine_strings: + if engine_string.find('__') > -1: + engine, category = engine_string.split('__', 1) + if engine in engines and category in engines[engine].categories: + blocked_engines.append((engine, category)) + elif engine_string in engines: + for category in engines[engine_string].categories: + blocked_engines.append((engine_string, category)) + + return blocked_engines diff --git a/searx/version.py b/searx/version.py index d8888fc98..27c85e206 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 = 6 +VERSION_MINOR = 7 VERSION_BUILD = 0 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR, diff --git a/searx/webapp.py b/searx/webapp.py index d92302b69..b12a08db5 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -20,7 +20,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. if __name__ == '__main__': from sys import path from os.path import realpath, dirname - path.append(realpath(dirname(realpath(__file__))+'/../')) + path.append(realpath(dirname(realpath(__file__)) + '/../')) import json import cStringIO @@ -28,8 +28,8 @@ import os import hashlib from datetime import datetime, timedelta -from itertools import chain from urllib import urlencode +from werkzeug.contrib.fixers import ProxyFix from flask import ( Flask, request, render_template, url_for, Response, make_response, redirect, send_from_directory @@ -85,15 +85,28 @@ app.secret_key = settings['server']['secret_key'] babel = Babel(app) +rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'glk', 'he', + 'ku', 'mzn', 'pnb'', ''ps', 'sd', 'ug', 'ur', 'yi'] + global_favicons = [] for indice, theme in enumerate(themes): global_favicons.append([]) - theme_img_path = searx_dir+"/static/themes/"+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) cookie_max_age = 60 * 60 * 24 * 365 * 5 # 5 years +_category_names = (gettext('files'), + gettext('general'), + gettext('music'), + gettext('social media'), + gettext('images'), + gettext('videos'), + gettext('it'), + gettext('news'), + gettext('map')) + @babel.localeselector def get_locale(): @@ -215,15 +228,14 @@ def image_proxify(url): if url.startswith('//'): url = 'https:' + url - url = url.encode('utf-8') - if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'): return url - h = hashlib.sha256(url + settings['server']['secret_key'].encode('utf-8')).hexdigest() + hash_string = url + settings['server']['secret_key'] + h = hashlib.sha256(hash_string.encode('utf-8')).hexdigest() return '{0}?{1}'.format(url_for('image_proxy'), - urlencode(dict(url=url, h=h))) + urlencode(dict(url=url.encode('utf-8'), h=h))) def render(template_name, override_theme=None, **kwargs): @@ -234,11 +246,9 @@ def render(template_name, override_theme=None, **kwargs): if autocomplete not in autocomplete_backends: autocomplete = None - nonblocked_categories = (engines[e].categories - for e in engines - if e not in blocked_engines) - - nonblocked_categories = set(chain.from_iterable(nonblocked_categories)) + nonblocked_categories = set(category for engine_name in engines + for category in engines[engine_name].categories + if (engine_name, category) not in blocked_engines) if 'categories' not in kwargs: kwargs['categories'] = ['general'] @@ -265,10 +275,15 @@ def render(template_name, override_theme=None, **kwargs): if 'autocomplete' not in kwargs: kwargs['autocomplete'] = autocomplete + if get_locale() in rtl_locales and 'rtl' not in kwargs: + kwargs['rtl'] = True + kwargs['searx_version'] = VERSION_STRING kwargs['method'] = request.cookies.get('method', 'POST') + kwargs['safesearch'] = request.cookies.get('safesearch', '1') + # override url_for function in templates kwargs['url_for'] = url_for_theme @@ -473,6 +488,8 @@ def preferences(): locale = None autocomplete = '' method = 'POST' + safesearch = '1' + for pd_name, pd in request.form.items(): if pd_name.startswith('category_'): category = pd_name[9:] @@ -491,22 +508,22 @@ def preferences(): lang = pd elif pd_name == 'method': method = pd + elif pd_name == 'safesearch': + safesearch = pd elif pd_name.startswith('engine_'): - engine_name = pd_name.replace('engine_', '', 1) - if engine_name in engines: - blocked_engines.append(engine_name) + if pd_name.find('__') > -1: + engine_name, category = pd_name.replace('engine_', '', 1).split('__', 1) + if engine_name in engines and category in engines[engine_name].categories: + blocked_engines.append((engine_name, category)) elif pd_name == 'theme': theme = pd if pd in themes else default_theme else: resp.set_cookie(pd_name, pd, max_age=cookie_max_age) - user_blocked_engines = request.cookies.get('blocked_engines', '').split(',') # noqa - - if sorted(blocked_engines) != sorted(user_blocked_engines): - resp.set_cookie( - 'blocked_engines', ','.join(blocked_engines), - max_age=cookie_max_age - ) + resp.set_cookie( + 'blocked_engines', ','.join('__'.join(e) for e in blocked_engines), + max_age=cookie_max_age + ) if locale: resp.set_cookie( @@ -534,6 +551,8 @@ def preferences(): resp.set_cookie('method', method, max_age=cookie_max_age) + resp.set_cookie('safesearch', safesearch, max_age=cookie_max_age) + resp.set_cookie('image_proxy', image_proxy, max_age=cookie_max_age) resp.set_cookie('theme', theme, max_age=cookie_max_age) @@ -589,7 +608,7 @@ def image_proxy(): img = '' chunk_counter = 0 - for chunk in resp.iter_content(1024*1024): + for chunk in resp.iter_content(1024 * 1024): chunk_counter += 1 if chunk_counter > 5: return '', 502 # Bad gateway - file is too big (>5M) @@ -657,6 +676,8 @@ def run(): application = app +app.wsgi_app = ProxyFix(application.wsgi_app) + if __name__ == "__main__": run() |