Merge lp:~dobey/ubuntuone-client-gnome/shrlnk into lp:ubuntuone-client-gnome

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 24
Merged at revision: 23
Proposed branch: lp:~dobey/ubuntuone-client-gnome/shrlnk
Merge into: lp:ubuntuone-client-gnome
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/shrlnk
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+154524@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
24. By dobey

Fix typo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nautilus/context-menu.c'
--- nautilus/context-menu.c 2012-11-14 12:09:03 +0000
+++ nautilus/context-menu.c 2013-03-21 13:57:20 +0000
@@ -281,8 +281,8 @@
281 if (!is_shared_to_me && is_managed && is_regular && !is_symlink) {281 if (!is_shared_to_me && is_managed && is_regular && !is_symlink) {
282 if (is_public) {282 if (is_public) {
283 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",283 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
284 _("Copy Web _Link"),284 _("Copy Share _Link"),
285 _("Copy the Ubuntu One public URL for this file to the clipboard."),285 _("Copy the Ubuntu One share link for this file to the clipboard."),
286 "ubuntuone");286 "ubuntuone");
287 if (is_pending)287 if (is_pending)
288 g_object_set (urlitem, "sensitive", FALSE, NULL);288 g_object_set (urlitem, "sensitive", FALSE, NULL);
@@ -290,8 +290,8 @@
290 G_CALLBACK (copy_public_url_cb), cb_data);290 G_CALLBACK (copy_public_url_cb), cb_data);
291291
292 menu_item = nautilus_menu_item_new ("ubuntuone-unpublish",292 menu_item = nautilus_menu_item_new ("ubuntuone-unpublish",
293 _("Stop _Publishing"),293 _("_Disable Share Link"),
294 _("No longer share this file with everyone via Ubuntu One."),294 _("Disable the share link for this file on Ubuntu One."),
295 "ubuntuone");295 "ubuntuone");
296 if (is_pending)296 if (is_pending)
297 g_object_set (menu_item, "sensitive", FALSE, NULL);297 g_object_set (menu_item, "sensitive", FALSE, NULL);
@@ -299,8 +299,8 @@
299 cb_data->make_public = FALSE;299 cb_data->make_public = FALSE;
300 } else {300 } else {
301 menu_item = nautilus_menu_item_new ("ubuntuone-publish",301 menu_item = nautilus_menu_item_new ("ubuntuone-publish",
302 _("_Publish"),302 _("_Share Link"),
303 _("Make this file available to anyone via Ubuntu One."),303 _("Create a share link to this file on Ubuntu One."),
304 "ubuntuone");304 "ubuntuone");
305 cb_data->make_public = TRUE;305 cb_data->make_public = TRUE;
306 }306 }
@@ -310,16 +310,16 @@
310310
311 if (!urlitem) {311 if (!urlitem) {
312 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",312 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
313 _("Copy Web _Link"),313 _("Copy Share _Link"),
314 _("Sorry, no public URL for this file via Ubuntu One."),314 _("Sorry, no share link for this file on Ubuntu One."),
315 "ubuntuone");315 "ubuntuone");
316 g_object_set (urlitem, "sensitive", FALSE, NULL);316 g_object_set (urlitem, "sensitive", FALSE, NULL);
317 }317 }
318318
319 if (!menu_item) {319 if (!menu_item) {
320 menu_item = nautilus_menu_item_new ("ubuntuone-publish",320 menu_item = nautilus_menu_item_new ("ubuntuone-publish",
321 _("_Publish"),321 _("_Share Link"),
322 _("Sorry, unable to publish via Ubuntu One."),322 _("Sorry, unable to create share link via Ubuntu One."),
323 "ubuntuone");323 "ubuntuone");
324 g_object_set (menu_item, "sensitive", FALSE, NULL);324 g_object_set (menu_item, "sensitive", FALSE, NULL);
325 }325 }

Subscribers

People subscribed via source and target branches

to all changes: