Commit graph

8 commits

Author SHA1 Message Date
Thomas Pointhuber 0e1035eac1 Merge https://github.com/asciimoo/searx into template_oscar
Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py
2014-10-26 19:11:28 +01:00
Adam Tauber 13f36e6675 [enh] translation updates 2014-10-12 13:06:11 +02:00
Adam Tauber a9d075dcc1 [enh] translation update 2014-03-18 18:24:18 +01:00
Adam Tauber 44990fc0af [enh] translation updates 2014-03-16 09:39:48 +01:00
Adam Tauber e5d64a5b2a [enh] translation updates 2014-03-15 19:42:22 +01:00
Adam Tauber 00bb2532c9 [enh] translation updates 2014-03-04 21:01:17 +01:00
asciimoo 8d9edfbe37 [enh] translation updates 2014-01-31 14:45:09 +01:00
asciimoo 8de3d02493 [enh] translation mods ++ en added 2014-01-30 15:31:34 +01:00