diff options
| -rw-r--r-- | README.rst | 6 | ||||
| -rw-r--r-- | searx/static/courgette/css/style.css | 160 | ||||
| -rw-r--r-- | searx/static/courgette/img/searx-mobile.png | bin | 0 -> 10208 bytes | |||
| -rw-r--r-- | searx/translations/de/LC_MESSAGES/messages.po | 91 | ||||
| -rw-r--r-- | searx/translations/en/LC_MESSAGES/messages.po | 84 | ||||
| -rw-r--r-- | searx/translations/es/LC_MESSAGES/messages.po | 84 | ||||
| -rw-r--r-- | searx/translations/fr/LC_MESSAGES/messages.mo | bin | 5023 -> 5294 bytes | |||
| -rw-r--r-- | searx/translations/fr/LC_MESSAGES/messages.po | 180 | ||||
| -rw-r--r-- | searx/translations/hu/LC_MESSAGES/messages.po | 84 | ||||
| -rw-r--r-- | searx/translations/it/LC_MESSAGES/messages.po | 84 | ||||
| -rw-r--r-- | searx/translations/ja/LC_MESSAGES/messages.po | 84 | ||||
| -rw-r--r-- | searx/translations/nl/LC_MESSAGES/messages.po | 84 | ||||
| -rw-r--r-- | searx/utils.py | 8 | ||||
| -rw-r--r-- | setup.py | 1 |
14 files changed, 613 insertions, 337 deletions
diff --git a/README.rst b/README.rst index bda49504b..bd6896aa1 100644 --- a/README.rst +++ b/README.rst @@ -16,9 +16,9 @@ Features - Tracking free - Supports multiple output formats - - json ``curl https://searx.0x2a.tk/?format=json&q=[query]`` - - csv ``curl https://searx.0x2a.tk/?format=csv&q=[query]`` - - opensearch/rss ``curl https://searx.0x2a.tk/?format=rss&q=[query]`` + - json ``curl https://searx.me/?format=json&q=[query]`` + - csv ``curl https://searx.me/?format=csv&q=[query]`` + - opensearch/rss ``curl https://searx.me/?format=rss&q=[query]`` - Opensearch support (you can set as default search engine) - Configurable search engines/categories - Different search languages diff --git a/searx/static/courgette/css/style.css b/searx/static/courgette/css/style.css index 6c5c99053..55db91317 100644 --- a/searx/static/courgette/css/style.css +++ b/searx/static/courgette/css/style.css @@ -25,21 +25,6 @@ html { min-height: 100%; } -.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; - } - .title h1 { background: url(../img/searx.png) no-repeat; width: 319px; @@ -49,16 +34,12 @@ html { } .center { - width: 55em; + max-width: 55em; text-align: center; background: rgba(255,255,255,0.6); padding: 4em 2em; margin: 7% auto 0; position: relative; - /*position: absolute; - top: 50%; - left: 50%; - margin:-220px 0 0 -408px;*/ } .center.search { @@ -69,6 +50,23 @@ html { 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; @@ -106,11 +104,19 @@ html { 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: 0.5em 1em; color: #333; cursor: pointer; + font-size: 0.9em; } .checkbox_container label:hover { background: #3498DB; @@ -127,10 +133,70 @@ html { color: #FFF; } -#categories > div { +#categories_container > div { display: inline-block; } +#categories .hidden { + display: none; + position: absolute; + bottom: 1em; + left: 0; + text-align: center; + width: 100%; + font-size: 0.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: 0.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; } @@ -284,6 +350,12 @@ html { text-decoration: underline; } +.cache_link { + color: #666; + font-size: 0.9em; + font-style: italic; +} + .search.center { padding-right: 17em; } @@ -339,6 +411,10 @@ input[type="submit"]:focus { margin: auto; } +.row a { + color: #3498db; +} + .row form { letter-spacing: -5px; } @@ -368,6 +444,48 @@ input[type="submit"]:focus { 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: 0.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; diff --git a/searx/static/courgette/img/searx-mobile.png b/searx/static/courgette/img/searx-mobile.png Binary files differnew file mode 100644 index 000000000..2b9383a5d --- /dev/null +++ b/searx/static/courgette/img/searx-mobile.png diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 40add9114..1323b4486 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+0100\n" "PO-Revision-Date: 2014-03-15 18:40+0000\n" "Last-Translator: pointhi\n" "Language-Team: German " @@ -21,11 +21,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" @@ -49,12 +49,12 @@ msgstr "Punkte pro Treffer" msgid "Errors" msgstr "Fehler" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -68,43 +68,43 @@ msgstr "Einstellungen" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 msgid "Default categories" msgstr "Standardkategorien" #: searx/templates/courgette/preferences.html:15 #: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "Suchsprache" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "Automatisch" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 msgid "Interface language" msgstr "Oberflächensprache" #: searx/templates/courgette/preferences.html:36 #: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" msgstr "Autovervollständigung" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" msgstr "Methode" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" msgstr "Designs" @@ -125,23 +125,23 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Erlauben" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Blockieren" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -150,8 +150,8 @@ msgstr "" "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:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -160,14 +160,14 @@ msgstr "" "Sie zu überwachen." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "Speichern" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "Zurück" @@ -212,15 +212,31 @@ msgstr "Suche nach..." msgid "Engine stats" msgstr "Suchmaschinenstatistik" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" msgstr "eine privatsphären respektierende, hackbare Metasuchmaschine" @@ -233,36 +249,38 @@ msgid "home" msgstr "Startseite" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" msgstr "Allgemein" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" msgstr "Suchmaschinen" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" msgstr "Welche Sprache bevorzugst du für die Suche?" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" msgstr "Ändere die Sprache des Layouts" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" msgstr "finde Sachen während der Eingabe" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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 "" "ändere wie Formulare übertragen werden, <a " -"href=\"https://de.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-Anfragemethoden\"" -" rel=\"external\">lerne mehr über Anfragemethoden</a>" +"href=\"https://de.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-" +"Anfragemethoden\" rel=\"external\">lerne mehr über Anfragemethoden</a>" -#: searx/templates/oscar/preferences.html:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" msgstr "ändere das Aussehen von searx" @@ -326,7 +344,8 @@ msgstr "Entschuldigung!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen " +msgstr "" +"Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen " "anderen Suchbegriff oder Suche das gewünschte in einer anderen Kategorie." #: searx/templates/oscar/messages/save_settings_successfull.html:7 diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po index 313bf5069..66f346aaf 100644 --- a/searx/translations/en/LC_MESSAGES/messages.po +++ b/searx/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+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,11 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" @@ -45,12 +45,12 @@ msgstr "" msgid "Errors" msgstr "" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -64,43 +64,43 @@ msgstr "" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 msgid "Default categories" msgstr "" #: searx/templates/courgette/preferences.html:15 #: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 msgid "Interface language" msgstr "" #: searx/templates/courgette/preferences.html:36 #: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" msgstr "" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" msgstr "" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" msgstr "" @@ -121,45 +121,45 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." msgstr "" #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 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:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "" @@ -204,15 +204,31 @@ msgstr "" msgid "Engine stats" msgstr "" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -225,33 +241,35 @@ msgid "home" msgstr "" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" msgstr "" diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index c619a3826..3503a1cfe 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+0100\n" "PO-Revision-Date: 2014-09-08 11:01+0000\n" "Last-Translator: Alejandro León Aznar\n" "Language-Team: Spanish " @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "hace {hours} hora(s) y {minutes} minuto(s)" @@ -47,12 +47,12 @@ msgstr "Puntuaciones por resultado" msgid "Errors" msgstr "Errores" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -66,43 +66,43 @@ msgstr "Preferencias" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 msgid "Default categories" msgstr "Categorías predeterminadas" #: searx/templates/courgette/preferences.html:15 #: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "Buscar idioma" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "Automático" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 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:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" msgstr "" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" msgstr "" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" msgstr "" @@ -123,23 +123,23 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Permitir" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Bloquear" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -148,8 +148,8 @@ msgstr "" "almacenar dicha información sobre usted." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -158,14 +158,14 @@ msgstr "" "rastrearle." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "Guardar" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "Atrás" @@ -210,15 +210,31 @@ msgstr "Buscar..." msgid "Engine stats" msgstr "Estadísticas del motor de búsqueda" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -231,33 +247,35 @@ msgid "home" msgstr "" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" msgstr "" diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo Binary files differindex f06331e27..68619732a 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 6c92ff6eb..5f20eecc8 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.po +++ b/searx/translations/fr/LC_MESSAGES/messages.po @@ -1,16 +1,15 @@ -# English translations for . -# Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the project. +# French translations for SEARX +# Copyright (C) 2014 Benjamin Sonntag, rike, Adam Tauber +# This file is distributed under CC0 License # # Translators: # Benjamin Sonntag <benjamin@sonntag.fr>, 2014 -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014 # rike, 2014 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+0100\n" "PO-Revision-Date: 2014-09-07 21:24+0000\n" "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: French " @@ -21,11 +20,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "il y a {hours} heure(s), {minutes} minute(s)" @@ -49,12 +48,12 @@ msgstr "Score par résultat" msgid "Errors" msgstr "Erreurs" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -68,45 +67,45 @@ msgstr "Préférences" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 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:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "Langue de recherche" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "Automatique" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 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:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" -msgstr "" +msgstr "Complétion automatique" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" -msgstr "" +msgstr "Méthode" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" -msgstr "" +msgstr "Thème" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:66 @@ -125,23 +124,23 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Autoriser" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Bloquer" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -150,8 +149,8 @@ msgstr "" " collecter vos données." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -160,14 +159,14 @@ msgstr "" "utilisons pas pour vous espionner." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "enregistrer" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "retour" @@ -212,173 +211,198 @@ msgstr "Rechercher..." msgid "Engine stats" msgstr "Statistiques du moteur" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" -msgstr "" +msgstr "Réponses" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" -msgstr "" +msgstr "Powered by" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" +msgstr "un meta-moteur de recherche hackable et respectueux de la vie privée" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" -msgstr "" +msgstr "Afficher/Masquer la navigation" #: searx/templates/oscar/navbar.html:15 msgid "home" -msgstr "" +msgstr "accueil" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" -msgstr "" +msgstr "Général" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" -msgstr "" +msgstr "Moteurs" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" -msgstr "" +msgstr "Dans quelle langue préférez-vous effectuer la recherche ?" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" -msgstr "" +msgstr "Changer la langue d'affichage" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" -msgstr "" +msgstr "Chercher au fil de la saisie" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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 "" +"Permet de choisir comment la recherche est envoyée, <a " +"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:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" -msgstr "" +msgstr "Modifier l'affichage de searx" #: searx/templates/oscar/results.html:6 msgid "Search results" -msgstr "" +msgstr "Résultats de recherche" #: searx/templates/oscar/results.html:73 msgid "Links" -msgstr "" +msgstr "Liens" #: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 msgid "Start search" -msgstr "" +msgstr "Lancer une recherche" #: searx/templates/oscar/search_full.html:11 msgid "Show search filters" -msgstr "" +msgstr "Afficher les filtres de recherche" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "" +msgstr "Cacher les filtres de recherche" #: searx/templates/oscar/stats.html:2 msgid "stats" -msgstr "" +msgstr "statistiques" #: 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 "Fermer" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "" +msgstr "Astuces !" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Il semble que ce soit la première fois que vous utilisez searx." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "Attention !" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." msgstr "" +"Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce" +" site." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "" +msgstr "Aucune donnée disponible pour l'instant. " #: searx/templates/oscar/messages/no_results.html:7 msgid "Sorry!" -msgstr "" +msgstr "Désolé !" #: 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 "" +"nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou " +"changez de catégorie." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "Bravo !" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "" +msgstr "Paramètres sauvés avec succès." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "Oups !" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." -msgstr "" +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 "" +msgstr "en cache" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" -msgstr "" +msgstr "Voir l'image" #: searx/templates/oscar/result_templates/images.html:22 msgid "View source" -msgstr "" +msgstr "Voir le source" #: searx/templates/oscar/result_templates/map.html:10 msgid "show map" -msgstr "" +msgstr "afficher la carte" #: searx/templates/oscar/result_templates/map.html:10 msgid "hide map" -msgstr "" +msgstr "cacher la carte" #: searx/templates/oscar/result_templates/map.html:14 msgid "show details" -msgstr "" +msgstr "afficher les détails" #: searx/templates/oscar/result_templates/map.html:14 msgid "hide details" -msgstr "" +msgstr "cacher les détails" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "" +msgstr "Sources" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "" +msgstr "Téléchargeurs" # categories - manually added # TODO - automatically add @@ -401,11 +425,11 @@ msgid "videos" msgstr "vidéos" msgid "it" -msgstr "Informatique" +msgstr "informatique" msgid "news" msgstr "actus" msgid "map" -msgstr "" +msgstr "carte" diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index 665efa66c..3d6fa84f4 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+0100\n" "PO-Revision-Date: 2014-09-07 21:30+0000\n" "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Hungarian " @@ -20,11 +20,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "{minutes} perce" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} óra, {minutes} perce" @@ -48,12 +48,12 @@ msgstr "Pontszámok találatonként" msgid "Errors" msgstr "Hibák" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -67,43 +67,43 @@ msgstr "Beállítások" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 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:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "Keresés nyelve" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "Automatikus" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 msgid "Interface language" msgstr "Felület nyelve" #: searx/templates/courgette/preferences.html:36 #: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" msgstr "" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" msgstr "" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" msgstr "" @@ -124,31 +124,31 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Engedélyezés" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Tiltás" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." msgstr "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:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -157,14 +157,14 @@ msgstr "" "felhasználók követésére." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "mentés" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "vissza" @@ -209,15 +209,31 @@ msgstr "Keresés..." msgid "Engine stats" msgstr "Kereső statisztikák" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -230,33 +246,35 @@ msgid "home" msgstr "" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" msgstr "" diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index f67aa3a44..10759338b 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+0100\n" "PO-Revision-Date: 2014-09-08 08:19+0000\n" "Last-Translator: dp <d.pitrolo@gmx.com>\n" "Language-Team: Italian " @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "di {minutes} minuti fa" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "di {ore} h e {minutes} minuti fa" @@ -47,12 +47,12 @@ msgstr "Punteggio per risultato" msgid "Errors" msgstr "Errori" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -66,43 +66,43 @@ msgstr "Preferenze" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 msgid "Default categories" msgstr "Categorie predefinite" #: searx/templates/courgette/preferences.html:15 #: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "Lingua di ricerca" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "Automatico" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 msgid "Interface language" msgstr "Linguaggio dell'interfaccia" #: searx/templates/courgette/preferences.html:36 #: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" msgstr "" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" msgstr "" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" msgstr "" @@ -123,23 +123,23 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Autorizza" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Blocca" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -148,8 +148,8 @@ msgstr "" "conservare dati su di te." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -158,14 +158,14 @@ msgstr "" " sorvegliarti." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "salva" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "indietro" @@ -210,15 +210,31 @@ msgstr "Cerca…" msgid "Engine stats" msgstr "Statistiche dei motori" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -231,33 +247,35 @@ msgid "home" msgstr "" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" msgstr "" diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index 0c98846f8..5b4d7a1dd 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+0100\n" "PO-Revision-Date: 2014-10-05 16:38+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: ja <LL@li.org>\n" @@ -17,11 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "" @@ -45,12 +45,12 @@ msgstr "" msgid "Errors" msgstr "" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -64,43 +64,43 @@ msgstr "設定" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 msgid "Default categories" msgstr "" #: searx/templates/courgette/preferences.html:15 #: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 msgid "Interface language" msgstr "" #: searx/templates/courgette/preferences.html:36 #: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" msgstr "" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" msgstr "" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" msgstr "" @@ -121,45 +121,45 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." msgstr "" #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 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:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "" @@ -204,15 +204,31 @@ msgstr "検索する..." msgid "Engine stats" msgstr "" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -225,33 +241,35 @@ msgid "home" msgstr "" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" msgstr "" diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index eb7f5b2a6..617afdab1 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-19 15:14+0100\n" +"POT-Creation-Date: 2014-11-26 20:41+0100\n" "PO-Revision-Date: 2014-09-09 15:33+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch " @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: searx/webapp.py:305 +#: searx/webapp.py:308 msgid "{minutes} minute(s) ago" msgstr "{minutes} min geleden" -#: searx/webapp.py:307 +#: searx/webapp.py:310 msgid "{hours} hour(s), {minutes} minute(s) ago" msgstr "{hours} uur, {minutes} min geleden" @@ -47,12 +47,12 @@ msgstr "Scores per zoekresultaat" msgid "Errors" msgstr "Fouten" -#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8 +#: 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:9 +#: 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" @@ -66,43 +66,43 @@ msgstr "Voorkeuren" #: searx/templates/courgette/preferences.html:9 #: searx/templates/default/preferences.html:9 -#: searx/templates/oscar/preferences.html:21 +#: searx/templates/oscar/preferences.html:24 msgid "Default categories" msgstr "Standaardcategorieën" #: searx/templates/courgette/preferences.html:15 #: searx/templates/default/preferences.html:15 -#: searx/templates/oscar/preferences.html:27 +#: searx/templates/oscar/preferences.html:30 msgid "Search language" msgstr "Zoektaal" #: searx/templates/courgette/preferences.html:18 #: searx/templates/default/preferences.html:18 -#: searx/templates/oscar/preferences.html:30 +#: searx/templates/oscar/preferences.html:33 msgid "Automatic" msgstr "Automatisch" #: searx/templates/courgette/preferences.html:26 #: searx/templates/default/preferences.html:26 -#: searx/templates/oscar/preferences.html:39 +#: searx/templates/oscar/preferences.html:42 msgid "Interface language" msgstr "Interfacetaal" #: searx/templates/courgette/preferences.html:36 #: searx/templates/default/preferences.html:36 -#: searx/templates/oscar/preferences.html:50 +#: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" msgstr "" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 -#: searx/templates/oscar/preferences.html:63 +#: searx/templates/oscar/preferences.html:66 msgid "Method" msgstr "" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 -#: searx/templates/oscar/preferences.html:73 +#: searx/templates/oscar/preferences.html:76 msgid "Themes" msgstr "" @@ -123,23 +123,23 @@ 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:110 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:85 +#: searx/templates/oscar/preferences.html:118 msgid "Allow" msgstr "Toestaan" #: searx/templates/courgette/preferences.html:72 #: searx/templates/courgette/preferences.html:84 -#: searx/templates/default/preferences.html:72 -#: searx/templates/default/preferences.html:84 -#: searx/templates/oscar/preferences.html:109 +#: searx/templates/default/preferences.html:73 +#: searx/templates/default/preferences.html:86 +#: searx/templates/oscar/preferences.html:117 msgid "Block" msgstr "Blokkeren" #: searx/templates/courgette/preferences.html:92 -#: searx/templates/default/preferences.html:92 -#: searx/templates/oscar/preferences.html:124 +#: searx/templates/default/preferences.html:94 +#: searx/templates/oscar/preferences.html:132 msgid "" "These settings are stored in your cookies, this allows us not to store " "this data about you." @@ -148,8 +148,8 @@ msgstr "" " over jou te bewaren." #: searx/templates/courgette/preferences.html:94 -#: searx/templates/default/preferences.html:94 -#: searx/templates/oscar/preferences.html:126 +#: searx/templates/default/preferences.html:96 +#: searx/templates/oscar/preferences.html:134 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." @@ -158,14 +158,14 @@ msgstr "" "niet om je te volgen." #: searx/templates/courgette/preferences.html:97 -#: searx/templates/default/preferences.html:97 -#: searx/templates/oscar/preferences.html:129 +#: searx/templates/default/preferences.html:99 +#: searx/templates/oscar/preferences.html:137 msgid "save" msgstr "bewaren" #: searx/templates/courgette/preferences.html:98 -#: searx/templates/default/preferences.html:98 -#: searx/templates/oscar/preferences.html:130 +#: searx/templates/default/preferences.html:100 +#: searx/templates/oscar/preferences.html:138 msgid "back" msgstr "terug" @@ -210,15 +210,31 @@ msgstr "Zoeken naar..." msgid "Engine stats" msgstr "Zoekmachinestatistieken" +#: searx/templates/default/categories.html:8 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/default/preferences.html:72 +msgid "Localization" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "Yes" +msgstr "" + +#: searx/templates/default/preferences.html:82 +msgid "No" +msgstr "" + #: searx/templates/default/results.html:34 msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -231,33 +247,35 @@ msgid "home" msgstr "" #: searx/templates/oscar/preferences.html:11 +#: searx/templates/oscar/preferences.html:17 msgid "General" msgstr "" #: searx/templates/oscar/preferences.html:12 +#: searx/templates/oscar/preferences.html:99 msgid "Engines" msgstr "" -#: searx/templates/oscar/preferences.html:36 +#: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" msgstr "" -#: searx/templates/oscar/preferences.html:47 +#: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" msgstr "" -#: searx/templates/oscar/preferences.html:60 +#: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" msgstr "" -#: searx/templates/oscar/preferences.html:70 +#: searx/templates/oscar/preferences.html:73 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:81 +#: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" msgstr "" diff --git a/searx/utils.py b/searx/utils.py index 47980bd36..dc831ef5f 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -11,10 +11,16 @@ import csv import os import re -ua_versions = ('26.0', '27.0', '28.0') +ua_versions = ('29.0', + '30.0', + '31.0', + '32.0', + '33.0') + ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64', 'X11; Linux x86') + ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}" @@ -5,6 +5,7 @@ from setuptools import setup from setuptools import find_packages import os +import sys # required to load VERSION_STRING constant sys.path.insert(0, './searx') |