Merge branch 'master' into helix_google_drive

Conflicts:
	addon.xml
	resources/language/English/strings.xml
	resources/settings.xml
This commit is contained in:
Rob Weber
2015-02-13 09:42:26 -06:00
5 changed files with 26 additions and 3 deletions

View File

@ -84,5 +84,8 @@
<string id="30090">The destination may not be writeable</string>
<string id="30091">Zip archive could not be copied</string>
<string id="30092">Not all files were copied</string>
<string id="30093">Google Drive</string>
<string id="30093">Delete Authorization Info</string>
<string id="30094">This will delete any OAuth token files</string>
<string id="30095">Do you want to do this?</string>
<string id="30096">Google Drive</string>
</strings>