21 files changed, 235 insertions, 88 deletions

diff --git a/po/ca_ES.po b/po/ca_ES.po
index 3fb8738..656f8f6 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -416,6 +416,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -686,10 +689,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -701,6 +701,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index d241bce..970af1b 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 1c6b18c..f8198a5 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 10373d3..8023dda 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -416,6 +416,9 @@ msgstr "Suchen"
 msgid "Searchtimers"
 msgstr "Suchtimer"
 
+msgid "Timer conflicts"
+msgstr "Timer-Konflikte"
+
 msgid "Recordings"
 msgstr "Aufnahmen"
 
@@ -686,11 +689,8 @@ msgstr "Startseite"
 msgid "Theme"
 msgstr "Thema"
 
-msgid "No timer defined"
-msgstr "Keine Timer vorhanden"
-
-msgid "Timer is recording."
-msgstr "Timer zeichnet auf."
+msgid "Timer has a conflict."
+msgstr "Timer hat einen Konflikt."
 
 msgid "Timer is active."
 msgstr "Timer ist aktiv."
@@ -701,6 +701,12 @@ msgstr "Timer aktiv/inaktiv schalten"
 msgid "Delete timer"
 msgstr "Timer löschen"
 
+msgid "No timer defined"
+msgstr "Keine Timer vorhanden"
+
+msgid "Timer is recording."
+msgstr "Timer zeichnet auf."
+
 msgid "VLC: live video stream"
 msgstr "VLC: Video Stream"
 
@@ -760,3 +766,4 @@ msgstr "Ausführliche Ansicht"
 
 msgid "List view"
 msgstr "Listenansicht"
+
diff --git a/po/el_GR.po b/po/el_GR.po
index e554e28..52fdc0e 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 89d6e51..eb97533 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index d228a6c..f722a6e 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 4368f34..091b1ad 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -414,6 +414,10 @@ msgstr "Etsi"
 msgid "Searchtimers"
 msgstr "Hakuajastimet"
 
+#, fuzzy
+msgid "Timer conflicts"
+msgstr "Aktiivinen ajastin"
+
 msgid "Recordings"
 msgstr "Tallenteet"
 
@@ -686,11 +690,9 @@ msgstr "Aloitussivu"
 msgid "Theme"
 msgstr "Ulkoasu"
 
-msgid "No timer defined"
-msgstr "Ajastinta ei ole määritelty"
-
-msgid "Timer is recording."
-msgstr "Ajastinta tallennetaan"
+#, fuzzy
+msgid "Timer has a conflict."
+msgstr "Aktiivinen ajastin"
 
 msgid "Timer is active."
 msgstr "Aktiivinen ajastin"
@@ -701,6 +703,12 @@ msgstr "Aseta ajastin päälle/pois"
 msgid "Delete timer"
 msgstr "Poista ajastin"
 
+msgid "No timer defined"
+msgstr "Ajastinta ei ole määritelty"
+
+msgid "Timer is recording."
+msgstr "Ajastinta tallennetaan"
+
 msgid "VLC: live video stream"
 msgstr "VLC: live-lähetyksen suoratoisto"
 
@@ -761,5 +769,9 @@ msgstr "Ruudukkonäkymä"
 msgid "List view"
 msgstr "Listanäkymä"
 
+#, fuzzy
+#~ msgid "%A, %B %d %Y"
+#~ msgstr "%A, %d.%m.%Y"
+
 #~ msgid "channels"
 #~ msgstr "kanavat"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 73b2992..80520cc 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -417,6 +417,10 @@ msgstr "Recherche"
 msgid "Searchtimers"
 msgstr "Recherche de programmation"
 
+#, fuzzy
+msgid "Timer conflicts"
+msgstr "Programmation est active."
+
 msgid "Recordings"
 msgstr "Enregistrements"
 
@@ -687,11 +691,9 @@ msgstr "Page de départ"
 msgid "Theme"
 msgstr "Thème"
 
-msgid "No timer defined"
-msgstr "Aucune programmation définie"
-
-msgid "Timer is recording."
-msgstr "Enregistrement de série"
+#, fuzzy
+msgid "Timer has a conflict."
+msgstr "Programmation est active."
 
 msgid "Timer is active."
 msgstr "Programmation est active."
@@ -702,6 +704,12 @@ msgstr "Programmation basculer actif/inactif"
 msgid "Delete timer"
 msgstr "Effacer la programmation"
 
+msgid "No timer defined"
+msgstr "Aucune programmation définie"
+
+msgid "Timer is recording."
+msgstr "Enregistrement de série"
+
 msgid "VLC: live video stream"
 msgstr "VLC: live vidéo stream"
 
@@ -761,3 +769,7 @@ msgstr "Vue détailée"
 
 msgid "List view"
 msgstr "Vue en liste"
+
+#, fuzzy
+#~ msgid "%A, %B %d %Y"
+#~ msgstr "%A, %d.%m.%Y"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 952adab..b872c5a 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -415,6 +415,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -685,10 +688,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -700,6 +700,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 4395b9a..23c320c 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -415,6 +415,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -685,10 +688,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -700,6 +700,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index a1f6328..e621ff4 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -416,6 +416,10 @@ msgstr "Cerca"
 msgid "Searchtimers"
 msgstr "Cerca timer"
 
+#, fuzzy
+msgid "Timer conflicts"
+msgstr "Timer attivo."
+
 msgid "Recordings"
 msgstr "Registrazioni"
 
@@ -688,11 +692,9 @@ msgstr "Pagina iniziale"
 msgid "Theme"
 msgstr "Tema"
 
-msgid "No timer defined"
-msgstr "Nessun timer definito"
-
-msgid "Timer is recording."
-msgstr "Timer in registrazione."
+#, fuzzy
+msgid "Timer has a conflict."
+msgstr "Timer attivo."
 
 msgid "Timer is active."
 msgstr "Timer attivo."
@@ -703,6 +705,12 @@ msgstr "Attiva/disattiva timer"
 msgid "Delete timer"
 msgstr "Cancella timer"
 
+msgid "No timer defined"
+msgstr "Nessun timer definito"
+
+msgid "Timer is recording."
+msgstr "Timer in registrazione."
+
 msgid "VLC: live video stream"
 msgstr "VLC: trasmissione video Live"
 
@@ -762,3 +770,7 @@ msgstr "Vedi come dettagli"
 
 msgid "List view"
 msgstr "Vedi come elenco"
+
+#, fuzzy
+#~ msgid "%A, %B %d %Y"
+#~ msgstr "%A, %b %d %Y"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index f8ffd58..c2baccc 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -417,6 +417,10 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+#, fuzzy
+msgid "Timer conflicts"
+msgstr "Serie's opnemen"
+
 msgid "Recordings"
 msgstr ""
 
@@ -688,11 +692,8 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
 #, fuzzy
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr "Serie's opnemen"
 
 msgid "Timer is active."
@@ -704,6 +705,13 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+#, fuzzy
+msgid "Timer is recording."
+msgstr "Serie's opnemen"
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 399bf83..35f301e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -415,6 +415,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -685,10 +688,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -700,6 +700,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 1e65b2d..591dc8b 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 21f07c0..afea87e 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 8201ce1..93f8edc 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -415,6 +415,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -685,10 +688,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -700,6 +700,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 1936684..88c2715 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -414,6 +414,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -684,10 +687,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -699,6 +699,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1ed3282..639d6f5 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -415,6 +415,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -685,10 +688,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -700,6 +700,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 95b7e80..ce37c91 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -415,6 +415,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -685,10 +688,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -700,6 +700,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index de0c029..9435747 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -415,6 +415,9 @@ msgstr ""
 msgid "Searchtimers"
 msgstr ""
 
+msgid "Timer conflicts"
+msgstr ""
+
 msgid "Recordings"
 msgstr ""
 
@@ -685,10 +688,7 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-msgid "No timer defined"
-msgstr ""
-
-msgid "Timer is recording."
+msgid "Timer has a conflict."
 msgstr ""
 
 msgid "Timer is active."
@@ -700,6 +700,12 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "No timer defined"
+msgstr ""
+
+msgid "Timer is recording."
+msgstr ""
+
 msgid "VLC: live video stream"
 msgstr ""