Merge lp:~foxxtrot/ubuntuone-client/598638 into lp:ubuntuone-client

[Jeff Craig]

Change wording in nautilus from 'enabled' to 'subscribed' to be clearer for the user, and consistent with the command line tool.

[Rodrigo Moya (rodrigo-moya)]

We have been discussing this precisely today, since as you found out, the text is confusing. I don't think though 'Synced/Not synced to' is correct, since it might lead users to think the folder is already synchronized, which it might be not.

So, any other better text you can come up with? As I'm not a native English speaker, I'll let others come up with a better text, but it should not create confusion of what it really means, which is that the given folder is a UDF in Ubuntu One.

[Jeff Craig (foxxtrot)]

True, I went with 'synced' in an effort to keep the wording short.

u1sdtool uses the words 'Subscribed' and 'Unsubscribed', so those may be better choices. The concern, of course, is keeping the phrasing short, but clear. I'll play with the wording a bit using 'subscribed/unsubscribed'.

Translation question: I kept '<b>Ubuntu One</b>' out of the translation string to maintain consistency with the original version. My concern is that in some languages, it would be better to change the position of the Ubuntu One name to maintain proper sentence structure. Doing this appears to be supported in the way certain strings are structured in the Translation files, and my next push will likely include moving the name into the translated string, unless there is reason not to that I'm not aware of.

[lp:~foxxtrot/ubuntuone-client/598638]

561. By Jeff Craig on 2010-07-02

Merging in latest ubuntuone-client.

562. By Jeff Craig on 2010-07-02

Tweak wording to be less awkward.

[Tim Cole (tcole)]

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Just checked with some native English speakers, and the suggestion I've got is to use:

"Subscribed to U1"
"Not subscribed to U1"

since "unsubscribed" would suggest something that has previously been subscribed.

I'm still not sure we really want to use 'subscribed' though, since there is a feature in syncdaemon that allows you to not sync a UDF, and that operation is called subscribe/unsubscribe. We don't show that on the UI now, but we might one day.

So not sure yet what's best really

[Rodrigo Moya (rodrigo-moya)]

what about just using 'U1 enabled/disabled on this folder"?

[dobey (dobey)]

Subscribed/Unsubscribed or Enabled/Disabled are both a bit off, given that it implies a global thing, rather than the current folder being synchronized. Also note that the enabled/disabled button does not necessarily mean subscribed/unsubscribed to the folder, either.

[Jeff Craig (foxxtrot)]

Yeah, I'm going to add the 'on this folder' verbiage to the branch shortly. It felt a bit too verbose at first, but we've been running around in circles on the wording, and that seems to be the best way to address the confusion about what the button is actually doing.

If I change it back to 'enabled/disabled' then the button won't need to be modified, which may be best for now.

Eventually, this should probably be replaced by one of those 'windicators' that Mark Shuttleworth posted about a while back. However, that's a different bug at this stage.

[lp:~foxxtrot/ubuntuone-client/598638]

563. By Jeff Craig on 2010-07-07

Update language based on discussion from the code review 29006

[Rodrigo Moya (rodrigo-moya)]

We have been having several discussions on what to do here, and I think we've come up with a good solution, which is to remove the text itself, and just have the 'Synchronize folder' checkbox and the <b>Ubuntu One</b> text. So, I'm rejecting this proposal since that change will be made in another branch

Thanks Jeff for the branch anyway, you raised a good point that ended up in a long but helpful discussion :)

review: Disapprove

Unmerged revisions

563. By Jeff Craig on 2010-07-07

Update language based on discussion from the code review 29006

562. By Jeff Craig on 2010-07-02

Tweak wording to be less awkward.

561. By Jeff Craig on 2010-07-02

Merging in latest ubuntuone-client.

=== modified file 'nautilus/location-widget.c'
--- nautilus/location-widget.c	2010-06-29 14:18:04 +0000
+++ nautilus/location-widget.c	2010-07-07 16:43:39 +0000
@@ -30,9 +30,10 @@
 set_label_text (LocationWidget *location, gboolean enabled)
 {
 	gchar *labeltext;
-
-	labeltext = g_strdup_printf ("<b>Ubuntu One</b> %s",
-				     enabled ? _("enabled") : _("disabled"));
+	
+	labeltext = g_strdup_printf (enabled ? 
+				     _("<b>Ubuntu One</b> enabled on this folder") :
+				     _("<b>Ubuntu One</b> disabled on this folder"));
 	gtk_label_set_markup (GTK_LABEL (location->info_label), labeltext);
 	g_free (labeltext);
 }