Ubuntu One Client

Merge lp:~chipaca/ubuntuone-client/fix-menu-items into lp:ubuntuone-client

  1. fix-menu-items
  2. Merge into trunk
Proposed by John Lenton
Status: Merged
Approved by: John Lenton
Approved revision: 662
Merged at revision: 659
Proposed branch: lp:~chipaca/ubuntuone-client/fix-menu-items
Merge into: lp:ubuntuone-client
Diff against target: 226 lines (+31/-30)
3 files modified
bin/ubuntuone-preferences (+5/-4)
nautilus/ubuntuone-nautilus.c (+25/-25)
tests/test_preferences.py (+1/-1)
To merge this branch: bzr merge lp:~chipaca/ubuntuone-client/fix-menu-items
Reviewer Review Type Date Requested Status
Vincenzo Di Somma (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+33769@code.launchpad.net

Commit message

* remove ellipsis from Ubuntu One submenu (LP: #621255).
* fix capitalization of some checkboxes in preferences (LP: #581882).
* capitalize and cleanup menu entries (LP: #621266).

Description of the change

* remove ellipsis from Ubuntu One submenu (LP: #621255).
* fix capitalization of some checkboxes in preferences (LP: #581882).
* capitalize and cleanup menu entries (LP: #621266).

To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

199 - _("Hide location bar"),
200 - _("Do not show the location bar"
201 + _("Hide ribbon"),
202 + _("Do not show the Ubuntu One ribbon"
203 " in selected folders"),
204 "ubuntuone");
205 } else {
206 item = nautilus_menu_item_new ("ubuntuone-location-show",
207 - _("Show location bar"),
208 - _("Show the location bar"
209 + _("Show ribbon (in some folders)"),
210 + _("Show the Ubuntu One ribbon"
211 " in selected folders"),
212 "ubuntuone");

Only one thing, those 'Hide ribbon'/'Show ribbon' should have 'Ribbon'

review: Approve
Revision history for this message
Vincenzo Di Somma (vds) :
review: Approve
Revision history for this message
dobey (dobey) wrote :
Download full text (251.2 KiB)

The attempt to merge lp:~chipaca/ubuntuone-client/fix-menu-items into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/trunk ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for ...

lp:~chipaca/ubuntuone-client/fix-menu-items updated
661. By John Lenton

oops, broke a test

662. By John Lenton

merged with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences 2010-08-24 21:17:00 +0000
+++ bin/ubuntuone-preferences 2010-08-26 18:42:46 +0000
@@ -359,7 +359,7 @@
359 if ((oauth_token and row.get('token') == oauth_token.key or 'FAKE' in row)359 if ((oauth_token and row.get('token') == oauth_token.key or 'FAKE' in row)
360 and fsync_enabled):360 and fsync_enabled):
361 self.bw_chk = ck_btn = gtk.CheckButton(361 self.bw_chk = ck_btn = gtk.CheckButton(
362 _("_Limit Bandwidth Usage"))362 _("_Limit bandwidth"))
363 ck_btn.set_active(self.bw_limited)363 ck_btn.set_active(self.bw_limited)
364 up_lbl = gtk.Label(_("Maximum _upload speed (KB/s):"))364 up_lbl = gtk.Label(_("Maximum _upload speed (KB/s):"))
365 up_lbl.set_alignment(0., .5)365 up_lbl.set_alignment(0., .5)
@@ -961,7 +961,7 @@
961 self.bw_inst_box.pack_start(self.bw_inst_btn, False, False)961 self.bw_inst_box.pack_start(self.bw_inst_btn, False, False)
962 self.bw_inst_btn.show()962 self.bw_inst_btn.show()
963963
964 self.gwib_check = gtk.CheckButton(_("Broadcast Messages _Archive"))964 self.gwib_check = gtk.CheckButton(_("Broadcast messages _archive"))
965 self.gwib_check.set_data('dbname', 'gwibber_messages')965 self.gwib_check.set_data('dbname', 'gwibber_messages')
966 self.gwib_check.connect('toggled', self.__db_check_toggled)966 self.gwib_check.connect('toggled', self.__db_check_toggled)
967 services.pack_start(self.gwib_check, False, False)967 services.pack_start(self.gwib_check, False, False)
@@ -977,7 +977,7 @@
977 services.pack_start(fbox, False, False)977 services.pack_start(fbox, False, False)
978 fbox.show()978 fbox.show()
979979
980 self.files_check = gtk.CheckButton(_("_File Synchronization"))980 self.files_check = gtk.CheckButton(_("_Files"))
981 self.files_check.set_active(False)981 self.files_check.set_active(False)
982 fbox.pack_start(self.files_check, False, False)982 fbox.pack_start(self.files_check, False, False)
983 self.files_check.show()983 self.files_check.show()
@@ -987,7 +987,8 @@
987 fbox.pack_start(alignment, False, False)987 fbox.pack_start(alignment, False, False)
988 alignment.show()988 alignment.show()
989989
990 self.music_check = gtk.CheckButton(_("_Music Download"))990 self.music_check = gtk.CheckButton(_("Ubuntu One _Music Store"
991 " downloads"))
991 self.music_check.set_active(True)992 self.music_check.set_active(True)
992 self.music_check.set_sensitive(False)993 self.music_check.set_sensitive(False)
993 alignment.add(self.music_check)994 alignment.add(self.music_check)
994995
=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c 2010-08-25 18:20:50 +0000
+++ nautilus/ubuntuone-nautilus.c 2010-08-26 18:42:46 +0000
@@ -568,7 +568,7 @@
568 uon->cb_data = cb_data;568 uon->cb_data = cb_data;
569569
570 root_item = nautilus_menu_item_new ("ubuntuone",570 root_item = nautilus_menu_item_new ("ubuntuone",
571 _("Ubuntu One..."),571 _("_Ubuntu One"),
572 _("Ubuntu One options"),572 _("Ubuntu One options"),
573 "ubuntuone");573 "ubuntuone");
574 submenu = nautilus_menu_new ();574 submenu = nautilus_menu_new ();
@@ -583,7 +583,7 @@
583 if ((is_managed || is_udf) && !is_root && is_dir) {583 if ((is_managed || is_udf) && !is_root && is_dir) {
584584
585 item = nautilus_menu_item_new ("ubuntuone-share",585 item = nautilus_menu_item_new ("ubuntuone-share",
586 _("Share on Ubuntu One..."),586 _("_Share..."),
587 _("Share this folder on Ubuntu One"),587 _("Share this folder on Ubuntu One"),
588 "ubuntuone");588 "ubuntuone");
589 if (is_pending)589 if (is_pending)
@@ -596,17 +596,17 @@
596 /* the different tooltips will probably do us no good */596 /* the different tooltips will probably do us no good */
597 if (is_root) {597 if (is_root) {
598 item = nautilus_menu_item_new ("ubuntuone-noshare-root",598 item = nautilus_menu_item_new ("ubuntuone-noshare-root",
599 _("Share on Ubuntu One..."),599 _("_Share..."),
600 _("Sorry, you can't share the root of a Ubuntu One volume"),600 _("Sorry, you can't share the root of a Ubuntu One volume"),
601 "ubuntuone");601 "ubuntuone");
602 } else if (!(is_managed || is_udf)) {602 } else if (!(is_managed || is_udf)) {
603 item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",603 item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
604 _("Share on Ubuntu One..."),604 _("_Share..."),
605 _("Sorry, you can't share folders not managed by Ubuntu One"),605 _("Sorry, you can't share folders not managed by Ubuntu One"),
606 "ubuntuone");606 "ubuntuone");
607 } else {607 } else {
608 item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",608 item = nautilus_menu_item_new ("ubuntuone-noshare-unmanaged",
609 _("Share on Ubuntu One..."),609 _("_Share..."),
610 _("Sorry, you can only share folders"),610 _("Sorry, you can only share folders"),
611 "ubuntuone");611 "ubuntuone");
612 }612 }
@@ -620,7 +620,7 @@
620 NautilusMenuItem * item;620 NautilusMenuItem * item;
621621
622 item = nautilus_menu_item_new ("ubuntuone-unshare",622 item = nautilus_menu_item_new ("ubuntuone-unshare",
623 _("Stop sharing on Ubuntu One..."),623 _("Stop _Sharing"),
624 _("Stop sharing this folder on Ubuntu One"),624 _("Stop sharing this folder on Ubuntu One"),
625 "ubuntuone");625 "ubuntuone");
626 if (is_pending)626 if (is_pending)
@@ -645,7 +645,7 @@
645 if (strcmp (path, uon->managed) == 0) {645 if (strcmp (path, uon->managed) == 0) {
646 /* the Ubuntu One directory, no UDFs */646 /* the Ubuntu One directory, no UDFs */
647 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",647 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
648 _("Stop synchronizing this folder with Ubuntu One"),648 _("Stop Synchronizing This _Folder"),
649 _("Sorry, you can't stop synchronizing ~/Ubuntu One"),649 _("Sorry, you can't stop synchronizing ~/Ubuntu One"),
650 "ubuntuone");650 "ubuntuone");
651 g_object_set (item, "sensitive", FALSE, NULL);651 g_object_set (item, "sensitive", FALSE, NULL);
@@ -653,7 +653,7 @@
653 /* the root of a UDF: disabling possible */653 /* the root of a UDF: disabling possible */
654654
655 item = nautilus_menu_item_new ("ubuntuone-disable-udf",655 item = nautilus_menu_item_new ("ubuntuone-disable-udf",
656 _("Stop synchronizing this folder..."),656 _("Stop Synchronizing This _Folder"),
657 _("Stop synchronizing this folder with Ubuntu One"),657 _("Stop synchronizing this folder with Ubuntu One"),
658 "ubuntuone");658 "ubuntuone");
659659
@@ -665,7 +665,7 @@
665 /* unmanaged */665 /* unmanaged */
666666
667 item = nautilus_menu_item_new ("ubuntuone-enable-udf",667 item = nautilus_menu_item_new ("ubuntuone-enable-udf",
668 _("Synchronize this folder..."),668 _("Synchronize This _Folder"),
669 _("Start synchronizing this folder with Ubuntu One"),669 _("Start synchronizing this folder with Ubuntu One"),
670 "ubuntuone");670 "ubuntuone");
671671
@@ -676,12 +676,12 @@
676 } else {676 } else {
677 if (is_dir) {677 if (is_dir) {
678 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",678 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
679 _("Synchronize this folder..."),679 _("Synchronize This _Folder"),
680 _("Sorry, you can only synchronize folders within your home folder"),680 _("Sorry, you can only synchronize folders within your home folder"),
681 "ubuntuone");681 "ubuntuone");
682 } else {682 } else {
683 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",683 item = nautilus_menu_item_new ("ubuntuone-no-disable-u1",
684 _("Synchronize this folder..."),684 _("Synchronize This _Folder"),
685 _("Sorry, you can only synchronize folders"),685 _("Sorry, you can only synchronize folders"),
686 "ubuntuone");686 "ubuntuone");
687 }687 }
@@ -689,7 +689,7 @@
689 }689 }
690 if (!item) {690 if (!item) {
691 item = nautilus_menu_item_new ("ubuntuone-no-udf-operation-possible",691 item = nautilus_menu_item_new ("ubuntuone-no-udf-operation-possible",
692 _("Synchronize this folder..."),692 _("Synchronize This _Folder"),
693 _("Synchronization not possible for this folder"),693 _("Synchronization not possible for this folder"),
694 "ubuntuone");694 "ubuntuone");
695 g_object_set (item, "sensitive", FALSE, NULL);695 g_object_set (item, "sensitive", FALSE, NULL);
@@ -705,7 +705,7 @@
705705
706 if (is_public) {706 if (is_public) {
707 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",707 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
708 _("Copy Ubuntu One public URL"),708 _("Copy Web _Link"),
709 _("Copy the Ubuntu One public URL for this file to the clipboard."),709 _("Copy the Ubuntu One public URL for this file to the clipboard."),
710 "ubuntuone");710 "ubuntuone");
711 if (is_pending)711 if (is_pending)
@@ -715,8 +715,8 @@
715 G_CALLBACK (ubuntuone_nautilus_copy_public_url),715 G_CALLBACK (ubuntuone_nautilus_copy_public_url),
716 cb_data);716 cb_data);
717 item = nautilus_menu_item_new ("ubuntuone-unpublish",717 item = nautilus_menu_item_new ("ubuntuone-unpublish",
718 _("Stop publishing via Ubuntu One"),718 _("Stop _Publishing"),
719 _("No longer share this file with everyone."),719 _("No longer share this file with everyone via Ubuntu One."),
720 "ubuntuone");720 "ubuntuone");
721 if (is_pending)721 if (is_pending)
722 g_object_set (item, "sensitive", FALSE, NULL);722 g_object_set (item, "sensitive", FALSE, NULL);
@@ -724,8 +724,8 @@
724 cb_data->make_public = FALSE;724 cb_data->make_public = FALSE;
725 } else {725 } else {
726 item = nautilus_menu_item_new ("ubuntuone-publish",726 item = nautilus_menu_item_new ("ubuntuone-publish",
727 _("Publish this file via Ubuntu One"),727 _("_Publish"),
728 _("Make this file available to anyone."),728 _("Make this file available to anyone via Ubuntu One."),
729 "ubuntuone");729 "ubuntuone");
730 cb_data->make_public = TRUE;730 cb_data->make_public = TRUE;
731 }731 }
@@ -735,15 +735,15 @@
735 }735 }
736 if (!urlitem) {736 if (!urlitem) {
737 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",737 urlitem = nautilus_menu_item_new ("ubuntuone-geturl",
738 _("Copy Ubuntu One public URL"),738 _("Copy Web _Link"),
739 _("Sorry, no public URL for this file"),739 _("Sorry, no public URL for this file via Ubuntu One."),
740 "ubuntuone");740 "ubuntuone");
741 g_object_set (urlitem, "sensitive", FALSE, NULL);741 g_object_set (urlitem, "sensitive", FALSE, NULL);
742 }742 }
743 if (!item) {743 if (!item) {
744 item = nautilus_menu_item_new ("ubuntuone-publish",744 item = nautilus_menu_item_new ("ubuntuone-publish",
745 _("Publish via Ubuntu One"),745 _("_Publish"),
746 _("Sorry, unable to publish"),746 _("Sorry, unable to publish via Ubuntu One."),
747 "ubuntuone");747 "ubuntuone");
748 g_object_set (item, "sensitive", FALSE, NULL);748 g_object_set (item, "sensitive", FALSE, NULL);
749 }749 }
@@ -757,14 +757,14 @@
757 NautilusMenuItem * item;757 NautilusMenuItem * item;
758 if (show_location()) {758 if (show_location()) {
759 item = nautilus_menu_item_new ("ubuntuone-location-hide",759 item = nautilus_menu_item_new ("ubuntuone-location-hide",
760 _("Hide location bar"),760 _("Hide _Ribbon"),
761 _("Do not show the location bar"761 _("Do not show the Ubuntu One ribbon"
762 " in selected folders"),762 " in selected folders"),
763 "ubuntuone");763 "ubuntuone");
764 } else {764 } else {
765 item = nautilus_menu_item_new ("ubuntuone-location-show",765 item = nautilus_menu_item_new ("ubuntuone-location-show",
766 _("Show location bar"),766 _("Show _Ribbon in Some Folders"),
767 _("Show the location bar"767 _("Show the Ubuntu One ribbon"
768 " in selected folders"),768 " in selected folders"),
769 "ubuntuone");769 "ubuntuone");
770 }770 }
771771
=== modified file 'tests/test_preferences.py'
--- tests/test_preferences.py 2010-08-25 22:37:44 +0000
+++ tests/test_preferences.py 2010-08-26 18:42:46 +0000
@@ -166,7 +166,7 @@
166 # check a placeholder for the local machine description is there166 # check a placeholder for the local machine description is there
167 self.assertTrue(('Label', '<LOCAL MACHINE>') in interesting)167 self.assertTrue(('Label', '<LOCAL MACHINE>') in interesting)
168 # check the bw limitation stuff is there168 # check the bw limitation stuff is there
169 self.assertTrue(('CheckButton', '_Limit Bandwidth Usage')169 self.assertTrue(('CheckButton', '_Limit bandwidth')
170 in interesting)170 in interesting)
171 self.assertTrue(('Label', 'Maximum _download speed (KB/s):')171 self.assertTrue(('Label', 'Maximum _download speed (KB/s):')
172 in interesting)172 in interesting)

Subscribers

People subscribed via source and target branches