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.

23 files changed, 173 insertions, 307 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",
     "",
diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp
index 1aea9da..9d1b15a 100644
--- a/pages/timerconflicts.ecpp
+++ b/pages/timerconflicts.ecpp
@@ -57,10 +57,10 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 						</tr>
 						<tr class="description">
 							<td class="leftcol"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
-							<td><div class="withmargin"><$ tr("Channel") $></div></td>
-							<td><div class="withmargin"><$ tr("Start") $></div></td>
-							<td><div class="withmargin"><$ tr("Stop") $></div></td>
-							<td><div class="withmargin"><$ tr("File") $></div></td>
+							<td><div class="withmargin"><$ trVDR("Channel") $></div></td>
+							<td><div class="withmargin"><$ trVDR("Start") $></div></td>
+							<td><div class="withmargin"><$ trVDR("Stop") $></div></td>
+							<td><div class="withmargin"><$ trVDR("File") $></div></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 2222e37..712efd2 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -695,15 +695,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -725,6 +716,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 35c336d..0390e14 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 2f28db8..0a0394e 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 648b66a..fba621d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -695,15 +695,6 @@ msgstr "Timer-Konflikte"
 msgid "No timer conflicts"
 msgstr "Keine Timer-Konflikte"
 
-msgid "Start"
-msgstr "Start"
-
-msgid "Stop"
-msgstr "Stopp"
-
-msgid "File"
-msgstr "Datei"
-
 msgid "Timer has a conflict."
 msgstr "Timer hat einen Konflikt."
 
@@ -725,6 +716,9 @@ msgstr "Timer zeichnet auf."
 msgid "VLC: live video stream"
 msgstr "VLC: Video Stream"
 
+msgid "Stop"
+msgstr "Stopp"
+
 msgid "Play"
 msgstr "Wiedergabe"
 
@@ -778,3 +772,9 @@ msgstr "Ausführliche Ansicht"
 
 msgid "List view"
 msgstr "Listenansicht"
+
+#~ msgid "Start"
+#~ msgstr "Start"
+
+#~ msgid "File"
+#~ msgstr "Datei"
diff --git a/po/el_GR.po b/po/el_GR.po
index 1d0c32f..5c2a2f8 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 938038a..cc97418 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index fc45c05..8ec561c 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f766a99..497919a 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -698,17 +698,6 @@ msgid "No timer conflicts"
 msgstr "Aktiivinen ajastin"
 
 #, fuzzy
-msgid "Start"
-msgstr "Aloitussivu"
-
-msgid "Stop"
-msgstr "Pysäytä"
-
-#, fuzzy
-msgid "File"
-msgstr "Otsikko"
-
-#, fuzzy
 msgid "Timer has a conflict."
 msgstr "Aktiivinen ajastin"
 
@@ -730,6 +719,9 @@ msgstr "Ajastinta tallennetaan"
 msgid "VLC: live video stream"
 msgstr "VLC: live-lähetyksen suoratoisto"
 
+msgid "Stop"
+msgstr "Pysäytä"
+
 msgid "Play"
 msgstr "Toista"
 
@@ -785,6 +777,14 @@ msgid "List view"
 msgstr "Listanäkymä"
 
 #, fuzzy
+#~ msgid "Start"
+#~ msgstr "Aloitussivu"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Otsikko"
+
+#, fuzzy
 #~ msgid "%A, %B %d %Y"
 #~ msgstr "%A, %d.%m.%Y"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index eed2035..e89bb20 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -699,17 +699,6 @@ msgid "No timer conflicts"
 msgstr "Programmation est active."
 
 #, fuzzy
-msgid "Start"
-msgstr "Page de départ"
-
-msgid "Stop"
-msgstr "Stop"
-
-#, fuzzy
-msgid "File"
-msgstr "Titre"
-
-#, fuzzy
 msgid "Timer has a conflict."
 msgstr "Programmation est active."
 
@@ -731,6 +720,9 @@ msgstr "Enregistrement de série"
 msgid "VLC: live video stream"
 msgstr "VLC: live vidéo stream"
 
+msgid "Stop"
+msgstr "Stop"
+
 msgid "Play"
 msgstr "Lecture"
 
@@ -786,5 +778,13 @@ msgid "List view"
 msgstr "Vue en liste"
 
 #, fuzzy
+#~ msgid "Start"
+#~ msgstr "Page de départ"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Titre"
+
+#, fuzzy
 #~ msgid "%A, %B %d %Y"
 #~ msgstr "%A, %d.%m.%Y"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 44c46f2..f882f26 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -694,15 +694,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -724,6 +715,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index e19b6cd..eae5c10 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -694,15 +694,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -724,6 +715,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 6e2ff43..fc67cc8 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -700,17 +700,6 @@ msgid "No timer conflicts"
 msgstr "Timer attivo."
 
 #, fuzzy
-msgid "Start"
-msgstr "Pagina iniziale"
-
-msgid "Stop"
-msgstr "Ferma"
-
-#, fuzzy
-msgid "File"
-msgstr "Titolo"
-
-#, fuzzy
 msgid "Timer has a conflict."
 msgstr "Timer attivo."
 
@@ -732,6 +721,9 @@ msgstr "Timer in registrazione."
 msgid "VLC: live video stream"
 msgstr "VLC: trasmissione video Live"
 
+msgid "Stop"
+msgstr "Ferma"
+
 msgid "Play"
 msgstr "Riproduci"
 
@@ -787,5 +779,13 @@ msgid "List view"
 msgstr "Vedi come elenco"
 
 #, fuzzy
+#~ msgid "Start"
+#~ msgstr "Pagina iniziale"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Titolo"
+
+#, fuzzy
 #~ msgid "%A, %B %d %Y"
 #~ msgstr "%A, %b %d %Y"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index daa5bd9..96f636a 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -700,16 +700,6 @@ msgid "No timer conflicts"
 msgstr "Serie's opnemen"
 
 #, fuzzy
-msgid "Start"
-msgstr "Start na"
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
-#, fuzzy
 msgid "Timer has a conflict."
 msgstr "Serie's opnemen"
 
@@ -732,6 +722,9 @@ msgstr "Serie's opnemen"
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
@@ -785,3 +778,7 @@ msgstr ""
 
 msgid "List view"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Start"
+#~ msgstr "Start na"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 148f492..274e7c5 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -694,15 +694,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -724,6 +715,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index f059682..dfd1360 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d76bde8..3d5c725 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 0b263b5..0887d2e 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -694,15 +694,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -724,6 +715,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3a71cb5..e13e12b 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -693,15 +693,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -723,6 +714,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1a70a75..eaa37f5 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -694,15 +694,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -724,6 +715,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 9a0936d..3cb7520 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -694,15 +694,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -724,6 +715,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 0e7ed08..df3cd0d 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -694,15 +694,6 @@ msgstr ""
 msgid "No timer conflicts"
 msgstr ""
 
-msgid "Start"
-msgstr ""
-
-msgid "Stop"
-msgstr ""
-
-msgid "File"
-msgstr ""
-
 msgid "Timer has a conflict."
 msgstr ""
 
@@ -724,6 +715,9 @@ msgstr ""
 msgid "VLC: live video stream"
 msgstr ""
 
+msgid "Stop"
+msgstr ""
+
 msgid "Play"
 msgstr ""