diff --git a/gtk/details.c b/gtk/details.c index 2407ab3b4..a9a634e86 100644 --- a/gtk/details.c +++ b/gtk/details.c @@ -543,7 +543,7 @@ options_page_new( struct DetailsImpl * d ) hig_workarea_add_section_title( t, &row, _( "Seed-Until Ratio" ) ); group = NULL; - s = _( "Use _global setting" ); + s = _( "Use _global settings" ); w = gtk_radio_button_new_with_mnemonic( group, s ); group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( w ) ); hig_workarea_add_wide_control( t, &row, w ); diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c index 4df3a54fb..5b8378ad5 100644 --- a/gtk/tr-prefs.c +++ b/gtk/tr-prefs.c @@ -303,7 +303,7 @@ torrentPage( GObject * core ) hig_workarea_add_wide_control( t, &row, w ); w = new_path_chooser_button( TR_PREFS_KEY_DOWNLOAD_DIR, core ); - hig_workarea_add_row( t, &row, _( "_Destination folder:" ), w, NULL ); + hig_workarea_add_row( t, &row, _( "Save to _Location:" ), w, NULL ); hig_workarea_add_section_divider( t, &row ); hig_workarea_add_section_title( t, &row, _( "Limits" ) ); @@ -526,7 +526,7 @@ peerPage( GObject * core ) hig_workarea_add_section_divider( t, &row ); hig_workarea_add_section_title ( t, &row, _( "Privacy" ) ); - s = _( "_Encryption mode" ); + s = _( "_Encryption mode:" ); w = new_encryption_combo( core, "encryption" ); hig_workarea_add_row( t, &row, s, w, NULL ); @@ -803,7 +803,7 @@ webPage( GObject * core ) page->auth_widgets = g_slist_append( page->auth_widgets, w ); /* require authentication */ - s = _( "Only allow these IP _addresses to connect:" ); + s = _( "Only allow these IP addresses to _connect:" ); w = new_check_button( s, TR_PREFS_KEY_RPC_WHITELIST_ENABLED, core ); hig_workarea_add_wide_control( t, &row, w ); page->whitelist_tb = GTK_TOGGLE_BUTTON( w ); @@ -1172,10 +1172,11 @@ bandwidthPageFree( gpointer gpage ) static GtkWidget* bandwidthPage( GObject * core ) { - int row = 0; - const char * s; - GtkWidget * t; - GtkWidget * w, * w2, * h; + int row = 0; + const char * s; + GtkWidget * t; + GtkWidget * l; + GtkWidget * w, * w2, * h; char buf[512]; struct BandwidthPage * page = tr_new0( struct BandwidthPage, 1 ); @@ -1224,15 +1225,16 @@ bandwidthPage( GObject * core ) w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_UP, core, 0, INT_MAX, 5 ); hig_workarea_add_row( t, &row, s, w, NULL ); - s = _( "_Scheduled use:" ); + s = _( "_Scheduled times:" ); h = gtk_hbox_new( FALSE, 0 ); w2 = new_time_combo( core, TR_PREFS_KEY_ALT_SPEED_TIME_BEGIN ); page->sched_widgets = g_slist_append( page->sched_widgets, w2 ); gtk_box_pack_start( GTK_BOX( h ), w2, TRUE, TRUE, 0 ); - w2 = gtk_label_new ( _( " and " ) ); + w2 = l = gtk_label_new_with_mnemonic ( _( " _and " ) ); page->sched_widgets = g_slist_append( page->sched_widgets, w2 ); gtk_box_pack_start( GTK_BOX( h ), w2, FALSE, FALSE, 0 ); w2 = new_time_combo( core, TR_PREFS_KEY_ALT_SPEED_TIME_END ); + gtk_label_set_mnemonic_widget( GTK_LABEL( l ), w2 ); page->sched_widgets = g_slist_append( page->sched_widgets, w2 ); gtk_box_pack_start( GTK_BOX( h ), w2, TRUE, TRUE, 0 ); w = new_check_button( s, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, core ); diff --git a/qt/details.cc b/qt/details.cc index 262421bd4..e6bc3e4f6 100644 --- a/qt/details.cc +++ b/qt/details.cc @@ -945,7 +945,7 @@ Details :: createOptionsTab( ) hig->addSectionDivider( ); hig->addSectionTitle( tr( "Seed-Until Ratio" ) ); - r = new QRadioButton( tr( "Use &global setting" ) ); + r = new QRadioButton( tr( "Use &global settings" ) ); r->setProperty( RATIO_KEY, TR_RATIOLIMIT_GLOBAL ); connect( r, SIGNAL(clicked(bool)), this, SLOT(onSeedUntilChanged(bool))); mySeedGlobalRadio = r; diff --git a/qt/prefs-dialog.cc b/qt/prefs-dialog.cc index a9b27b2e0..cb42a0b3b 100644 --- a/qt/prefs-dialog.cc +++ b/qt/prefs-dialog.cc @@ -238,9 +238,9 @@ PrefsDialog :: createWebTab( Session& session ) myWebAuthWidgets << l << w; l = hig->addRow( tr( "Pass&word:" ), w = lineEditNew( Prefs::RPC_PASSWORD, QLineEdit::Password ) ); myWebAuthWidgets << l << w; - hig->addWideControl( w = checkBoxNew( tr( "Only allow these IP &addresses to connect:" ), Prefs::RPC_WHITELIST_ENABLED ) ); + hig->addWideControl( w = checkBoxNew( tr( "Only allow these IP addresses to &connect:" ), Prefs::RPC_WHITELIST_ENABLED ) ); myWebWidgets << w; - l = hig->addRow( tr( "Addresses:" ), w = lineEditNew( Prefs::RPC_WHITELIST ) ); + l = hig->addRow( tr( "A&ddresses:" ), w = lineEditNew( Prefs::RPC_WHITELIST ) ); myWebWhitelistWidgets << l << w; myUnsupportedWhenRemote << myWebWidgets << myWebAuthWidgets << myWebWhitelistWidgets; hig->finish( ); @@ -300,16 +300,17 @@ PrefsDialog :: createBandwidthTab( ) r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_UP, 0, INT_MAX, 5 ); hig->addRow( s, r ); - QCheckBox * c = checkBoxNew( tr( "&Scheduled use:" ), Prefs::ALT_SPEED_LIMIT_TIME_ENABLED ); + QCheckBox * c = checkBoxNew( tr( "&Scheduled times:" ), Prefs::ALT_SPEED_LIMIT_TIME_ENABLED ); h = new QHBoxLayout( ); h->setSpacing( HIG::PAD ); QWidget * w = timeEditNew( Prefs :: ALT_SPEED_LIMIT_TIME_BEGIN ); h->addWidget( w, 1 ); mySchedWidgets << w; - w = new QLabel( "and" ); - h->addWidget( w ); - mySchedWidgets << w; + QLabel * nd = new QLabel( "&and" ); + h->addWidget( nd ); + mySchedWidgets << nd; w = timeEditNew( Prefs :: ALT_SPEED_LIMIT_TIME_END ); + nd->setBuddy( w ); h->addWidget( w, 1 ); mySchedWidgets << w; hig->addRow( c, h, 0 ); @@ -546,7 +547,7 @@ PrefsDialog :: createTorrentsTab( ) b->setIcon( folderPixmap ); b->setStyleSheet( "text-align: left; padding-left: 5; padding-right: 5" ); connect( b, SIGNAL(clicked(bool)), this, SLOT(onDestinationClicked(void)) ); - hig->addRow( tr( "&Destination folder:" ), b ); + hig->addRow( tr( "Save to &Location:" ), b ); hig->addSectionDivider( ); hig->addSectionTitle( tr( "Limits" ) );