Merge branch 'dropbox'

Conflicts:
	addon.xml
	changelog.txt
	resources/lib/backup.py
	resources/settings.xml
This commit is contained in:
Rob Weber
2012-11-28 09:33:47 -06:00
17 changed files with 2251 additions and 67 deletions

View File

@ -16,6 +16,7 @@
<string id="30024">Type Remote Path</string>
<string id="30025">Remote Path Type</string>
<string id="30026">Backups to keep (0 for all)</string>
<string id="30027">Dropbox</string>
<string id="30030">User Addons</string>
<string id="30031">Addon Data</string>
@ -34,6 +35,8 @@
<string id="30052">Writing file</string>
<string id="30053">Starting scheduled backup</string>
<string id="30054">Removing backup</string>
<string id="30056">Check log for Dropbox authorize URL</string>
<string id="30057">Click OK when authorized</string>
<string id="30060">Enable Scheduler</string>
<string id="30061">Schedule</string>