3 files changed, 2 insertions, 40 deletions
diff --git a/HISTORY b/HISTORY
index c3a7bd6d..49201ddc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4091,7 +4091,7 @@ Video Disk Recorder Revision History
 - Removed an obsolete "Summary" text from i18n.c and preceded all key definition
   texts with "Key$" to avoid duplicates (reported by Lucian Muresan).
 - Preceded all button texts with "Button$".
-- Removed obsolete "Eject" and "Language" texts.
+- Removed obsolete "Eject", "Language" and "scanning recordings..." texts.
 - Added missing #include "thread.h" to dvbspu.c (reported by Gavin Hamill).
 - Disabled the use of "fadvise" in cUnbufferedFile because there have been
   several reports that it causes more problems than it solves (suggested by
diff --git a/ca.conf b/ca.conf
deleted file mode 100644
index e4bab668..00000000
--- a/ca.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Conditional Access configuration for VDR
-#
-# Format:
-#
-# number  description
-#
-# Please contact kls@cadsoft.de before assigning a new number
-# to a description, in order to keep them unique.
-
-0      Free To Air
-
-# Special values to "hard code" a channel to a specific DVB card:
-
-1      DVB 1
-2      DVB 2
-3      DVB 3
-4      DVB 4
diff --git a/i18n.c b/i18n.c
index 0936ee73..e28bbf0e 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.229 2006/01/07 15:44:52 kls Exp $
+ * $Id: i18n.c 1.230 2006/01/08 11:56:31 kls Exp $
  *
  * Translations provided by:
  *
@@ -5389,27 +5389,6 @@ const tI18nPhrase Phrases[] = {
     "Redigeerimine ebaõnnestus",
     "Redigeringsproces fejlede!",
   },
-  { "scanning recordings...",//XXX obsolete
-    "Aufzeichnungen werden durchsucht...",
-    "iskanje posnetkov...",
-    "scansione registrazioni...",
-    "Doorzoeken opnames...",
-    "A pesquisar gravações...",
-    "Recherche des enregistrements...",
-    "Går igjennom opptakene...",
-    "haetaan tallenteita...",
-    "Skan nagran...",
-    "buscando grabaciones...",
-    "ÅîÝôáóç åããñáöþí...",
-    "Söker igenom inspelningarna...",
-    "Caut înregistrãri...",
-    "Felvett adások böngészése...",
-    "cercant gravacions...",
-    "ÁÚÐÝØàÞÒÐÝØÕ ×ÐßØáÕÙ...",
-    "pretra¾ivanje snimljenog...",
-    "salvestuste skaneerimine...",
-    "skanner optagelser...",
-  },
   { "Recording started",
     "Aufzeichnung gestartet",
     "",//TODO