From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 8 Aug 2018 08:40:53 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=d16f20df67892c4969a58d15f1a1d5ea21d1bd1d;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31233
---

diff --git a/client/DxPlay/Configuration/dxplay.json b/client/DxPlay/Configuration/dxplay.json
index 9c4d6417..2a4fe458 100644
--- a/client/DxPlay/Configuration/dxplay.json
+++ b/client/DxPlay/Configuration/dxplay.json
@@ -12,7 +12,7 @@
       "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",
       "userName": "MAM",
       "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",
-      "timeout": 500
+      "timeout": 1000
     }
   }
 }
diff --git a/client/DxPlay/Configuration/metadataprovider.en b/client/DxPlay/Configuration/metadataprovider.en
index 3f488e8c..da4788f7 100644
--- a/client/DxPlay/Configuration/metadataprovider.en
+++ b/client/DxPlay/Configuration/metadataprovider.en
@@ -1,27 +1,17 @@
 {
-  "define-segment": "Define segment",
-  "break-segment": "Break segment",
-  "position-as-tcin": "Current position as TC in",
-  "position-as-tcout": "Current position as TC out",
-  "delete-segment": "Delete segment",
-  "segments": "Segments",
-  "no-input": "NO INPUT",
-  "start": "START",
-  "length": "LENGTH",
-  "tc-in": "TC in",
-  "tc-out": "TC out",
-  "optional": "Optional",
-  "comment": "Comment",
-  "starting": "STARTING",
-  "exiting": "EXITING",
-  "paused": "PAUSED",
-  "playing": "PLAYING",
-  "stopped": "STOPPED",
-  "completed": "COMPLETED",
-  "pause": "Pause",
-  "play": "Play",
-  "stop": "Stop",
-  "missing-traffic-configuration": "Missing PlanAir connection configuration.",
-  "error-traffic-connect": "Could not connect to PlanAir system, using: {0}",
-  "missing-traffic-variant": "Missing metadata for {0} in PlanAir system."
+  "TITLE": "Title",
+  "FIRSTBROADCASTDATE": "First broadcast",
+  "EPISODENUMBER": "Episode nr.",
+  "EPISODEID": "Episode ID",
+  "EPISODETITLE": "Episode title",
+  "PROBLEMATIC": "Problematic",
+  "SEARCH": "Search",
+  "SERACHRESULTS": "Searh results",
+  "NEXTBROADCASTDATE": "Next broadcast",
+  "CANCEL": "Cancel",
+  "MATERIAL": "Material",
+  "PROMOTION": "Promotion",
+  "ADVERTISEMENT": "Advertisement",
+  "SEGMENTCOUNT": "Segment count",
+  "TRAFFICID": "Traffic ID"
 }
diff --git a/client/DxPlay/Controls/Player.Designer.cs b/client/DxPlay/Controls/Player.Designer.cs
deleted file mode 100644
index 290f08be..00000000
--- a/client/DxPlay/Controls/Player.Designer.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace DxPlay.Controls {
-    partial class Player {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-        }
-
-        #endregion
-    }
-}
diff --git a/client/DxPlay/Controls/Player.cs b/client/DxPlay/Controls/Player.cs
deleted file mode 100644
index 20f30a01..00000000
--- a/client/DxPlay/Controls/Player.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DxPlay.Controls {
-    public partial class Player : UserControl {
-        public Player() {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index bb3c4129..c7b2a8f3 100644
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -185,12 +185,6 @@
     <Compile Include="Controls\BindableToolStripMenuItem .cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Controls\Player.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\Player.Designer.cs">
-      <DependentUpon>Player.cs</DependentUpon>
-    </Compile>
     <Compile Include="Controls\PlayerControls.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -217,19 +211,14 @@
     <Compile Include="NativeMethods.cs" />
     <Compile Include="PlayerGraph.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <Compile Include="SafeHandles.cs" />
     <Compile Include="SMTPETimeCode\Enums.cs" />
     <Compile Include="SMTPETimeCode\Extensions.cs" />
     <Compile Include="SMTPETimeCode\TimeCode.cs" />
-    <Compile Include="StringResource.Designer.cs">
+    <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>StringResource.resx</DependentUpon>
+      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="URCOMLoader.cs" />
     <Compile Include="VideoTrackBar.cs">
@@ -258,15 +247,12 @@
     <None Include="Resources\ic_stop_black_24dp_2x.png" />
     <None Include="Resources\ic_play_arrow_black_24dp_2x.png" />
     <None Include="Resources\ic_pause_black_24dp_2x.png" />
-    <None Include="Resources\ic_stop_black_24dp_1x.png" />
-    <None Include="Resources\ic_play_arrow_black_24dp_1x.png" />
-    <None Include="Resources\ic_pause_black_24dp_1x.png" />
     <EmbeddedResource Include="Controls\PlayerControls.resx">
       <DependentUpon>PlayerControls.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="StringResource.resx">
+    <EmbeddedResource Include="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>StringResource.Designer.cs</LastGenOutput>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="nlog.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -274,14 +260,6 @@
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Resources\lgs.jpg" />
-    <None Include="Resources\Play.png" />
-    <None Include="Resources\Stop.png" />
-    <None Include="Resources\Pause.png" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <None Include="app.config" />
     <None Include="MediaInfo.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx
index 8c2e6ddd..b5dcd9ba 100644
--- a/client/DxPlay/PlayerForm.resx
+++ b/client/DxPlay/PlayerForm.resx
@@ -176,7 +176,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo
-        CAAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAWgBAAFoAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/client/DxPlay/Properties/Resources.Designer.cs b/client/DxPlay/Properties/Resources.Designer.cs
deleted file mode 100644
index 6321529e..00000000
--- a/client/DxPlay/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace DxPlay.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap ic_pause_black_24dp_2x {
-            get {
-                object obj = ResourceManager.GetObject("ic_pause_black_24dp_2x", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap ic_play_arrow_black_24dp_2x {
-            get {
-                object obj = ResourceManager.GetObject("ic_play_arrow_black_24dp_2x", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap ic_stop_black_24dp_2x {
-            get {
-                object obj = ResourceManager.GetObject("ic_stop_black_24dp_2x", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap lgs {
-            get {
-                object obj = ResourceManager.GetObject("lgs", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap Pause {
-            get {
-                object obj = ResourceManager.GetObject("Pause", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap Play {
-            get {
-                object obj = ResourceManager.GetObject("Play", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap Stop {
-            get {
-                object obj = ResourceManager.GetObject("Stop", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}
diff --git a/client/DxPlay/Properties/Resources.resx b/client/DxPlay/Properties/Resources.resx
deleted file mode 100644
index 8ecd0b9f..00000000
--- a/client/DxPlay/Properties/Resources.resx
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="lgs" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\lgs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ic_pause_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ic_pause_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ic_play_arrow_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ic_play_arrow_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ic_stop_black_24dp_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ic_stop_black_24dp_2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/client/DxPlay/StringResource.Designer.cs b/client/DxPlay/Resources.Designer.cs
similarity index 95%
rename from client/DxPlay/StringResource.Designer.cs
rename to client/DxPlay/Resources.Designer.cs
index 306c8420..a9138d06 100644
--- a/client/DxPlay/StringResource.Designer.cs
+++ b/client/DxPlay/Resources.Designer.cs
@@ -22,14 +22,14 @@ namespace DxPlay {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class StringResource {
+    internal class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
         private static global::System.Globalization.CultureInfo resourceCulture;
         
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal StringResource() {
+        internal Resources() {
         }
         
         /// <summary>
@@ -39,7 +39,7 @@ namespace DxPlay {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.StringResource", typeof(StringResource).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DxPlay.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/client/DxPlay/StringResource.resx b/client/DxPlay/Resources.resx
similarity index 100%
rename from client/DxPlay/StringResource.resx
rename to client/DxPlay/Resources.resx
diff --git a/client/DxPlay/Resources/Pause.png b/client/DxPlay/Resources/Pause.png
deleted file mode 100644
index 983cab7a..00000000
Binary files a/client/DxPlay/Resources/Pause.png and /dev/null differ
diff --git a/client/DxPlay/Resources/Play.png b/client/DxPlay/Resources/Play.png
deleted file mode 100644
index eb023d1d..00000000
Binary files a/client/DxPlay/Resources/Play.png and /dev/null differ
diff --git a/client/DxPlay/Resources/Stop.png b/client/DxPlay/Resources/Stop.png
deleted file mode 100644
index 8490e75c..00000000
Binary files a/client/DxPlay/Resources/Stop.png and /dev/null differ
diff --git a/client/DxPlay/Resources/ic_pause_black_24dp_1x.png b/client/DxPlay/Resources/ic_pause_black_24dp_1x.png
deleted file mode 100644
index 6145664b..00000000
Binary files a/client/DxPlay/Resources/ic_pause_black_24dp_1x.png and /dev/null differ
diff --git a/client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png b/client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png
deleted file mode 100644
index d78c57ba..00000000
Binary files a/client/DxPlay/Resources/ic_play_arrow_black_24dp_1x.png and /dev/null differ
diff --git a/client/DxPlay/Resources/ic_stop_black_24dp_1x.png b/client/DxPlay/Resources/ic_stop_black_24dp_1x.png
deleted file mode 100644
index 0588f0b4..00000000
Binary files a/client/DxPlay/Resources/ic_stop_black_24dp_1x.png and /dev/null differ
diff --git a/client/PlanAIRClient/Resources.Designer.cs b/client/PlanAIRClient/Resources.Designer.cs
index f258c83a..7c2ceb7a 100644
--- a/client/PlanAIRClient/Resources.Designer.cs
+++ b/client/PlanAIRClient/Resources.Designer.cs
@@ -61,56 +61,56 @@ namespace TrafficClient {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cím.
+        ///   Looks up a localized string similar to Reklám.
         /// </summary>
-        internal static string CIM {
+        internal static string ADVERTISEMENT {
             get {
-                return ResourceManager.GetString("CIM", resourceCulture);
+                return ResourceManager.GetString("ADVERTISEMENT", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Első adás.
+        ///   Looks up a localized string similar to Mégse.
         /// </summary>
-        internal static string ELSO_ADASNAP {
+        internal static string CANCEL {
             get {
-                return ResourceManager.GetString("ELSO_ADASNAP", resourceCulture);
+                return ResourceManager.GetString("CANCEL", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Epizódszám.
+        ///   Looks up a localized string similar to Epizód azonosító.
         /// </summary>
-        internal static string EPIZOD {
+        internal static string EPISODEID {
             get {
-                return ResourceManager.GetString("EPIZOD", resourceCulture);
+                return ResourceManager.GetString("EPISODEID", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Epizód azonosító.
+        ///   Looks up a localized string similar to Epizódszám.
         /// </summary>
-        internal static string EPIZOD_AZONOSITO {
+        internal static string EPISODENUMBER {
             get {
-                return ResourceManager.GetString("EPIZOD_AZONOSITO", resourceCulture);
+                return ResourceManager.GetString("EPISODENUMBER", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Epizodcím.
         /// </summary>
-        internal static string EPIZOD_CIM {
+        internal static string EPISODETITLE {
             get {
-                return ResourceManager.GetString("EPIZOD_CIM", resourceCulture);
+                return ResourceManager.GetString("EPISODETITLE", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hiányos.
+        ///   Looks up a localized string similar to Első adás.
         /// </summary>
-        internal static string HIANYOS {
+        internal static string FIRSTBROADCASTDATE {
             get {
-                return ResourceManager.GetString("HIANYOS", resourceCulture);
+                return ResourceManager.GetString("FIRSTBROADCASTDATE", resourceCulture);
             }
         }
         
@@ -125,83 +125,83 @@ namespace TrafficClient {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keresés.
+        ///   Looks up a localized string similar to Műsor.
         /// </summary>
-        internal static string KERESES {
+        internal static string MATERIAL {
             get {
-                return ResourceManager.GetString("KERESES", resourceCulture);
+                return ResourceManager.GetString("MATERIAL", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keresés eredménye.
+        ///   Looks up a localized string similar to Következő adás.
         /// </summary>
-        internal static string KERESES_EREDMENYE {
+        internal static string NEXTBROADCASTDATE {
             get {
-                return ResourceManager.GetString("KERESES_EREDMENYE", resourceCulture);
+                return ResourceManager.GetString("NEXTBROADCASTDATE", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Következő adás.
+        ///   Looks up a localized string similar to Hiányos.
         /// </summary>
-        internal static string KOVETKEZO_ADASNAP {
+        internal static string PROBLEMATIC {
             get {
-                return ResourceManager.GetString("KOVETKEZO_ADASNAP", resourceCulture);
+                return ResourceManager.GetString("PROBLEMATIC", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Mégse.
+        ///   Looks up a localized string similar to Promó.
         /// </summary>
-        internal static string MEGSE {
+        internal static string PROMOTION {
             get {
-                return ResourceManager.GetString("MEGSE", resourceCulture);
+                return ResourceManager.GetString("PROMOTION", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Műsor.
+        ///   Looks up a localized string similar to Keresés.
         /// </summary>
-        internal static string MUSOR {
+        internal static string SEARCH {
             get {
-                return ResourceManager.GetString("MUSOR", resourceCulture);
+                return ResourceManager.GetString("SEARCH", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Promó.
+        ///   Looks up a localized string similar to Szegmensek.
         /// </summary>
-        internal static string PROMO {
+        internal static string SEGMENTCOUNT {
             get {
-                return ResourceManager.GetString("PROMO", resourceCulture);
+                return ResourceManager.GetString("SEGMENTCOUNT", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reklám.
+        ///   Looks up a localized string similar to Keresés eredménye.
         /// </summary>
-        internal static string REKLAM {
+        internal static string SERACHRESULTS {
             get {
-                return ResourceManager.GetString("REKLAM", resourceCulture);
+                return ResourceManager.GetString("SERACHRESULTS", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Szegmensek.
+        ///   Looks up a localized string similar to Cím.
         /// </summary>
-        internal static string SZEGMENS_SZAM {
+        internal static string TITLE {
             get {
-                return ResourceManager.GetString("SZEGMENS_SZAM", resourceCulture);
+                return ResourceManager.GetString("TITLE", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Traffic ID.
         /// </summary>
-        internal static string TRAFFIC_ID {
+        internal static string TRAFFICID {
             get {
-                return ResourceManager.GetString("TRAFFIC_ID", resourceCulture);
+                return ResourceManager.GetString("TRAFFICID", resourceCulture);
             }
         }
     }
diff --git a/client/PlanAIRClient/Resources.resx b/client/PlanAIRClient/Resources.resx
index 2b73b199..534f50ca 100644
--- a/client/PlanAIRClient/Resources.resx
+++ b/client/PlanAIRClient/Resources.resx
@@ -117,53 +117,53 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="CIM" xml:space="preserve">
+  <data name="TITLE" xml:space="preserve">
     <value>Cím</value>
   </data>
-  <data name="ELSO_ADASNAP" xml:space="preserve">
+  <data name="FIRSTBROADCASTDATE" xml:space="preserve">
     <value>Első adás</value>
   </data>
-  <data name="EPIZOD" xml:space="preserve">
+  <data name="EPISODENUMBER" xml:space="preserve">
     <value>Epizódszám</value>
   </data>
-  <data name="EPIZOD_AZONOSITO" xml:space="preserve">
+  <data name="EPISODEID" xml:space="preserve">
     <value>Epizód azonosító</value>
   </data>
-  <data name="EPIZOD_CIM" xml:space="preserve">
+  <data name="EPISODETITLE" xml:space="preserve">
     <value>Epizodcím</value>
   </data>
-  <data name="HIANYOS" xml:space="preserve">
+  <data name="PROBLEMATIC" xml:space="preserve">
     <value>Hiányos</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ic_refresh_black_24dp_1x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\ic_refresh_black_24dp_1x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="KERESES" xml:space="preserve">
+  <data name="SEARCH" xml:space="preserve">
     <value>Keresés</value>
   </data>
-  <data name="KERESES_EREDMENYE" xml:space="preserve">
+  <data name="SERACHRESULTS" xml:space="preserve">
     <value>Keresés eredménye</value>
   </data>
-  <data name="KOVETKEZO_ADASNAP" xml:space="preserve">
+  <data name="NEXTBROADCASTDATE" xml:space="preserve">
     <value>Következő adás</value>
   </data>
-  <data name="MEGSE" xml:space="preserve">
+  <data name="CANCEL" xml:space="preserve">
     <value>Mégse</value>
   </data>
-  <data name="MUSOR" xml:space="preserve">
+  <data name="MATERIAL" xml:space="preserve">
     <value>Műsor</value>
   </data>
-  <data name="PROMO" xml:space="preserve">
+  <data name="PROMOTION" xml:space="preserve">
     <value>Promó</value>
   </data>
-  <data name="REKLAM" xml:space="preserve">
+  <data name="ADVERTISEMENT" xml:space="preserve">
     <value>Reklám</value>
   </data>
-  <data name="SZEGMENS_SZAM" xml:space="preserve">
+  <data name="SEGMENTCOUNT" xml:space="preserve">
     <value>Szegmensek</value>
   </data>
-  <data name="TRAFFIC_ID" xml:space="preserve">
+  <data name="TRAFFICID" xml:space="preserve">
     <value>Traffic ID</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 583e2617..17e3fb33 100644
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -9,18 +9,19 @@ using MaestroShared.Metadata;
 
 namespace TrafficClient {
     public class TrafficAPI {
+        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
         private TrafficContext context = new TrafficContext();
         private string connectionString;
         private CliFSPReader cliFSPReader;
         private SqlConnection connection;
-        private static Logger logger = LogManager.GetCurrentClassLogger();
         private MaterialWorker materialWorker;
         private PromoWorker promoWorker;
         private ADWorker adWorker;
         private SegmentWorker segmentWorker;
 
         public TrafficAPI(string connString, string user, string password, int timeout, IMessageBus messageBus) {
-            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout / 1000);
+            var correctedTimeout = timeout < 1000 ? 1000 : timeout;
+            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, correctedTimeout / 1000);
             connection = new SqlConnection(connectionString);
             cliFSPReader = new CliFSPReader();
             materialWorker = new MaterialWorker(connection, cliFSPReader, messageBus);
diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 40435e34..c58c4366 100644
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -23,13 +23,13 @@ namespace TrafficClient {
         }
 
         private void InitializeTexts() {
-            chkProblematic.Text = Resources.HIANYOS;
+            chkProblematic.Text = Resources.PROBLEMATIC;
 
             dgTraffic.AutoGenerateColumns = false;
 
-            rbMaterial.Text = Resources.MUSOR;
-            rbPromo.Text = Resources.PROMO;
-            rbAD.Text = Resources.REKLAM;
+            rbMaterial.Text = Resources.MATERIAL;
+            rbPromo.Text = Resources.PROMOTION;
+            rbAD.Text = Resources.ADVERTISEMENT;
         }
 
         public TrafficParameters Parameters {
diff --git a/client/PlanAIRClient/TrafficIDSelectorColumns.cs b/client/PlanAIRClient/TrafficIDSelectorColumns.cs
index 68ce4c0f..46573816 100644
--- a/client/PlanAIRClient/TrafficIDSelectorColumns.cs
+++ b/client/PlanAIRClient/TrafficIDSelectorColumns.cs
@@ -13,7 +13,7 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "MediaID",
-                    HeaderText = Resources.TRAFFIC_ID,
+                    HeaderText = Resources.TRAFFICID,
                     Width = 100
                 },
                 new DataGridViewCheckBoxColumn() {
@@ -24,43 +24,43 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "Title",
-                    HeaderText = Resources.CIM,
+                    HeaderText = Resources.TITLE,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "EpisodeNumber",
-                    HeaderText = Resources.EPIZOD,
+                    HeaderText = Resources.EPISODENUMBER,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "EpisodeID",
-                    HeaderText = Resources.EPIZOD_AZONOSITO,
+                    HeaderText = Resources.EPISODEID,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "FirsBroadcastDate",
-                    HeaderText = Resources.ELSO_ADASNAP,
+                    HeaderText = Resources.FIRSTBROADCASTDATE,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "NextBroadcastDate",
-                    HeaderText = Resources.KOVETKEZO_ADASNAP,
+                    HeaderText = Resources.NEXTBROADCASTDATE,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "SegmentCount",
-                    HeaderText = Resources.SZEGMENS_SZAM,
+                    HeaderText = Resources.SEGMENTCOUNT,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "EpisodeTitle",
-                    HeaderText = Resources.EPIZOD_CIM,
+                    HeaderText = Resources.EPISODETITLE,
                     Width = 100
                 },
             };
@@ -76,7 +76,7 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "MediaID",
-                    HeaderText = Resources.TRAFFIC_ID,
+                    HeaderText = Resources.TRAFFICID,
                     Width = 100
                 },
                 new DataGridViewCheckBoxColumn() {
@@ -87,19 +87,19 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "Title",
-                    HeaderText = Resources.CIM,
+                    HeaderText = Resources.TITLE,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "EpisodeNumber",
-                    HeaderText = Resources.EPIZOD,
+                    HeaderText = Resources.EPISODENUMBER,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "EpisodeTitle",
-                    HeaderText = Resources.EPIZOD_CIM,
+                    HeaderText = Resources.EPISODETITLE,
                     Width = 100
                 },
             };
@@ -115,7 +115,7 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "MediaID",
-                    HeaderText = Resources.TRAFFIC_ID,
+                    HeaderText = Resources.TRAFFICID,
                     Width = 100
                 },
                 new DataGridViewCheckBoxColumn() {
@@ -126,13 +126,13 @@ namespace TrafficClient {
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "Title",
-                    HeaderText = Resources.CIM,
+                    HeaderText = Resources.TITLE,
                     Width = 100
                 },
                 new DataGridViewTextBoxColumn() {
                     AutoSizeMode = DataGridViewAutoSizeColumnMode.None,
                     DataPropertyName = "EpisodeTitle",
-                    HeaderText = Resources.EPIZOD_CIM,
+                    HeaderText = Resources.EPISODETITLE,
                     Width = 100
                 },
             };
diff --git a/client/PlanAIRClient/TrafficLookupResultSelector.cs b/client/PlanAIRClient/TrafficLookupResultSelector.cs
index 9a0ebf3b..2a05da24 100644
--- a/client/PlanAIRClient/TrafficLookupResultSelector.cs
+++ b/client/PlanAIRClient/TrafficLookupResultSelector.cs
@@ -14,14 +14,14 @@ namespace TrafficClient {
         public TrafficLookupResultSelector(List<TrafficItem> elements, TraficMetadataSelected metadataSelected) : this() {
             this.elements = elements;
             this.metadataSelected = metadataSelected;
-            this.Text = Resources.KERESES_EREDMENYE;
-            buttonCancel.Text = Resources.MEGSE;
+            this.Text = Resources.SERACHRESULTS;
+            buttonCancel.Text = Resources.CANCEL;
             FillDataGridView();
         }
 
         public TrafficLookupResultSelector() {
             InitializeComponent();
-            this.Text = Resources.KERESES_EREDMENYE;
+            this.Text = Resources.SERACHRESULTS;
             SetColumns();
         }
 
@@ -31,17 +31,17 @@ namespace TrafficClient {
                     new DataGridViewTextBoxColumn() {
                             AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,
                             DataPropertyName = "MediaID",
-                            HeaderText = Resources.TRAFFIC_ID
+                            HeaderText = Resources.TRAFFICID
                     },
                     new DataGridViewTextBoxColumn() {
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,
                             DataPropertyName = "Title",
-                            HeaderText = Resources.CIM
+                            HeaderText = Resources.TITLE
                     },
                     new DataGridViewTextBoxColumn() {
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,
                             DataPropertyName = "EpisodeTitle",
-                            HeaderText = Resources.EPIZOD_CIM
+                            HeaderText = Resources.EPISODETITLE
                     }
                 }
             );