diff --git a/src/libaudqt/infowin.cc b/src/libaudqt/infowin.cc
index e05f5f5..e71038a 100644
--- a/src/libaudqt/infowin.cc
+++ b/src/libaudqt/infowin.cc
@@ -24,6 +24,7 @@
 #include <QImage>
 #include <QLabel>
 #include <QPixmap>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 #include <libaudcore/audstrings.h>
@@ -67,15 +68,17 @@ InfoWindow::InfoWindow (QWidget * parent) : QDialog (parent)
     auto vbox = new QVBoxLayout (this);
     vbox->addLayout (hbox);
 
-    auto buttonbox = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    vbox->addWidget (buttonbox);
+    auto bbox = new QDialogButtonBox (QDialogButtonBox::Save | QDialogButtonBox::Close, this);
+    bbox->button (QDialogButtonBox::Save)->setText (translate_str (N_("_Save")));
+    bbox->button (QDialogButtonBox::Close)->setText (translate_str (N_("_Close")));
+    vbox->addWidget (bbox);
 
-    QObject::connect (buttonbox, &QDialogButtonBox::accepted, [this] () {
+    QObject::connect (bbox, & QDialogButtonBox::accepted, [this] () {
         m_infowidget.updateFile ();
         deleteLater ();
     });
 
-    QObject::connect (buttonbox, &QDialogButtonBox::rejected, this, &QObject::deleteLater);
+    QObject::connect (bbox, & QDialogButtonBox::rejected, this, & QObject::deleteLater);
 }
 
 void InfoWindow::fillInfo (int playlist, int entry, const char * filename, const Tuple & tuple,
diff --git a/src/libaudqt/prefs-plugin.cc b/src/libaudqt/prefs-plugin.cc
index e413b84..a014fbb 100644
--- a/src/libaudqt/prefs-plugin.cc
+++ b/src/libaudqt/prefs-plugin.cc
@@ -19,6 +19,7 @@
 
 #include <QDialog>
 #include <QDialogButtonBox>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 #include <libaudcore/audstrings.h>
@@ -50,9 +51,9 @@ EXPORT void plugin_about (PluginHandle * ph)
         text = dgettext (header->info.domain, text);
     }
 
-    AUDDBG("name = %s\n", name);
+    AUDDBG ("name = %s\n", name);
 
-    simple_message(str_printf (_("About %s"), name), text);
+    simple_message (str_printf (_("About %s"), name), text);
 }
 
 struct ConfigWindow {
@@ -116,6 +117,8 @@ EXPORT void plugin_prefs (PluginHandle * ph)
     if (p->apply)
     {
         bbox->setStandardButtons (QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+        bbox->button (QDialogButtonBox::Ok)->setText (translate_str (N_("_Set")));
+        bbox->button (QDialogButtonBox::Cancel)->setText (translate_str (N_("_Cancel")));
 
         QObject::connect (bbox, &QDialogButtonBox::accepted, [=] () {
             if (p->apply)
@@ -129,6 +132,7 @@ EXPORT void plugin_prefs (PluginHandle * ph)
     else
     {
         bbox->setStandardButtons (QDialogButtonBox::Close);
+        bbox->button (QDialogButtonBox::Close)->setText (translate_str (N_("_Close")));
 
         QObject::connect (bbox, &QDialogButtonBox::rejected, cw->root, &QWidget::hide);
     }
diff --git a/src/libaudqt/prefs-window.cc b/src/libaudqt/prefs-window.cc
index 2099f16..8798969 100644
--- a/src/libaudqt/prefs-window.cc
+++ b/src/libaudqt/prefs-window.cc
@@ -676,6 +676,7 @@ static void create_prefs_window ()
     create_plugin_category (s_category_notebook);
 
     QDialogButtonBox * bbox = new QDialogButtonBox (QDialogButtonBox::Close);
+    bbox->button (QDialogButtonBox::Close)->setText (translate_str (N_("_Close")));
     child_vbox->addWidget (bbox);
 
     QObject::connect (bbox, &QDialogButtonBox::rejected, s_prefswin, &QObject::deleteLater);
diff --git a/src/libaudqt/util.cc b/src/libaudqt/util.cc
index 1357905..ff71380 100644
--- a/src/libaudqt/util.cc
+++ b/src/libaudqt/util.cc
@@ -20,6 +20,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QLabel>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 #include <libaudcore/audstrings.h>
@@ -66,6 +67,7 @@ EXPORT void simple_message (const char * title, const char * text)
     label.setTextInteractionFlags (Qt::TextSelectableByMouse);
 
     bbox.setStandardButtons (QDialogButtonBox::Close);
+    bbox.button (QDialogButtonBox::Close)->setText (translate_str (N_("_Close")));
 
     QObject::connect (& bbox, & QDialogButtonBox::rejected, & msgbox, & QDialog::reject);
 
