vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Feb 17 
14:06:20 2012 +0100| [6f55cc5109f5981bc0eb7b72b90a35ae2052b832] | committer: 
Francois Cartegnie

Qt: simple_prefs: Fix action button for hotkeys conflict dialog.

As "Ok" did not mean which action would have been done.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f55cc5109f5981bc0eb7b72b90a35ae2052b832
---

 modules/gui/qt4/components/preferences_widgets.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp 
b/modules/gui/qt4/components/preferences_widgets.cpp
index 694ef2d..45f796a 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1556,7 +1556,7 @@ KeyInputDialog::KeyInputDialog( QTreeWidget *_table,
     vLayout->insertWidget( 1, warning );
 
     buttonBox = new QDialogButtonBox;
-    QPushButton *ok = new QPushButton( qtr("OK") );
+    QPushButton *ok = new QPushButton( qtr("Assign") );
     QPushButton *cancel = new QPushButton( qtr("Cancel") );
     buttonBox->addButton( ok, QDialogButtonBox::AcceptRole );
     buttonBox->addButton( cancel, QDialogButtonBox::RejectRole );

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to