e30f43b · searx · git.iko.soy

git.iko.soy/searx

Merge remote-tracking branch 'asciimoo/master'

commite30f43bd81b3d7a682b3bb65eacd20ddb46b5230 authorThomas Pointhuber <thomas.pointhuber@gmx.at> dateWed 5 Mar 2014, 15:10 (13 years ago) parent07f83ca 73ab925

22 files changed+383−162

compare with master

unifiedsplit

searx/engines/xpath.py+2−2

@@ -1,7 +1,7 @@

11from lxml import html

22from urllib import urlencode, unquote

33from urlparse import urlparse, urljoin

4−from lxml.etree import _ElementStringResult

4+from lxml.etree import _ElementStringResult, _ElementUnicodeResult

55from searx.utils import html_to_text

77search_url = None

@@ -29,7 +29,7 @@ def extract_text(xpath_results):

2929 for e in xpath_results:

3030 result = result + extract_text(e)

3131 return result

32− elif type(xpath_results) == _ElementStringResult:

32+ elif type(xpath_results) in [_ElementStringResult, _ElementUnicodeResult]:

3333 # it's a string

3434 return ''.join(xpath_results)

3535 else:

searx/settings.yml+4−3

@@ -21,7 +21,7 @@ engines:

2121 engine : bing_news

2222 locale : en-US

2323 shortcut : bin

24−

24+

2525 - name : currency

2626 engine : currency_convert

2727 categories : general

@@ -69,7 +69,7 @@ engines:

6969 - name : google news

7070 engine : google_news

7171 shortcut : gon

72−

72+

7373 - name : piratebay

7474 engine : piratebay

7575 categories : videos, music, files

@@ -124,7 +124,7 @@ engines:

124124 - name : yahoo news

125125 engine : yahoo_news

126126 shortcut : yhn

127−

127+

128128 - name : youtube

129129 engine : youtube

130130 categories : videos

@@ -150,3 +150,4 @@ locales:

150150 de : Deutsch

151151 hu : Magyar

152152 fr : Français

153+ es : Español

searx/static/css/style.css+2

@@ -165,6 +165,8 @@ tr:hover { background: #DDDDDD; }

165165#suggestions span { display: block; margin: 0 2px 2px 2px; padding: 0; }

166166#suggestions form { display: block; }

167167#suggestions input { padding: 2px 6px; margin: 2px 4px; font-size: 0.8em; display: inline-block; background: #3498DB; color: #FFFFFF; border-radius: 4px; border: 0; cursor: pointer; }

168+#search_url { margin-top: 8px; }

169+#search_url input { border: 1px solid #888888; padding: 4px; color: #444444; width: 20em; display: block; margin: 4px; }

168170

169171#preferences {

170172 top: 10px;

searx/templates/about.html+3−3

@@ -2,9 +2,9 @@

22{% block content %}

33{% include 'github_ribbon.html' %}

44<div class="row">

5− <h1>About <a href="/">searx</a></h1>

5+ <h1>About <a href="{{ url_for('index') }}">searx</a></h1>

7− <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="/preferences">search engines</a> while not storing information about its users.

7+ <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.

88 </p>

99 <h2>Why use Searx?</h2>

1010 <ul>

@@ -60,7 +60,7 @@ Searx can be added to your browser's search bar; moreover, it can be set as the

6060<p>See the <a href="https://github.com/asciimoo/searx/wiki/Installation">installation and setup</a> wiki page</p>

6161

6262<h3>How to debug engines?</h3>

63−<p><a href="/stats">Stats page</a> contains some useful data about the engines used.</p>

63+<p><a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.</p>

6464

6565</div>

6666{% endblock %}

searx/templates/base.html+3−3

@@ -6,19 +6,19 @@

66 <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />

77 <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />

88 <title>{% block title %}{% endblock %}searx</title>

9− <link rel="stylesheet" href="/static/css/style.css" type="text/css" media="screen" />

9+ <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />

1010 <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />

1111 {% block styles %}

1212 {% endblock %}

1313 {% block head %}

14− <link title="searx" type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml"/>

14+ <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>

1515 {% endblock %}

1616</head>

1717<body>

1818<div id="container">

1919{% block content %}

2020{% endblock %}

21−<script src="/static/js/searx.js" ></script>

21+<script src="{{ url_for('static', filename='js/searx.js') }}" ></script>

2222</div>

2323</body>

2424</html>

searx/templates/github_ribbon.html+1−1

@@ -1,3 +1,3 @@

11<a href="https://github.com/asciimoo/searx" class="github">

2− <img style="position: absolute; top: 0; right: 0; border: 0;" src="/static/img/github_ribbon.png" alt="Fork me on GitHub" class="github"/>

2+ <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>

33</a>

searx/templates/index.html+2−2

@@ -4,8 +4,8 @@

44 <div class="title"><h1>searx</h1></div>

55 {% include 'search.html' %}

66 <p class="top_margin">

7− <a href="/about" class="hmarg">{{ _('about') }}</a>

8− <a href="/preferences" class="hmarg">{{ _('preferences') }}</a>

7+ <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>

8+ <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>

99 </p>

1010</div>

1111{% endblock %}

searx/templates/preferences.html+2−2

@@ -4,7 +4,7 @@

44<div class="row">

55 <h2>{{ _('Preferences') }}</h2>

7− <form method="post" action="/preferences" id="search_form">

7+ <form method="post" action="{{ url_for('preferences') }}" id="search_form">

88 <fieldset>

99 <legend>{{ _('Default categories') }}</legend>

1010 <p>

@@ -66,6 +66,6 @@

6666

6767 <input type="submit" value="{{ _('save') }}" />

6868 </form>

69− <div class="right"><a href="/">{{ _('back') }}</a></div>

69+ <div class="right"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>

7070</div>

7171{% endblock %}

searx/templates/results.html+10−6

@@ -1,7 +1,7 @@

11{% extends "base.html" %}

22{% block title %}{{ q }} - {% endblock %}

33{% block content %}

4−<div class="right"><a href="/preferences" id="preferences"><span>preferences</span></a></div>

4+<div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>

55<div class="small search">

66 {% include 'search.html' %}

77</div>

@@ -10,18 +10,22 @@

1010 {% if suggestions %}

1111 <div id="suggestions"><span>{{ _('Suggestions') }}</span>

1212 {% for suggestion in suggestions %}

13− <form method="post" action="/">

14− <input type="hidden" name="q" value="{{suggestion}}">

13+ <form method="post" action="{{ url_for('index') }}">

14+ <input type="hidden" name="q" value="{{ suggestion }}">

1515 <input type="submit" value="{{ suggestion }}" />

1616 </form>

1717 {% endfor %}

1818 </div>

1919 {% endif %}

2020

21+ <div id="search_url">

22+ {{ _('Search URL') }}:

23+ <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly="" />

24+ </div>

2125 <div id="apis">

2226 {{ _('Download results') }}

2327 {% for output_type in ('csv', 'json', 'rss') %}

24− <form method="post" action="/">

28+ <form method="post" action="{{ url_for('index') }}">

2529 <div class="left">

2630 <input type="hidden" name="q" value="{{ q }}" />

2731 <input type="hidden" name="format" value="{{ output_type }}" />

@@ -48,7 +52,7 @@

4852 {% if paging %}

4953 <div id="pagination">

5054 {% if pageno > 1 %}

51− <form method="post" action="/">

55+ <form method="post" action="{{ url_for('index') }}">

5256 <div class="left">

5357 <input type="hidden" name="q" value="{{ q }}" />

5458 {% for category in selected_categories %}

@@ -59,7 +63,7 @@

5963 </div>

6064 </form>

6165 {% endif %}

62− <form method="post" action="/">

66+ <form method="post" action="{{ url_for('index') }}">

6367 <div class="left">

6468 {% for category in selected_categories %}

6569 <input type="hidden" name="category_{{ category }}" value="1"/>

searx/templates/search.html+1−1

@@ -1,4 +1,4 @@

1−<form method="post" action="/" id="search_form">

1+<form method="post" action="{{ url_for('index') }}" id="search_form">

22 <div id="search_wrapper">

33 <input type="text" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>

44 <input type="submit" value="search" id="search_submit" />

searx/translations/de/LC_MESSAGES/messages.mo

Binary file not shown.

searx/translations/de/LC_MESSAGES/messages.po+67−57

@@ -1,60 +1,45 @@

1−# English translations for .

1+# English translations for PROJECT.

3−# This file is distributed under the same license as the project.

4−#

3+# This file is distributed under the same license as the PROJECT project.

4+#

55# Translators:

6+# pointhi, 2014

67# stf <stefan.marsiske@gmail.com>, 2014

78msgid ""

89msgstr ""

9−"Project-Id-Version: searx\n"

10+"Project-Id-Version: searx\n"

1011"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"

11−"POT-Creation-Date: 2014-01-31 13:40+0100\n"

12−"PO-Revision-Date: 2014-01-30 17:40+0000\n"

13−"Last-Translator: stf <stefan.marsiske@gmail.com>\n"

14−"Language-Team: German "

15−"(http://www.transifex.com/projects/p/searx/language/de/)\n"

16−"Plural-Forms: nplurals=2; plural=(n != 1)\n"

12+"POT-Creation-Date: 2014-03-04 20:54+0100\n"

13+"PO-Revision-Date: 2014-03-04 22:00+0000\n"

14+"Last-Translator: pointhi\n"

15+"Language-Team: German (http://www.transifex.com/projects/p/searx/language/de/)\n"

1716"MIME-Version: 1.0\n"

18−"Content-Type: text/plain; charset=utf-8\n"

17+"Content-Type: text/plain; charset=UTF-8\n"

1918"Content-Transfer-Encoding: 8bit\n"

2019"Generated-By: Babel 1.3\n"

20+"Language: de\n"

21+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

2122

22−#: searx/engines/__init__.py:290

23+#: searx/engines/__init__.py:308

2324msgid "Page loads (sec)"

2425msgstr "Ladezeit (sek)"

2526

26−#: searx/engines/__init__.py:294

27+#: searx/engines/__init__.py:312

2728msgid "Number of results"

2829msgstr "Trefferanzahl"

2930

30−#: searx/engines/__init__.py:298

31+#: searx/engines/__init__.py:316

3132msgid "Scores"

3233msgstr "Punkte"

3334

34−#: searx/engines/__init__.py:302

35+#: searx/engines/__init__.py:320

3536msgid "Scores per result"

3637msgstr "Punkte pro Treffer"

3738

38−#: searx/engines/__init__.py:306

39+#: searx/engines/__init__.py:324

3940msgid "Errors"

4041msgstr "Fehler"

4142

42−#: searx/templates/engines.html:4

43−msgid "Currently used search engines"

44−msgstr "Aktuell benutzte Suchmachinen"

45−

46−#: searx/templates/engines.html:8

47−msgid "Engine name"

48−msgstr "Suchmaschinenname"

49−

50−#: searx/templates/engines.html:9

51−msgid "Category"

52−msgstr "Kategorie"

53−

54−#: searx/templates/engines.html:23 searx/templates/preferences.html:42

55−msgid "back"

56−msgstr "Zurück"

57−

5843#: searx/templates/index.html:7

5944msgid "about"

6045msgstr "Über uns"

@@ -69,56 +54,79 @@ msgstr "Einstellungen"

6954

7055#: searx/templates/preferences.html:9

7156msgid "Default categories"

72−msgstr "Default Kategorien"

57+msgstr "Standard Kategorien"

7358

7459#: searx/templates/preferences.html:15

75−#, fuzzy

7660msgid "Search language"

77−msgstr "Oberflaechensprache"

61+msgstr "Suchsprache"

7862

7963#: searx/templates/preferences.html:18

8064msgid "Automatic"

81−msgstr ""

65+msgstr "Automatisch"

8266

8367#: searx/templates/preferences.html:26

8468msgid "Interface language"

85−msgstr "Oberflaechensprache"

69+msgstr "Oberflächensprache"

70+

71+#: searx/templates/preferences.html:36

72+msgid "Currently used search engines"

73+msgstr "Aktuell benutzte Suchmaschinen"

74+

75+#: searx/templates/preferences.html:40

76+msgid "Engine name"

77+msgstr "Suchmaschinenname"

78+

79+#: searx/templates/preferences.html:41

80+msgid "Category"

81+msgstr "Kategorie"

82+

83+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53

84+msgid "Allow"

85+msgstr "Erlauben"

86+

87+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54

88+msgid "Block"

89+msgstr "Blockieren"

8690

87−#: searx/templates/preferences.html:35

91+#: searx/templates/preferences.html:62

8892msgid ""

89−"These settings are stored in your cookies, this allows us not to store "

90−"this data about you."

91−msgstr ""

92−"Diese Informationen werden in Cookies gespeichert, damit wir keine ihrer "

93−"persönlichen Daten speichern müssen."

93+"These settings are stored in your cookies, this allows us not to store this "

94+"data about you."

95+msgstr "Diese Informationen werden in Cookies gespeichert, damit wir keine ihrer persönlichen Daten speichern müssen."

9496

95−#: searx/templates/preferences.html:37

97+#: searx/templates/preferences.html:64

9698msgid ""

9799"These cookies serve your sole convenience, we don't use these cookies to "

98100"track you."

99−msgstr ""

100−"Diese Cookies dienen ihrer Gemütlichkeit, wir verwenden sie nicht zum "

101−"überwachen."

101+msgstr "Diese Cookies dienen ihrer Gemütlichkeit, wir verwenden sie nicht zum überwachen."

102102

103−#: searx/templates/preferences.html:40

103+#: searx/templates/preferences.html:67

104104msgid "save"

105105msgstr "Speichern"

106106

107+#: searx/templates/preferences.html:69

108+msgid "back"

109+msgstr "Zurück"

110+

107111#: searx/templates/results.html:11

108112msgid "Suggestions"

109−msgstr "Vorschlaege"

113+msgstr "Vorschläge"

110114

111115#: searx/templates/results.html:22

116+msgid "Search URL"

117+msgstr "Such-URL"

118+

119+#: searx/templates/results.html:26

112120msgid "Download results"

113−msgstr "Download Ergebnisse"

121+msgstr "Ergebnisse herunterladen"

114122

115−#: searx/templates/results.html:66

123+#: searx/templates/results.html:62

116124msgid "previous page"

117−msgstr "vorige Seite"

125+msgstr "vorherige Seite"

118126

119−#: searx/templates/results.html:74

127+#: searx/templates/results.html:73

120128msgid "next page"

121−msgstr "naechste Seite"

129+msgstr "nächste Seite"

122130

123131#: searx/templates/stats.html:4

124132msgid "Engine stats"

@@ -130,13 +138,13 @@ msgid "files"

130138msgstr "Dateien"

131139

132140msgid "general"

133−msgstr "General"

141+msgstr "allgemein"

134142

135143msgid "music"

136−msgstr "Music"

144+msgstr "Musik"

137145

138146msgid "social media"

139−msgstr "Social Media"

147+msgstr "Soziale Medien"

140148

141149msgid "images"

142150msgstr "Bilder"

@@ -147,3 +155,5 @@ msgstr "Videos"

147155msgid "it"

148156msgstr "IT"

149157

158+msgid "news"

159+msgstr "Neuigkeiten"

searx/translations/en/LC_MESSAGES/messages.mo

Binary file not shown.

searx/translations/en/LC_MESSAGES/messages.po+42−27

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: PROJECT VERSION\n"

99"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"

10−"POT-Creation-Date: 2014-01-31 13:40+0100\n"

10+"POT-Creation-Date: 2014-03-04 20:54+0100\n"

1111"PO-Revision-Date: 2014-01-30 15:22+0100\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: en <LL@li.org>\n"

@@ -17,42 +17,26 @@ msgstr ""

1717"Content-Transfer-Encoding: 8bit\n"

1818"Generated-By: Babel 1.3\n"

1919

20−#: searx/engines/__init__.py:290

20+#: searx/engines/__init__.py:308

2121msgid "Page loads (sec)"

2222msgstr ""

2323

24−#: searx/engines/__init__.py:294

24+#: searx/engines/__init__.py:312

2525msgid "Number of results"

2626msgstr ""

2727

28−#: searx/engines/__init__.py:298

28+#: searx/engines/__init__.py:316

2929msgid "Scores"

3030msgstr ""

3131

32−#: searx/engines/__init__.py:302

32+#: searx/engines/__init__.py:320

3333msgid "Scores per result"

3434msgstr ""

3535

36−#: searx/engines/__init__.py:306

36+#: searx/engines/__init__.py:324

3737msgid "Errors"

3838msgstr ""

3939

40−#: searx/templates/engines.html:4

41−msgid "Currently used search engines"

42−msgstr ""

43−

44−#: searx/templates/engines.html:8

45−msgid "Engine name"

46−msgstr ""

47−

48−#: searx/templates/engines.html:9

49−msgid "Category"

50−msgstr ""

51−

52−#: searx/templates/engines.html:23 searx/templates/preferences.html:42

53−msgid "back"

54−msgstr ""

55−

5640#: searx/templates/index.html:7

5741msgid "about"

5842msgstr ""

@@ -81,35 +65,63 @@ msgstr ""

8165msgid "Interface language"

8266msgstr ""

8367

84−#: searx/templates/preferences.html:35

68+#: searx/templates/preferences.html:36

69+msgid "Currently used search engines"

70+msgstr ""

71+

72+#: searx/templates/preferences.html:40

73+msgid "Engine name"

74+msgstr ""

75+

76+#: searx/templates/preferences.html:41

77+msgid "Category"

78+msgstr ""

79+

80+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53

81+msgid "Allow"

82+msgstr ""

83+

84+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54

85+msgid "Block"

86+msgstr ""

87+

88+#: searx/templates/preferences.html:62

8589msgid ""

8690"These settings are stored in your cookies, this allows us not to store "

8791"this data about you."

8892msgstr ""

8993

90−#: searx/templates/preferences.html:37

94+#: searx/templates/preferences.html:64

9195msgid ""

9296"These cookies serve your sole convenience, we don't use these cookies to "

9397"track you."

9498msgstr ""

9599

96−#: searx/templates/preferences.html:40

100+#: searx/templates/preferences.html:67

97101msgid "save"

98102msgstr ""

99103

104+#: searx/templates/preferences.html:69

105+msgid "back"

106+msgstr ""

107+

100108#: searx/templates/results.html:11

101109msgid "Suggestions"

102110msgstr ""

103111

104112#: searx/templates/results.html:22

113+msgid "Search URL"

114+msgstr ""

115+

116+#: searx/templates/results.html:26

105117msgid "Download results"

106118msgstr ""

107119

108−#: searx/templates/results.html:66

120+#: searx/templates/results.html:62

109121msgid "previous page"

110122msgstr ""

111123

112−#: searx/templates/results.html:74

124+#: searx/templates/results.html:73

113125msgid "next page"

114126msgstr ""

115127

@@ -140,3 +152,6 @@ msgstr ""

140152msgid "it"

141153msgstr ""

142154

155+msgid "news"

156+msgstr ""

157+

searx/translations/es/LC_MESSAGES/messages.monew file

Binary file not shown.

searx/translations/es/LC_MESSAGES/messages.ponew file+158

@@ -0,0 +1,158 @@

1+# English translations for PROJECT.

3+# This file is distributed under the same license as the PROJECT project.

4+#

5+# Translators:

6+# niazle, 2014

7+msgid ""

8+msgstr ""

9+"Project-Id-Version: searx\n"

10+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"

11+"POT-Creation-Date: 2014-03-04 20:54+0100\n"

12+"PO-Revision-Date: 2014-03-04 20:40+0000\n"

13+"Last-Translator: niazle\n"

14+"Language-Team: Spanish (http://www.transifex.com/projects/p/searx/language/es/)\n"

15+"MIME-Version: 1.0\n"

16+"Content-Type: text/plain; charset=UTF-8\n"

17+"Content-Transfer-Encoding: 8bit\n"

18+"Generated-By: Babel 1.3\n"

19+"Language: es\n"

20+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

21+

22+#: searx/engines/__init__.py:308

23+msgid "Page loads (sec)"

24+msgstr "Tiempo de carga (segundos)"

25+

26+#: searx/engines/__init__.py:312

27+msgid "Number of results"

28+msgstr "Número de resultados"

29+

30+#: searx/engines/__init__.py:316

31+msgid "Scores"

32+msgstr "Puntuaciones"

33+

34+#: searx/engines/__init__.py:320

35+msgid "Scores per result"

36+msgstr "Puntuaciones por resultado"

37+

38+#: searx/engines/__init__.py:324

39+msgid "Errors"

40+msgstr "Errores"

41+

42+#: searx/templates/index.html:7

43+msgid "about"

44+msgstr "acerca de"

45+

46+#: searx/templates/index.html:8

47+msgid "preferences"

48+msgstr "preferencias"

49+

50+#: searx/templates/preferences.html:5

51+msgid "Preferences"

52+msgstr "Preferencias"

53+

54+#: searx/templates/preferences.html:9

55+msgid "Default categories"

56+msgstr "Categorías predeterminadas"

57+

58+#: searx/templates/preferences.html:15

59+msgid "Search language"

60+msgstr "Buscar idioma"

61+

62+#: searx/templates/preferences.html:18

63+msgid "Automatic"

64+msgstr "Automático"

65+

66+#: searx/templates/preferences.html:26

67+msgid "Interface language"

68+msgstr "Idioma de la interfaz"

69+

70+#: searx/templates/preferences.html:36

71+msgid "Currently used search engines"

72+msgstr "Motores de búsqueda actualmente en uso"

73+

74+#: searx/templates/preferences.html:40

75+msgid "Engine name"

76+msgstr "Nombre del motor de búsqueda"

77+

78+#: searx/templates/preferences.html:41

79+msgid "Category"

80+msgstr "Categoría"

81+

82+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53

83+msgid "Allow"

84+msgstr "Permitir"

85+

86+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54

87+msgid "Block"

88+msgstr "Bloquear"

89+

90+#: searx/templates/preferences.html:62

91+msgid ""

92+"These settings are stored in your cookies, this allows us not to store this "

93+"data about you."

94+msgstr "Esta configuración se guarda en sus cookies, lo que nos permite no almacenar dicha información sobre usted."

95+

96+#: searx/templates/preferences.html:64

97+msgid ""

98+"These cookies serve your sole convenience, we don't use these cookies to "

99+"track you."

100+msgstr "Estas cookies son para su propia comodidad, no las utilizamos para rastrearle."

101+

102+#: searx/templates/preferences.html:67

103+msgid "save"

104+msgstr "Guardar"

105+

106+#: searx/templates/preferences.html:69

107+msgid "back"

108+msgstr "Atrás"

109+

110+#: searx/templates/results.html:11

111+msgid "Suggestions"

112+msgstr "Sugerencias"

113+

114+#: searx/templates/results.html:22

115+msgid "Search URL"

116+msgstr "Buscar URL"

117+

118+#: searx/templates/results.html:26

119+msgid "Download results"

120+msgstr "Descargar resultados"

121+

122+#: searx/templates/results.html:62

123+msgid "previous page"

124+msgstr "Página anterior"

125+

126+#: searx/templates/results.html:73

127+msgid "next page"

128+msgstr "Página siguiente"

129+

130+#: searx/templates/stats.html:4

131+msgid "Engine stats"

132+msgstr "Estadísticas del motor de búsqueda"

133+

134+# categories - manually added

135+# TODO - automatically add

136+msgid "files"

137+msgstr "Archivos"

138+

139+msgid "general"

140+msgstr "General"

141+

142+msgid "music"

143+msgstr "Música"

144+

145+msgid "social media"

146+msgstr "Medios sociales"

147+

148+msgid "images"

149+msgstr "Imágenes"

150+

151+msgid "videos"

152+msgstr "Vídeos"

153+

154+msgid "it"

155+msgstr "TIC"

156+

157+msgid "news"

158+msgstr "noticias"

searx/translations/fr/LC_MESSAGES/messages.mo

Binary file not shown.

searx/translations/fr/LC_MESSAGES/messages.po+42−28

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: PROJECT VERSION\n"

99"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"

10−"POT-Creation-Date: 2014-01-31 13:40+0100\n"

10+"POT-Creation-Date: 2014-03-04 20:54+0100\n"

1111"PO-Revision-Date: 2014-01-21 23:33+0100\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: fr <LL@li.org>\n"

@@ -17,42 +17,26 @@ msgstr ""

1717"Content-Transfer-Encoding: 8bit\n"

1818"Generated-By: Babel 1.3\n"

1919

20−#: searx/engines/__init__.py:290

20+#: searx/engines/__init__.py:308

2121msgid "Page loads (sec)"

2222msgstr "Chargement de la page (sec)"

2323

24−#: searx/engines/__init__.py:294

24+#: searx/engines/__init__.py:312

2525msgid "Number of results"

2626msgstr "Nombre de résultats"

2727

28−#: searx/engines/__init__.py:298

28+#: searx/engines/__init__.py:316

2929msgid "Scores"

3030msgstr "Score"

3131

32−#: searx/engines/__init__.py:302

32+#: searx/engines/__init__.py:320

3333msgid "Scores per result"

3434msgstr "Score par résultat"

3535

36−#: searx/engines/__init__.py:306

36+#: searx/engines/__init__.py:324

3737msgid "Errors"

3838msgstr "Erreurs"

3939

40−#: searx/templates/engines.html:4

41−msgid "Currently used search engines"

42−msgstr "Moteur actuellement utilisé"

43−

44−#: searx/templates/engines.html:8

45−msgid "Engine name"

46−msgstr "Nom du moteur"

47−

48−#: searx/templates/engines.html:9

49−msgid "Category"

50−msgstr "Catégorie"

51−

52−#: searx/templates/engines.html:23 searx/templates/preferences.html:42

53−msgid "back"

54−msgstr "retour"

55−

5640#: searx/templates/index.html:7

5741msgid "about"

5842msgstr "À propos"

@@ -70,7 +54,6 @@ msgid "Default categories"

7054msgstr "Catégorie par défaut"

7155

7256#: searx/templates/preferences.html:15

73−#, fuzzy

7457msgid "Search language"

7558msgstr "Langue de l'interface"

7659

@@ -82,7 +65,27 @@ msgstr ""

8265msgid "Interface language"

8366msgstr "Langue de l'interface"

8467

85−#: searx/templates/preferences.html:35

68+#: searx/templates/preferences.html:36

69+msgid "Currently used search engines"

70+msgstr "Moteur actuellement utilisé"

71+

72+#: searx/templates/preferences.html:40

73+msgid "Engine name"

74+msgstr "Nom du moteur"

75+

76+#: searx/templates/preferences.html:41

77+msgid "Category"

78+msgstr "Catégorie"

79+

80+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53

81+msgid "Allow"

82+msgstr ""

83+

84+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54

85+msgid "Block"

86+msgstr ""

87+

88+#: searx/templates/preferences.html:62

8689msgid ""

8790"These settings are stored in your cookies, this allows us not to store "

8891"this data about you."

@@ -90,7 +93,7 @@ msgstr ""

9093"Ces paramètres sont stcokés dans vos cookies; ceci nous permet de ne pas "

9194"collecter vos données."

9295

93−#: searx/templates/preferences.html:37

96+#: searx/templates/preferences.html:64

9497msgid ""

9598"These cookies serve your sole convenience, we don't use these cookies to "

9699"track you."

@@ -98,23 +101,31 @@ msgstr ""

98101"Les cookies sont la pour votre confort d'utilisation, nous ne les "

99102"utilisons pas pour vous traquer."

100103

101−#: searx/templates/preferences.html:40

104+#: searx/templates/preferences.html:67

102105msgid "save"

103106msgstr "enregistrer"

104107

108+#: searx/templates/preferences.html:69

109+msgid "back"

110+msgstr "retour"

111+

105112#: searx/templates/results.html:11

106113msgid "Suggestions"

107114msgstr "Suggestions"

108115

109116#: searx/templates/results.html:22

117+msgid "Search URL"

118+msgstr ""

119+

120+#: searx/templates/results.html:26

110121msgid "Download results"

111122msgstr "Télécharger les résultats"

112123

113−#: searx/templates/results.html:66

124+#: searx/templates/results.html:62

114125msgid "previous page"

115126msgstr ""

116127

117−#: searx/templates/results.html:74

128+#: searx/templates/results.html:73

118129msgid "next page"

119130msgstr ""

120131

@@ -145,3 +156,6 @@ msgstr "vidéos"

145156msgid "it"

146157msgstr "it"

147158

159+msgid "news"

160+msgstr ""

161+

searx/translations/hu/LC_MESSAGES/messages.mo

Binary file not shown.

searx/translations/hu/LC_MESSAGES/messages.po+42−27

@@ -7,7 +7,7 @@ msgid ""

77msgstr ""

88"Project-Id-Version: PROJECT VERSION\n"

99"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"

10−"POT-Creation-Date: 2014-01-31 13:40+0100\n"

10+"POT-Creation-Date: 2014-03-04 20:54+0100\n"

1111"PO-Revision-Date: 2014-01-21 23:33+0100\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: hu <LL@li.org>\n"

@@ -17,42 +17,26 @@ msgstr ""

1717"Content-Transfer-Encoding: 8bit\n"

1818"Generated-By: Babel 1.3\n"

1919

20−#: searx/engines/__init__.py:290

20+#: searx/engines/__init__.py:308

2121msgid "Page loads (sec)"

2222msgstr "Válaszidők (sec)"

2323

24−#: searx/engines/__init__.py:294

24+#: searx/engines/__init__.py:312

2525msgid "Number of results"

2626msgstr "Találatok száma"

2727

28−#: searx/engines/__init__.py:298

28+#: searx/engines/__init__.py:316

2929msgid "Scores"

3030msgstr "Pontszámok"

3131

32−#: searx/engines/__init__.py:302

32+#: searx/engines/__init__.py:320

3333msgid "Scores per result"

3434msgstr "Pontszámok találatonként"

3535

36−#: searx/engines/__init__.py:306

36+#: searx/engines/__init__.py:324

3737msgid "Errors"

3838msgstr "Hibák"

3939

40−#: searx/templates/engines.html:4

41−msgid "Currently used search engines"

42−msgstr "Jelenleg használt keresők"

43−

44−#: searx/templates/engines.html:8

45−msgid "Engine name"

46−msgstr "Kereső neve"

47−

48−#: searx/templates/engines.html:9

49−msgid "Category"

50−msgstr "Kategória"

51−

52−#: searx/templates/engines.html:23 searx/templates/preferences.html:42

53−msgid "back"

54−msgstr "vissza"

55−

5640#: searx/templates/index.html:7

5741msgid "about"

5842msgstr "rólunk"

@@ -81,13 +65,33 @@ msgstr "Automatikus"

8165msgid "Interface language"

8266msgstr "Felület nyelve"

8367

84−#: searx/templates/preferences.html:35

68+#: searx/templates/preferences.html:36

69+msgid "Currently used search engines"

70+msgstr "Jelenleg használt keresők"

71+

72+#: searx/templates/preferences.html:40

73+msgid "Engine name"

74+msgstr "Kereső neve"

75+

76+#: searx/templates/preferences.html:41

77+msgid "Category"

78+msgstr "Kategória"

79+

80+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53

81+msgid "Allow"

82+msgstr "Engedélyezés"

83+

84+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54

85+msgid "Block"

86+msgstr "Tiltás"

87+

88+#: searx/templates/preferences.html:62

8589msgid ""

8690"These settings are stored in your cookies, this allows us not to store "

8791"this data about you."

8892msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak."

8993

90−#: searx/templates/preferences.html:37

94+#: searx/templates/preferences.html:64

9195msgid ""

9296"These cookies serve your sole convenience, we don't use these cookies to "

9397"track you."

@@ -95,23 +99,31 @@ msgstr ""

9599"Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a "

96100"felhasználók követésére."

97101

98−#: searx/templates/preferences.html:40

102+#: searx/templates/preferences.html:67

99103msgid "save"

100104msgstr "mentés"

101105

106+#: searx/templates/preferences.html:69

107+msgid "back"

108+msgstr "vissza"

109+

102110#: searx/templates/results.html:11

103111msgid "Suggestions"

104112msgstr "Javaslatok"

105113

106114#: searx/templates/results.html:22

115+msgid "Search URL"

116+msgstr "Keresési URL"

117+

118+#: searx/templates/results.html:26

107119msgid "Download results"

108120msgstr "Találatok letöltése"

109121

110−#: searx/templates/results.html:66

122+#: searx/templates/results.html:62

111123msgid "previous page"

112124msgstr "előző oldal"

113125

114−#: searx/templates/results.html:74

126+#: searx/templates/results.html:73

115127msgid "next page"

116128msgstr "következő oldal"

117129

@@ -142,3 +154,6 @@ msgstr "videók"

142154msgid "it"

143155msgstr "it"

144156

157+msgid "news"

158+msgstr "hírek"

159+

searx/utils.py+1

@@ -10,6 +10,7 @@ ua_versions = ('26.0', '27.0', '28.0')

1010ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64; rv:26.0')

1111ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}"

1212

13+

1314def gen_useragent():

1415 # TODO

1516 return ua.format(os=choice(ua_os), version=choice(ua_versions))

searx/webapp.py+1

@@ -182,6 +182,7 @@ def index():

182182 selected_categories=search.categories,

183183 paging=search.paging,

184184 pageno=search.pageno,

185+ base_url=get_base_url(),

185186 suggestions=search.suggestions

186187 )

187188