Reverted to trVDR in timerconflicts.ecpp due to fast fix change to 'tr'

because of compilation error with older vdr versions. This has been
fixed, through proper include of i18n.h. Regenerated header file with
backward compatible translations.

1 files changed, 72 insertions, 107 deletions

diff --git a/i18n-generated.h b/i18n-generated.h
index 0fde1eb..223002d 100644
--- a/i18n-generated.h
+++ b/i18n-generated.h
@@ -1131,9 +1131,44 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
-  { "Couldn't aquire access to channels, please try again later.",
+  { "Timer conflicts detected! You should check the conflicting timers.",
+    "Timer Konflikte entdeckt! Sie sollten die entsprechenden Timer prüfen.",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
     "",
     "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
+  { "Couldn't aquire access to channels, please try again later.",
+    "Zugriff auf die Kanäle wurde verweigert. Bitte später versuchen.",
+    "",
     "Impossibile avere accesso ai canali, per favore riprova più tardi.",
     "",
     "",
@@ -1167,7 +1202,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Couldn't find searchtimer. Maybe you mistyped your request?",
-    "",
+    "Keinen Suchtimer gefunden. Möglicherweise ein Tippfehler in der Anfrage?",
     "",
     "Impossibile trovare timer di ricerca. Hai digitato correttamente la richiesta?",
     "",
@@ -7886,111 +7921,6 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
-  { "Start",
-    "Start",
-    "",
-    "Pagina iniziale",
-    "Start na",
-    "",
-    "Page de départ",
-    "",
-    "Aloitussivu",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10302
-    "",
-#endif
-#if VDRVERSNUM >= 10307
-    "",
-#endif
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-#if VDRVERSNUM >= 10342
-    "",
-#endif
-#if VDRVERSNUM >= 10502
-    "",
-#endif
-  },
-  { "Stop",
-    "Stopp",
-    "",
-    "Ferma",
-    "",
-    "",
-    "Stop",
-    "",
-    "Pysäytä",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10302
-    "",
-#endif
-#if VDRVERSNUM >= 10307
-    "",
-#endif
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-#if VDRVERSNUM >= 10342
-    "",
-#endif
-#if VDRVERSNUM >= 10502
-    "",
-#endif
-  },
-  { "File",
-    "Datei",
-    "",
-    "Titolo",
-    "",
-    "",
-    "Titre",
-    "",
-    "Otsikko",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10302
-    "",
-#endif
-#if VDRVERSNUM >= 10307
-    "",
-#endif
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-#if VDRVERSNUM >= 10342
-    "",
-#endif
-#if VDRVERSNUM >= 10502
-    "",
-#endif
-  },
   { "Timer has a conflict.",
     "Timer hat einen Konflikt.",
     "",
@@ -8236,6 +8166,41 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "Stop",
+    "Stopp",
+    "",
+    "Ferma",
+    "",
+    "",
+    "Stop",
+    "",
+    "Pysäytä",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "Play",
     "Wiedergabe",
     "",