diff -Nru vdr-plugin-text2skin-1.3.1-20101027/bitmap.c vdr-plugin-text2skin-1.3.1-Rev99093d5a/bitmap.c
--- vdr-plugin-text2skin-1.3.1-20101027/bitmap.c	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/bitmap.c	2011-10-03 15:23:21.000000000 +0000
@@ -90,6 +90,7 @@
 #ifdef HAVE_IMAGEMAGICK
 	InitializeMagick(NULL);
 #endif
+	mCache.SetMaxItems(Text2SkinSetup.MaxCacheFill);
 }
 
 cText2SkinBitmap::cText2SkinBitmap(void) {
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/cache.h vdr-plugin-text2skin-1.3.1-Rev99093d5a/cache.h
--- vdr-plugin-text2skin-1.3.1-20101027/cache.h	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/cache.h	2011-10-03 15:23:21.000000000 +0000
@@ -31,6 +31,7 @@
 	bool Contains(const key_type &Key);
 	data_type &operator[](const key_type &Key);
 	uint Count(void) { return mUsage.size(); }
+	void SetMaxItems(uint MaxItems) { mMaxItems = MaxItems; }
 };
 
 template<class key_type, class data_type>
@@ -85,7 +86,7 @@
 		return it->second;
 	} 
 
-	if (mUsage.size() == mMaxItems) {
+	while (mUsage.size() >= mMaxItems) {
 		item_iterator it = mItems.find(*mUsage.begin());
 		DeleteObject(it->first, it->second);
 		mUsage.erase(mUsage.begin());
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/common.c vdr-plugin-text2skin-1.3.1-Rev99093d5a/common.c
--- vdr-plugin-text2skin-1.3.1-20101027/common.c	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/common.c	2011-10-03 15:23:21.000000000 +0000
@@ -197,8 +197,14 @@
 				if (!desc.str().empty())
 					desc << "\n";
 				desc << tr("AUXILIARY INFOS") << ":\n";
+				std::string searchTimer = StripXmlTag(auxEpgsearch, "searchtimer");
+				if (searchTimer.empty())
+					// epgsearch < 0.9.21?
+					searchTimer = StripXmlTag(auxEpgsearch, "Search timer");
+				if (searchTimer.empty())
+					searchTimer = auxEpgsearch;
 				std::stringstream buf;
-				buf << " - " << tr("Search timer") << ": " << StripXmlTag(auxRaw, "Search timer");
+				buf << " - " << tr("Search timer") << ": " << searchTimer;
 				desc << FitToWidth(buf, MAX_CHARS) << "\n";
 			}
 		}
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/common.h vdr-plugin-text2skin-1.3.1-Rev99093d5a/common.h
--- vdr-plugin-text2skin-1.3.1-20101027/common.h	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/common.h	2011-10-03 15:23:21.000000000 +0000
@@ -13,17 +13,15 @@
 #	else
 #		define Dprintf(x...)
 #	endif
+#	define __STDC_FORMAT_MACROS
 #	define Dbench(x) uint64_t bench_##x = cTimeMs::Now()
-#	define Ddiff(t,x) fprintf(stderr, "%s took %llu ms\n", t, cTimeMs::Now() - bench_##x)
+#	define Ddiff(t,x) fprintf(stderr, "%s took %"PRIu64" ms\n", t, cTimeMs::Now() - bench_##x)
 #else
 #	define Dprintf(x...)
 #	define Dbench(x)
 #	define Ddiff(t,x)
 #endif
 
-#define DStartBench(x) uint64_t bench_##x = cTimeMs::Now()
-#define DShowBench(t,x) fprintf(stderr, "%s took %llu ms\n", t, cTimeMs::Now() - bench_##x)
-
 /* Check if a channel is a radio station. */
 #define ISRADIO(x) ((x)->Vpid()==0||(x)->Vpid()==1||(x)->Vpid()==0x1fff)
 
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/debian/changelog vdr-plugin-text2skin-1.3.1-Rev99093d5a/debian/changelog
--- vdr-plugin-text2skin-1.3.1-20101027/debian/changelog	2011-09-02 14:26:33.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/debian/changelog	2011-10-03 15:27:08.000000000 +0000
@@ -1,3 +1,9 @@
+vdr-plugin-text2skin (1.3.1-Rev99093d5a-1easyVDR1.5) oneiric; urgency=high
+
+  * debugged cache error in oneiric
+
+ -- easyVDR-Developer <easyvdr-dev@easy-vdr.de>  Mon, 03 Oct 2011 17:25:19 +0200
+
 vdr-plugin-text2skin (1.3.1-20101027-1easyVDR1.4) oneiric; urgency=high
 
   * changed build-depends
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/.gitignore vdr-plugin-text2skin-1.3.1-Rev99093d5a/.gitignore
--- vdr-plugin-text2skin-1.3.1-20101027/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/.gitignore	2011-10-03 15:23:21.000000000 +0000
@@ -0,0 +1,9 @@
+.dependencies
+*.o
+*.so*
+*.mo
+*.gmo
+*.pot
+*.tgz
+*~
+debian
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/HISTORY vdr-plugin-text2skin-1.3.1-Rev99093d5a/HISTORY
--- vdr-plugin-text2skin-1.3.1-20101027/HISTORY	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/HISTORY	2011-10-03 15:23:21.000000000 +0000
@@ -6,6 +6,10 @@
 - Fix build with ImageMagick >= 6.6.2 (thanks to Anssi Hannula / closes #409)
 - Documentation spelling fixes.
 - Added experimental RELAX NG schema for skin XML files.
+- Set minimum value of bitmap cache size in menu to 1.
+- Fix bitmap cache size initialization when built with gcc 4.6.
+- Update epgsearch recording search timer name parsing for epgsearch >= 0.9.21.
+- Warning and code cleanups.
 
 2010-06-21: Version 1.3.1
 
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/Makefile vdr-plugin-text2skin-1.3.1-Rev99093d5a/Makefile
--- vdr-plugin-text2skin-1.3.1-20101027/Makefile	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/Makefile	2011-10-03 15:23:21.000000000 +0000
@@ -141,13 +141,13 @@
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 ifndef DEBUG
 	$(STRIP) $(LIBDIR)/$@.$(APIVERSION)
 endif
 
-dist: clean
+dist: $(addprefix $(PODIR)/,$(I18Npo)) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/menu.c vdr-plugin-text2skin-1.3.1-Rev99093d5a/menu.c
--- vdr-plugin-text2skin-1.3.1-20101027/menu.c	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/menu.c	2011-10-03 15:23:21.000000000 +0000
@@ -21,7 +21,7 @@
 		Add(new cMenuEditBoolItem(tr("   Extract known tags"), &mData.StripAux));
 	Add(new cMenuEditBoolItem(tr("Use 'epgsearch' to check timer-conflicts"), &mData.CheckTimerConflict));
 	Add(new cOsdItem(tr("Flush image cache"), osUser1));
-	Add(new cMenuEditIntItem(tr("Max. image cache size"), &mData.MaxCacheFill));
+	Add(new cMenuEditIntItem(tr("Max. image cache size"), &mData.MaxCacheFill, 1));
 
 	SetCurrent(Get(current));
 	Display();
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/po/de_DE.po vdr-plugin-text2skin-1.3.1-Rev99093d5a/po/de_DE.po
--- vdr-plugin-text2skin-1.3.1-20101027/po/de_DE.po	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/po/de_DE.po	2011-10-03 15:23:21.000000000 +0000
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: vdr-text2skin 1.3\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/show/plg-text2skin\n"
-"POT-Creation-Date: 2010-10-31 03:59+0100\n"
+"POT-Creation-Date: 2010-08-29 17:12+0300\n"
 "PO-Revision-Date: 2009-06-07 12:12+0200\n"
 "Last-Translator: Andreas Brugger <brougs78@gmx.net>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 msgid "RERUNS OF THIS SHOW"
 msgstr "WIEDERHOLUNGEN DIESER SENDUNG"
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/po/fi_FI.po vdr-plugin-text2skin-1.3.1-Rev99093d5a/po/fi_FI.po
--- vdr-plugin-text2skin-1.3.1-20101027/po/fi_FI.po	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/po/fi_FI.po	2011-10-03 15:23:21.000000000 +0000
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: vdr-text2skin 1.3\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/show/plg-text2skin\n"
-"POT-Creation-Date: 2010-10-31 03:59+0100\n"
-"PO-Revision-Date: 2009-07-11 09:28+0200\n"
+"POT-Creation-Date: 2010-08-29 17:12+0300\n"
+"PO-Revision-Date: 2011-05-28 15:38+0200\n"
 "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 
 msgid "RERUNS OF THIS SHOW"
 msgstr "UUSINNAT"
@@ -49,7 +49,7 @@
 
 #. TRANSLATORS: note the leading blanks!
 msgid "   Extract known tags"
-msgstr ""
+msgstr "   Tulkitse tunnetut tagit"
 
 msgid "Use 'epgsearch' to check timer-conflicts"
 msgstr "Tarkista ajastinongelmat epgsearch:lla"
diff -Nru vdr-plugin-text2skin-1.3.1-20101027/po/it_IT.po vdr-plugin-text2skin-1.3.1-Rev99093d5a/po/it_IT.po
--- vdr-plugin-text2skin-1.3.1-20101027/po/it_IT.po	2011-08-29 12:45:14.000000000 +0000
+++ vdr-plugin-text2skin-1.3.1-Rev99093d5a/po/it_IT.po	2011-10-03 15:23:21.000000000 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: vdr-text2skin 1.2\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/show/plg-text2skin\n"
-"POT-Creation-Date: 2010-10-31 03:59+0100\n"
+"POT-Creation-Date: 2010-08-29 17:12+0300\n"
 "PO-Revision-Date: 2009-07-15 23:45+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "X-Poedit-Language: Italian\n"
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"