Micah Lee eb00a29ca7 Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master ... Conflicts: onionshare/web.py onionshare_gui/onionshare_gui.py resources/locale/cs.json resources/locale/eo.json resources/locale/nl.json This merge required quite a bit of refactoring because.		2016-12-22 16:00:06 -08:00
..
cs.json	Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master	2016-12-22 16:00:06 -08:00
de.json	Stop saying 'hidden service', start saying 'onion service'	2016-09-04 17:23:06 -07:00
en.json	Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master	2016-12-22 16:00:06 -08:00
eo.json	Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master	2016-12-22 16:00:06 -08:00
es.json	Tweaked Spanish locale and typo in comment, thanks to kant (#269, #270)	2016-06-10 17:24:44 -07:00
fi.json	added progress bar for zipping files	2016-08-24 01:43:21 +05:30
fr.json	Stop saying 'hidden service', start saying 'onion service'	2016-09-04 17:23:06 -07:00
it.json	added progress bar for zipping files	2016-08-24 01:43:21 +05:30
nl.json	Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master	2016-12-22 16:00:06 -08:00
no.json	Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources	2016-04-12 15:14:02 -07:00
pt.json	Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources	2016-04-12 15:14:02 -07:00
ru.json	Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources	2016-04-12 15:14:02 -07:00
tr.json	Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master	2016-12-22 16:00:06 -08:00