diff options
| -rw-r--r-- | i18n-generated.h | 219 | ||||
| -rw-r--r-- | pages/timerconflicts.ecpp | 18 | ||||
| -rw-r--r-- | po/ca_ES.po | 12 | ||||
| -rw-r--r-- | po/cs_CZ.po | 12 | ||||
| -rw-r--r-- | po/da_DK.po | 12 | ||||
| -rw-r--r-- | po/de_DE.po | 12 | ||||
| -rw-r--r-- | po/el_GR.po | 12 | ||||
| -rw-r--r-- | po/es_ES.po | 12 | ||||
| -rw-r--r-- | po/et_EE.po | 12 | ||||
| -rw-r--r-- | po/fi_FI.po | 14 | ||||
| -rw-r--r-- | po/fr_FR.po | 14 | ||||
| -rw-r--r-- | po/hr_HR.po | 12 | ||||
| -rw-r--r-- | po/hu_HU.po | 12 | ||||
| -rw-r--r-- | po/it_IT.po | 14 | ||||
| -rw-r--r-- | po/nl_NL.po | 13 | ||||
| -rw-r--r-- | po/nn_NO.po | 12 | ||||
| -rw-r--r-- | po/pl_PL.po | 12 | ||||
| -rw-r--r-- | po/pt_PT.po | 12 | ||||
| -rw-r--r-- | po/ro_RO.po | 12 | ||||
| -rw-r--r-- | po/ru_RU.po | 12 | ||||
| -rw-r--r-- | po/sl_SI.po | 12 | ||||
| -rw-r--r-- | po/sv_SE.po | 12 | ||||
| -rw-r--r-- | po/tr_TR.po | 12 |
23 files changed, 402 insertions, 94 deletions
diff --git a/i18n-generated.h b/i18n-generated.h index 70531c5..0fde1eb 100644 --- a/i18n-generated.h +++ b/i18n-generated.h @@ -1,7 +1,7 @@ /* - WARNING: automaticaly generated content. Changes will get lost! + WARNING: automatically generated content. Changes will get lost! - If this file is 'i18n-generated.h' then it *realy* is automaticaly + If this file is 'i18n-generated.h' then it *really* is automatically generated. If this file is 'i18n-template.h' then it is the base for the autogeneration of the other file. @@ -7816,15 +7816,50 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "No timer defined", - "Keine Timer vorhanden", + { "Timer conflicts", + "Timer-Konflikte", "", - "Nessun timer definito", + "Timer attivo.", + "Serie's opnemen", "", + "Programmation est active.", "", - "Aucune programmation définie", + "Aktiivinen ajastin", "", - "Ajastinta ei ole määritelty", + "", + "", + "", + "", + "", + "", +#if VDRVERSNUM >= 10302 + "", +#endif +#if VDRVERSNUM >= 10307 + "", +#endif +#if VDRVERSNUM >= 10313 + "", +#endif +#if VDRVERSNUM >= 10316 + "", +#endif +#if VDRVERSNUM >= 10342 + "", +#endif +#if VDRVERSNUM >= 10502 + "", +#endif + }, + { "No timer conflicts", + "Keine Timer-Konflikte", + "", + "Timer attivo.", + "Serie's opnemen", + "", + "Programmation est active.", + "", + "Aktiivinen ajastin", "", "", "", @@ -7851,15 +7886,120 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "Timer is recording.", - "Timer zeichnet auf.", + { "Start", + "Start", "", - "Timer in registrazione.", + "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.", + "", + "Timer attivo.", "Serie's opnemen", "", - "Enregistrement de série", + "Programmation est active.", "", - "Ajastinta tallennetaan", + "Aktiivinen ajastin", "", "", "", @@ -7991,15 +8131,15 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "VLC: live video stream", - "VLC: Video Stream", + { "No timer defined", + "Keine Timer vorhanden", "", - "VLC: trasmissione video Live", + "Nessun timer definito", "", "", - "VLC: live vidéo stream", + "Aucune programmation définie", "", - "VLC: live-lähetyksen suoratoisto", + "Ajastinta ei ole määritelty", "", "", "", @@ -8026,15 +8166,50 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "Stop", - "Stopp", + { "Timer is recording.", + "Timer zeichnet auf.", "", - "Ferma", + "Timer in registrazione.", + "Serie's opnemen", "", + "Enregistrement de série", "", - "Stop", + "Ajastinta tallennetaan", "", - "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 + }, + { "VLC: live video stream", + "VLC: Video Stream", + "", + "VLC: trasmissione video Live", + "", + "", + "VLC: live vidéo stream", + "", + "VLC: live-lähetyksen suoratoisto", "", "", "", diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp index 07d6ac0..1aea9da 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"><$ 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><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 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> @@ -69,12 +69,12 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%cpp> for (std::list<int>::const_iterator timerIndex = confltimer->concurrentTimerIndices.begin(); timerIndex != confltimer->concurrentTimerIndices.end(); ++timerIndex) { cTimer* timer = Timers.Get(*timerIndex-1); - if (!timer) continue; + if (!timer) continue; std::list< int >::const_iterator nexttimerIndex = timerIndex; ++nexttimerIndex; bool bottom = (nexttimerIndex == confltimer->concurrentTimerIndices.end()); - + std::string timerStateImg = "transparent.png"; std::string timerStateHint; if (timer->Index() == confltimer->timerIndex-1) { @@ -98,7 +98,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); title = epgEvent->Title(); } </%cpp> - <tr> + <tr> <td class="leftcol <? bottom ? "bottomrow" ?>"><img src="<$ LiveSetup().GetThemedLink("img", timerStateImg) $>" alt="" <%cpp> if (!timerStateHint.empty()) { </%cpp><& tooltip.hint text=(timerStateHint) &><%cpp> } </%cpp>></img></td> <td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><a href="schedule.html?channel=<$ timer->Channel()->Number()$>"><$ timer->Channel()->Name() $></a></div></td> <td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $></div></td> @@ -113,13 +113,13 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <td class="action <? bottom ? "bottomrow" ?>"><a href="edit_timer.html?timerid=<$ timers.GetTimerId(*timer) $>"><img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td> <td class="action rightcol <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=delete"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td> </tr> -% } +% } </%cpp> <tr class="spacer"> <td colspan="9"/> </tr> <%cpp> - } + } } </%cpp> </table> diff --git a/po/ca_ES.po b/po/ca_ES.po index 712efd2..2222e37 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -695,6 +695,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -716,9 +725,6 @@ 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 0390e14..35c336d 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 0a0394e..2f28db8 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 88d6f0b..648b66a 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -695,6 +695,15 @@ 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." @@ -716,9 +725,6 @@ msgstr "Timer zeichnet auf." msgid "VLC: live video stream" msgstr "VLC: Video Stream" -msgid "Stop" -msgstr "Stopp" - msgid "Play" msgstr "Wiedergabe" diff --git a/po/el_GR.po b/po/el_GR.po index 5c2a2f8..1d0c32f 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 cc97418..938038a 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 8ec561c..fc45c05 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 bb7f5dd..f766a99 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -698,6 +698,17 @@ 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" @@ -719,9 +730,6 @@ msgstr "Ajastinta tallennetaan" msgid "VLC: live video stream" msgstr "VLC: live-lähetyksen suoratoisto" -msgid "Stop" -msgstr "Pysäytä" - msgid "Play" msgstr "Toista" diff --git a/po/fr_FR.po b/po/fr_FR.po index 26f9c8a..eed2035 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -699,6 +699,17 @@ 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." @@ -720,9 +731,6 @@ msgstr "Enregistrement de série" msgid "VLC: live video stream" msgstr "VLC: live vidéo stream" -msgid "Stop" -msgstr "Stop" - msgid "Play" msgstr "Lecture" diff --git a/po/hr_HR.po b/po/hr_HR.po index f882f26..44c46f2 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -694,6 +694,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -715,9 +724,6 @@ 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 eae5c10..e19b6cd 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -694,6 +694,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -715,9 +724,6 @@ 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 414ed95..6e2ff43 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -700,6 +700,17 @@ 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." @@ -721,9 +732,6 @@ msgstr "Timer in registrazione." msgid "VLC: live video stream" msgstr "VLC: trasmissione video Live" -msgid "Stop" -msgstr "Ferma" - msgid "Play" msgstr "Riproduci" diff --git a/po/nl_NL.po b/po/nl_NL.po index 52fee4f..daa5bd9 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -700,6 +700,16 @@ 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" @@ -722,9 +732,6 @@ msgstr "Serie's opnemen" msgid "VLC: live video stream" msgstr "" -msgid "Stop" -msgstr "" - msgid "Play" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index 274e7c5..148f492 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -694,6 +694,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -715,9 +724,6 @@ 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 dfd1360..f059682 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 3d5c725..d76bde8 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 0887d2e..0b263b5 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -694,6 +694,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -715,9 +724,6 @@ 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 e13e12b..3a71cb5 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -693,6 +693,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -714,9 +723,6 @@ 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 eaa37f5..1a70a75 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -694,6 +694,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -715,9 +724,6 @@ 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 3cb7520..9a0936d 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -694,6 +694,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -715,9 +724,6 @@ 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 df3cd0d..0e7ed08 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -694,6 +694,15 @@ msgstr "" msgid "No timer conflicts" msgstr "" +msgid "Start" +msgstr "" + +msgid "Stop" +msgstr "" + +msgid "File" +msgstr "" + msgid "Timer has a conflict." msgstr "" @@ -715,9 +724,6 @@ msgstr "" msgid "VLC: live video stream" msgstr "" -msgid "Stop" -msgstr "" - msgid "Play" msgstr "" |