From cca39d2e730a2877a753747ba2b4fd93a9b6384f Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Tue, 28 Sep 2010 13:11:55 +0100
Subject: [PATCH] Small cleanups for messages and name

---
 src/calibre/customize/builtins.py         | 2 +-
 src/calibre/gui2/preferences/plugboard.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 89c800afb2..cf6995d3bb 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -799,7 +799,7 @@ class Sending(PreferencesPlugin):
 class Plugboard(PreferencesPlugin):
     name = 'Plugboard'
     icon = I('plugboard.png')
-    gui_name = _('Metadata plugboard')
+    gui_name = _('Metadata plugboards')
     category = 'Import/Export'
     gui_category = _('Import/Export')
     category_order = 3
diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py
index b723fb938c..124654b643 100644
--- a/src/calibre/gui2/preferences/plugboard.py
+++ b/src/calibre/gui2/preferences/plugboard.py
@@ -197,7 +197,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
         if error:
             error_dialog(self, '',
-                     _('That format and device already has a plugboard'),
+                     _('That format and device already has a plugboard or '
+                       'conflicts with another plugboard.'),
                      show=True)
             self.new_device.setCurrentIndex(0)
             return