Merge branch 'master' into google_drive

Conflicts:
	resources/language/English/strings.xml
	resources/lib/backup.py
This commit is contained in:
Rob Weber
2014-11-05 08:40:07 -06:00
6 changed files with 164 additions and 11 deletions

View File

@ -80,5 +80,9 @@
<string id="30086">This version of XBMC is different than the one used to create the archive</string>
<string id="30087">Compress Archives</string>
<string id="30088">Copying Zip Archive</string>
<string id="30089">Google Drive</string>
<string id="30089">Write Error Detected</string>
<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>
</strings>