ubuntuone-client-gnome

Merge lp:~dobey/ubuntuone-client-gnome/update-4-2 into lp:ubuntuone-client-gnome/stable-4-2

  1. update-4-2
  2. Merge into stable-4-2
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~dobey/ubuntuone-client-gnome/update-4-2
Merge into: lp:ubuntuone-client-gnome/stable-4-2
Diff against target: 57 lines (+10/-10)
1 file modified
nautilus/context-menu.c (+10/-10)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client-gnome/update-4-2
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+154780@code.launchpad.net

Commit message

Replace usage of "publish" with "share link" appropriately.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/context-menu.c'
2--- nautilus/context-menu.c 2012-11-14 12:09:03 +0000
3+++ nautilus/context-menu.c 2013-03-21 18:14:23 +0000
4@@ -281,8 +281,8 @@
5 if (!is_shared_to_me && is_managed && is_regular && !is_symlink) {
6 if (is_public) {
7 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
8- _("Copy Web _Link"),
9- _("Copy the Ubuntu One public URL for this file to the clipboard."),
10+ _("Copy Share _Link"),
11+ _("Copy the Ubuntu One share link for this file to the clipboard."),
12 "ubuntuone");
13 if (is_pending)
14 g_object_set (urlitem, "sensitive", FALSE, NULL);
15@@ -290,8 +290,8 @@
16 G_CALLBACK (copy_public_url_cb), cb_data);
17
18 menu_item = nautilus_menu_item_new ("ubuntuone-unpublish",
19- _("Stop _Publishing"),
20- _("No longer share this file with everyone via Ubuntu One."),
21+ _("_Disable Share Link"),
22+ _("Disable the share link for this file on Ubuntu One."),
23 "ubuntuone");
24 if (is_pending)
25 g_object_set (menu_item, "sensitive", FALSE, NULL);
26@@ -299,8 +299,8 @@
27 cb_data->make_public = FALSE;
28 } else {
29 menu_item = nautilus_menu_item_new ("ubuntuone-publish",
30- _("_Publish"),
31- _("Make this file available to anyone via Ubuntu One."),
32+ _("_Share Link"),
33+ _("Create a share link to this file on Ubuntu One."),
34 "ubuntuone");
35 cb_data->make_public = TRUE;
36 }
37@@ -310,16 +310,16 @@
38
39 if (!urlitem) {
40 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
41- _("Copy Web _Link"),
42- _("Sorry, no public URL for this file via Ubuntu One."),
43+ _("Copy Share _Link"),
44+ _("Sorry, no share link for this file on Ubuntu One."),
45 "ubuntuone");
46 g_object_set (urlitem, "sensitive", FALSE, NULL);
47 }
48
49 if (!menu_item) {
50 menu_item = nautilus_menu_item_new ("ubuntuone-publish",
51- _("_Publish"),
52- _("Sorry, unable to publish via Ubuntu One."),
53+ _("_Share Link"),
54+ _("Sorry, unable to create share link via Ubuntu One."),
55 "ubuntuone");
56 g_object_set (menu_item, "sensitive", FALSE, NULL);
57 }

Subscribers

People subscribed via source and target branches

to all changes: