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>

View File

@ -8,6 +8,7 @@
<setting id="dropbox_secret" type="text" label="30029" visible="eq(-4,2)" default="" />
<setting id="google_drive_id" type="text" label="Client ID" visible="eq(-5,3)" default="" />
<setting id="google_drive_secret" type="text" label="Client Secret" visible="eq(-6,3)" default="" />
<setting id="remove_auth_button" type="action" label="30096" action="RunScript(special://home/addons/script.xbmcbackup/remove_auth.py)" visible="gt(-7,1)"/>
<setting id="compress_backups" type="bool" label="30087" default="false" />
<setting id="backup_rotation" type="number" label="30026" default="0" />
<setting id="progress_mode" type="enum" label="30022" lvalues="30082|30083|30084" default="0" />