Merge branch 'master' of github.com:MythTV/mythweb

Author: Nicolas Riendeau

INSTALL

@@ -410,7 +410,7 @@ mythweb.whatever.
 4b.  For /etc/hosts: On all of your client browser machines, add
 something like the following to /etc/hosts:
 
-192.186.0.3	mythweb.local mythweb
+192.186.0.3    mythweb.local mythweb
 
 Be sure to substitute the IP address at which lighttpd is reachable, of
 course.  Also, take note that some systems are particular about the

includes/cleanup.php

@@ -29,8 +29,8 @@
 /**/
     function &fix_crlfxy(&$array) {
         foreach ($array as $key => $val) {
-			if (is_array($val))
-				fix_crlfxy($array[$key]);
+            if (is_array($val))
+                fix_crlfxy($array[$key]);
             elseif (is_string($val)) {
                 $array[$key] = str_replace("\r\n", "\n", $val);
             // Process any imagemap submissions to make sure we also get the name itself

includes/sorting.php

@@ -211,7 +211,7 @@ function by_year(&$a, &$b) {
     }
 
     function by_recpriority(&$a, &$b) {
-	// reverse sort so that high priority is listed first
+        // reverse sort so that high priority is listed first
         if ($a->recpriority == $b->recpriority) return 0;
         return ($a->recpriority > $b->recpriority) ? -1 : 1;
     }

modules/_shared/lang/Catalan.lang

@@ -212,6 +212,7 @@
 "Commands"
     Comandes
 "Commands:"
+"Commercial free"
 "Commercials Flagged"
 "commfree"
     sense anuncis
@@ -331,17 +332,13 @@
 "Erroring"
 "Escape"
 "Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
 "Exec. Producer"
     Productor exec.
 "Extended Check"
 "ffmpeg with MP3 support not detected"
 "File Size"
     mida de l'arxiu
 "film"
-"Filter"
 "Filters"
 "Find Date & Time Options"
     Opcions de recerca per data i hora
@@ -360,6 +357,7 @@
 "Finished"
 "First recording"
     Primer  enregistrament
+"First showing"
 "First showing of each episode"
 "Flag Commercials"
 "FLV Width"
@@ -409,6 +407,7 @@
     HDTV
 "Height"
 "Hide"
+"High definition"
 "Home"
 "Hosted by"
     Enmagatzemat a
@@ -418,6 +417,7 @@
     Format hora
 "hue"
     to
+"Identifiable episode"
 "Ignore generic shows"
 "Ignore scheduled shows"
 "IMDB"
@@ -583,8 +583,8 @@
 "Never Record"
     Mai enregistrar
 "New"
+"New episode"
 "New episodes only"
-"New Episodes Only"
 "New Group"
 "New Search"
 "New Titles, Premieres"
@@ -690,6 +690,7 @@
 "Possible conflicts"
 "Possible conflicts with this show"
     Possibles conflictes amb aquest programa
+"Post Processing"
 "Power"
     Avançat
 "Power Search"
@@ -707,6 +708,7 @@
 "Previous Recording"
 "Previous recordings"
     Enregistraments anteriors
+"Primetime"
 "Priority for a category"
 "Priority for a category type"
 "Priority for all matching titles"
@@ -1014,6 +1016,7 @@
 "There are no items in this Playlist!"
 "There was a problem saving your playlist"
 "TheTVDB"
+"This Episode"
 "This playlist is already loaded!"
 "This will overwrite your current, unsaved playlist. Are you sure you want to continue?"
 "Thursday"

modules/_shared/lang/Czech.lang

@@ -278,6 +278,7 @@
 "color"
 "Commands"
 "Commands:"
+"Commercial free"
 "Commercials Flagged"
     Reklamy označeny
 "commfree"
@@ -435,10 +436,6 @@
     Chybující
 "Escape"
 "Everything"
-"Exclude Generic Episodes"
-"Exclude Repeat and Generic Episodes"
-"Exclude Repeat Episodes"
-    S vyjímkou opakujících se epizod
 "Exec. Producer"
 "Extended Check"
 "ffmpeg with MP3 support not detected"
@@ -447,8 +444,6 @@
     Velikost souboru
 "film"
     film
-"Filter"
-    Filtr
 "Filters"
     Filtry
 "Find Date & Time Options"
@@ -464,6 +459,7 @@
 "Finished"
 "First recording"
     První nahrávání
+"First showing"
 "First showing of each episode"
     První zobrazení každé epizody
 "Flag Commercials"
@@ -517,6 +513,7 @@
     Výška
 "Hide"
     Skrýt
+"High definition"
 "Home"
     Domů
 "Hosted by"
@@ -526,6 +523,7 @@
     Formát hodin
 "hue"
     odstín
+"Identifiable episode"
 "Ignore generic shows"
 "Ignore scheduled shows"
 "IMDB"
@@ -688,10 +686,9 @@
     Nikdy nenahrávat
 "New"
     Nový
+"New episode"
 "New episodes only"
     Pouze nové epizody
-"New Episodes Only"
-    Pouze nové epizody
 "New Group"
     Nová skupina
 "New Search"
@@ -794,6 +791,7 @@
 "Possible conflicts"
     Možné konflikty
 "Possible conflicts with this show"
+"Post Processing"
 "Power"
 "Power Search"
     Pokročilé vyhledávání
@@ -810,6 +808,7 @@
     Předchozí nahrávka
 "Previous recordings"
     Předchozí nahrávky
+"Primetime"
 "Priority for a category"
 "Priority for a category type"
 "Priority for all matching titles"
@@ -1087,6 +1086,7 @@
 "There are no items in this Playlist!"
 "There was a problem saving your playlist"
 "TheTVDB"
+"This Episode"
 "This playlist is already loaded!"
 "This will overwrite your current, unsaved playlist. Are you sure you want to continue?"
 "Thursday"