branch merge

2008-05-30 18:54:57 -07:00 · 2008-05-30 18:54:57 -07:00 · af1485e6f1
--- a/services/sync/locales/en-US/share.properties
+++ b/services/sync/locales/en-US/share.properties
@ -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".
--- a/services/sync/locales/en-US/sync.properties
+++ b/services/sync/locales/en-US/sync.properties
@ -4,3 +4,4 @@ status.idle = Idle
 status.active = Working...
 status.offline = Offline
 status.error = Error
+shareBookmark.menuItem = Share This Folder...