From c9675b91a242391c83625fa0c362b56171e41c51 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 10 Jun 2012 15:20:21 +0200
Subject: [PATCH] Remove translated text from db prefs for similar searches.

---
 src/calibre/gui2/actions/similar_books.py | 2 +-
 src/calibre/gui2/preferences/search.py    | 2 +-
 src/calibre/library/database2.py          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/actions/similar_books.py b/src/calibre/gui2/actions/similar_books.py
index 8c7fe1d0ed..7e7c02ce0b 100644
--- a/src/calibre/gui2/actions/similar_books.py
+++ b/src/calibre/gui2/actions/similar_books.py
@@ -43,7 +43,7 @@ class SimilarBooksAction(InterfaceAction):
         # Get the parameters for this search
         col = db.prefs['similar_' + typ + '_search_key']
         match = db.prefs['similar_' + typ + '_match_kind']
-        if match == _('Match all'):
+        if match == 'match_all':
             join = ' and '
         else:
             join = ' or '
diff --git a/src/calibre/gui2/preferences/search.py b/src/calibre/gui2/preferences/search.py
index c6993c58b6..e41f2f50b6 100644
--- a/src/calibre/gui2/preferences/search.py
+++ b/src/calibre/gui2/preferences/search.py
@@ -72,7 +72,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.fill_gst_box(select=None)
 
         self.category_fields = fl
-        ml = [_('Match any'), _('Match all')]
+        ml = [(_('Match any'), 'match_any'), (_('Match all'), 'match_all')]
         r('similar_authors_match_kind', db.prefs, choices=ml)
         r('similar_tags_match_kind', db.prefs, choices=ml)
         r('similar_series_match_kind', db.prefs, choices=ml)
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 378e155a72..e657def734 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -237,13 +237,13 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
         defs['column_color_rules'] = []
         defs['grouped_search_make_user_categories'] = []
         defs['similar_authors_search_key'] = 'authors'
-        defs['similar_authors_match_kind'] = _('Match any')
+        defs['similar_authors_match_kind'] = 'match_any'
         defs['similar_publisher_search_key'] = 'publisher'
-        defs['similar_publisher_match_kind'] = _('Match any')
+        defs['similar_publisher_match_kind'] = 'match_any'
         defs['similar_tags_search_key'] = 'tags'
-        defs['similar_tags_match_kind'] = _('Match all')
+        defs['similar_tags_match_kind'] = 'match_all'
         defs['similar_series_search_key'] = 'series'
-        defs['similar_series_match_kind'] = _('Match any')
+        defs['similar_series_match_kind'] = 'match_any'
 
         # Migrate the bool tristate tweak
         defs['bools_are_tristate'] = \