Added new image for timer conflict notification.

Added a Force function to TimerConflicNotifier.
Added the force notification to timer creation. First tests with this
weren't very promising. Needs some thorough testing also at timer
modification and deletion.
Regenerated language header for backwards compatibilty.

21 files changed, 42 insertions, 42 deletions

diff --git a/po/ca_ES.po b/po/ca_ES.po
index 10ed873..c8f3022 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -116,10 +116,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 4f09824..9a37b9c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/da_DK.po b/po/da_DK.po
index 2bf5baa..70b043b 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/de_DE.po b/po/de_DE.po
index afdc27a..cd49492 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -116,10 +116,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr "Die Timer Konflikt Überprüfung hat "
 
-msgid " conflict"
+msgid "conflict"
 msgstr "Timerkonflikt entdeckt"
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr "Timerkonflikte entdeckt"
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/el_GR.po b/po/el_GR.po
index 9f92782..b9ca111 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/es_ES.po b/po/es_ES.po
index 1f2f36f..2259819 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/et_EE.po b/po/et_EE.po
index 90b079b..2dde09c 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/fi_FI.po b/po/fi_FI.po
index fb8e166..de4d50c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -116,11 +116,11 @@ msgid "Timer conflict check detected "
 msgstr "Aktiivinen ajastin"
 
 #, fuzzy
-msgid " conflict"
+msgid "conflict"
 msgstr "Aktiivinen ajastin"
 
 #, fuzzy
-msgid " conflicts"
+msgid "conflicts"
 msgstr "Aktiivinen ajastin"
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/fr_FR.po b/po/fr_FR.po
index fd8765c..56136b4 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -119,11 +119,11 @@ msgid "Timer conflict check detected "
 msgstr "Programmation est active."
 
 #, fuzzy
-msgid " conflict"
+msgid "conflict"
 msgstr "Programmation est active."
 
 #, fuzzy
-msgid " conflicts"
+msgid "conflicts"
 msgstr "Programmation est active."
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 09e9e73..3d0865f 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -115,10 +115,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/hu_HU.po b/po/hu_HU.po
index a7ee422..e6aff87 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -115,10 +115,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/it_IT.po b/po/it_IT.po
index 9e158b5..4c76060 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -118,11 +118,11 @@ msgid "Timer conflict check detected "
 msgstr "Timer attivo."
 
 #, fuzzy
-msgid " conflict"
+msgid "conflict"
 msgstr "Timer attivo."
 
 #, fuzzy
-msgid " conflicts"
+msgid "conflicts"
 msgstr "Timer attivo."
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 16e8f80..dfe4952 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -119,11 +119,11 @@ msgid "Timer conflict check detected "
 msgstr "Serie's opnemen"
 
 #, fuzzy
-msgid " conflict"
+msgid "conflict"
 msgstr "Serie's opnemen"
 
 #, fuzzy
-msgid " conflicts"
+msgid "conflicts"
 msgstr "Serie's opnemen"
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 239bbb4..c9f243b 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -115,10 +115,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 0faf362..d3c7de5 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ead6e89..f154aa4 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 9ab90d0..306fd54 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -115,10 +115,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c7dc079..b42403c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -114,10 +114,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 412537d..7d90de2 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -115,10 +115,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index a9bd7c7..6728983 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -115,10 +115,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 7211c2f..abf0049 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -115,10 +115,10 @@ msgstr ""
 msgid "Timer conflict check detected "
 msgstr ""
 
-msgid " conflict"
+msgid "conflict"
 msgstr ""
 
-msgid " conflicts"
+msgid "conflicts"
 msgstr ""
 
 msgid "Couldn't aquire access to channels, please try again later."