branch merge

This commit is contained in:
Dan Mills 2008-05-30 18:54:57 -07:00
commit af1485e6f1
2 changed files with 2 additions and 0 deletions

View File

@ -1,3 +1,4 @@
status.ok = Weave sharing complete!
status.error = Error. Please check the Weave ID and try again.
status.working = Working...
folder.message = You have chosen to share the bookmark folder "%S".

View File

@ -4,3 +4,4 @@ status.idle = Idle
status.active = Working...
status.offline = Offline
status.error = Error
shareBookmark.menuItem = Share This Folder...