2010-04-10: 3.6.7v3.6.7

- Updated: Italian translation (Submitted by Diego Pierotto).
- Fixed: creating/editing of searches using EPGsearch v0.9.24 (Bug report #567).
- Minor bugfixes and improvements.

16 files changed, 60 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 4408096..7fb260d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-04-10  tag v3_6_7
+
+2010-04-10  amair
+
+	* HISTORY, make.sh, vdradmind.pl, po/it.po:
+
+	Updated for release v3.6.7.
+
+2010-03-23  amair
+
+	* HISTORY, template/default/epgsearch_new.html:
+
+	Fixed: creating/editing of searches using EPGsearch v0.9.24 (Bug report #567).
+
+2010-03-17  amair
+
+	* make.sh:
+
+	Clear locales directory prior to creating PO files.
+
 2010-03-13  tag v3_6_6
 
 2010-03-13  amair
@@ -1977,8 +1997,7 @@
 
 2006-10-20  amair
 
-	* template/default/error.html,
-	  template/default/default/sauerei.gif:
+	* template/default/error.html:
 
 	Removed "sauerei.gif" on error page.
 
@@ -2428,8 +2447,7 @@
 
 2006-07-18  amair
 
-	* template/default/favicon.ico, template/default/index.html,
-	  template/default/default/favicon.ico:
+	* template/default/favicon.ico, template/default/index.html:
 
 	Moved favicon.ico from a template's skin folder to the template's main folder.
 
diff --git a/HISTORY b/HISTORY
index 65188a4..4931112 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,11 @@ E-Mail:     mail AT andreas DOT vdr-developer DOT org
 VDR-Portal: amair
 -----------------------------------------------------------
 
+2010-04-10: 3.6.7
+- Updated: Italian translation (Submitted by Diego Pierotto).
+- Fixed: creating/editing of searches using EPGsearch v0.9.24 (Bug report #567).
+- Minor bugfixes and improvements.
+
 2010-03-13: 3.6.6
 - Added: Support new epgsearch v0.9.25-git settings "unmute" and "min. description match".
 - Changed: Log to syslog by default (if logging is enabled) (Ville Skyttä).
diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo b/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index 8166b1f..0000000
--- a/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo b/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index 9480e7f..0000000
--- a/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo b/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index 2ff89a2..0000000
--- a/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo b/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index eeaa485..0000000
--- a/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo b/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index fe04efb..0000000
--- a/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo b/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index cf78d1d..0000000
--- a/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/it/LC_MESSAGES/vdradmin.mo b/locale/it/LC_MESSAGES/vdradmin.mo
index fae904b..cbe551b 100644
--- a/locale/it/LC_MESSAGES/vdradmin.mo
+++ b/locale/it/LC_MESSAGES/vdradmin.mo
diff --git a/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo b/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index b4c3c33..0000000
--- a/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo b/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index c270a86..0000000
--- a/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo b/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo
deleted file mode 100644
index 5c29f5d..0000000
--- a/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo
+++ /dev/null
diff --git a/make.sh b/make.sh
index b198b08..65ee1a5 100755
--- a/make.sh
+++ b/make.sh
@@ -36,6 +36,7 @@ function Error()
 #
 function do_po()
 {
+	[ -d locale ] && rm -rf locale/*
 	for PO in po/*.po 
 	do
 		L=$(basename $PO .po)
@@ -85,7 +86,7 @@ function do_dist()
 function do_cl()
 {
 	[ -x $CVS2CL ] || Error "Missing $CVS2CL (http://www.red-bean.com/cvs2cl/)"
-	$CVS2CL --FSF --separate-header --no-wrap --no-times --tagdates --log-opts "-d>2006-07-08"
+	$CVS2CL --FSF --separate-header --no-wrap --no-times --tagdates --follow branch_3_6 --log-opts "-d>2006-07-08"
 }
 
 # check requirements.
diff --git a/po/it.po b/po/it.po
index b4ef5c8..4f00028 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: VDRAdmin-AM-3.6.6\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
 "POT-Creation-Date: 2010-03-07 14:04+0100\n"
-"PO-Revision-Date: 2010-02-13 20:22+0100\n"
+"PO-Revision-Date: 2010-03-29 01:02+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "MIME-Version: 1.0\n"
@@ -540,11 +540,21 @@ msgstr "Aggiungi nuova ricerca"
 msgid "Edit Search"
 msgstr "Modifica ricerca"
 
-msgid "Small search pattern.\\nDo you really want to use it?"
-msgstr "Valore piccola ricerca.\\nSei sicuro di usarla?"
+msgid ""
+"Small search pattern.\\n"
+"Do you really want to use it?"
+msgstr ""
+"Valore piccola ricerca.\\n"
+"Sei sicuro di usarla?"
 
-msgid "You didn't select at least one of\\ntitle, subtitle or description.\\nDo you really want to use this search?"
-msgstr "Non hai selezionato almeno uno tra\\ntitolo, sottotitolo o descrizione.\\nSei sicuro di usare questa ricerca?"
+msgid ""
+"You didn't select at least one of\\n"
+"title, subtitle or description.\\n"
+"Do you really want to use this search?"
+msgstr ""
+"Non hai selezionato almeno uno tra\\n"
+"titolo, sottotitolo o descrizione.\\n"
+"Sei sicuro di usare questa ricerca?"
 
 msgid "Hide results"
 msgstr "Nascondi risultati"
@@ -715,7 +725,7 @@ msgid "Compare:"
 msgstr "Confronta:"
 
 msgid "Minimal match of description in %:"
-msgstr ""
+msgstr "Corrispondenza minima della descrizione in %:"
 
 msgid "VPS:"
 msgstr "VPS:"
@@ -727,13 +737,13 @@ msgid "Switch ... Minutes Before Start:"
 msgstr "Cambia ... minuti prima dell'inizio:"
 
 msgid "Unmute sound:"
-msgstr ""
+msgstr "Togli suono muto:"
 
 msgid "Settings for action \"announce and switch\""
-msgstr ""
+msgstr "Impostazioni per azione \"notifica e cambia\""
 
 msgid "Ask ... Minutes Before Start:"
-msgstr ""
+msgstr "Chiedi ... minuti prima dell'inizio:"
 
 msgid "Delete template"
 msgstr "Elimina modello"
@@ -1488,5 +1498,3 @@ msgstr "Timer"
 msgid "System default"
 msgstr "Predefinita di sistema"
 
-#~ msgid "ISO-8859-1"
-#~ msgstr "ISO-8859-1"
diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html
index b83a378..3e3870c 100644
--- a/template/default/epgsearch_new.html
+++ b/template/default/epgsearch_new.html
@@ -107,7 +107,9 @@
 				document.getElementById("set_action_timeframe").style.display = "none";
 				document.getElementById("action_record_settings").style.display = "none";
 				document.getElementById("action_switch_settings").style.display = "none";
+<?% IF features.EPGSEARCH_VERSION >= 925 %?>
 				document.getElementById("action_announce_switch_settings").style.display = "none";
+<?% END %?>
 			}
 			else
 			{
@@ -133,26 +135,34 @@
 				case "0": // Record
 					document.getElementById("action_record_settings").style.display = "block";
 					document.getElementById("action_switch_settings").style.display = "none";
+<?% IF features.EPGSEARCH_VERSION >= 925 %?>
 					document.getElementById("action_announce_switch_settings").style.display = "none";
+<?% END %?>
 					break;
 
 				case "1": // Announce by OSD
 				case "4": // Announce by mail
 					document.getElementById("action_record_settings").style.display = "none";
 					document.getElementById("action_switch_settings").style.display = "none";
+<?% IF features.EPGSEARCH_VERSION >= 925 %?>
 					document.getElementById("action_announce_switch_settings").style.display = "none";
+<?% END %?>
 					break;
 
 				case "2": // Switch only
 					document.getElementById("action_record_settings").style.display = "none";
 					document.getElementById("action_switch_settings").style.display = "block";
+<?% IF features.EPGSEARCH_VERSION >= 925 %?>
 					document.getElementById("action_announce_switch_settings").style.display = "none";
+<?% END %?>
 					break;
 
 				case "3": // Announce and switch
 					document.getElementById("action_record_settings").style.display = "none";
 					document.getElementById("action_switch_settings").style.display = "none";
+<?% IF features.EPGSEARCH_VERSION >= 925 %?>
 					document.getElementById("action_announce_switch_settings").style.display = "block";
+<?% END %?>
 					break;
 			}
 		}
diff --git a/vdradmind.pl b/vdradmind.pl
index 7f8308a..82a4728 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -26,7 +26,7 @@ require 5.004;
 
 use vars qw($PROCNAME);
 
-my $VERSION = "3.6.6";
+my $VERSION = "3.6.7";
 my $BASENAME;
 my $EXENAME;
 
@@ -1507,7 +1507,7 @@ sub SendFile {
             my $lastmod = (stat(_))[9];
             $buf  = ReadFile($FileWithPath);
             $temp = $File;
-            $temp =~ /([A-Za-z0-9]+)\.([A-Za-z0-9]+)/;
+            $temp =~ /([A-Za-z0-9]+)\.([A-Za-z0-9]+)$/;
             if (!$mimehash{$2}) { die("can't find mime-type \'$2\'\n"); }
             return (header("200", $mimehash{$2}, $buf, undef, 1, $lastmod));
         } else {