Micah Lee fd39f84bff Merge branch 'master' into ephemeral ...

Conflicts:
	onionshare/helpers.py
	onionshare/onionshare.py

2015-11-15 15:35:59 -08:00

..

de.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

en.json

Fixed call to create_ephemeral_hidden_service, and also await_publication=True to make the app.wait_for_hs() call obsolete

2015-09-08 17:28:23 -07:00

es.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

fi.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

fr.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

it.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

nl.json

Update Dutch translation strings.

2015-06-25 22:01:33 +02:00

no.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

pt.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

ru.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00

tr.json

cant_connect_ctrlport and cant_connect_socksport are expecting strings and not ints (#169)

2015-05-15 16:55:03 -07:00