From 227f0c99cc641275259fb51d479a3c0d16c523af Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 11 Mar 2015 06:05:14 -0700
Subject: [PATCH] webdav portal merge fix

---
 .../Resources/UI.Designer.cs                  | 63 +++++++++++++++++++
 .../Resources/UI.resx                         | 21 +++++++
 2 files changed, 84 insertions(+)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
index 4a5a4578..f9a6db66 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
@@ -123,6 +123,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Create.
+        /// </summary>
+        public static string Create {
+            get {
+                return ResourceManager.GetString("Create", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Delete.
         /// </summary>
@@ -159,6 +168,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter file name.
+        /// </summary>
+        public static string EnterFileName {
+            get {
+                return ResourceManager.GetString("EnterFileName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error.
         /// </summary>
@@ -177,6 +195,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Excel workbook.
+        /// </summary>
+        public static string ExcelWorkbook {
+            get {
+                return ResourceManager.GetString("ExcelWorkbook", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File.
         /// </summary>
@@ -186,6 +213,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File name.
+        /// </summary>
+        public static string FileName {
+            get {
+                return ResourceManager.GetString("FileName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File Upload.
         /// </summary>
@@ -213,6 +249,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File already exist.
+        /// </summary>
+        public static string ItemExist {
+            get {
+                return ResourceManager.GetString("ItemExist", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} items was removed..
         /// </summary>
@@ -303,6 +348,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Powerpoint presentation.
+        /// </summary>
+        public static string PowerPointPresentation {
+            get {
+                return ResourceManager.GetString("PowerPointPresentation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Processing.
         /// </summary>
@@ -402,6 +456,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Word document.
+        /// </summary>
+        public static string WordDocument {
+            get {
+                return ResourceManager.GetString("WordDocument", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Yes.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
index 2ffe1406..56929bcc 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
@@ -138,6 +138,9 @@
   <data name="Confirm" xml:space="preserve">
     <value>Confirm</value>
   </data>
+  <data name="Create" xml:space="preserve">
+    <value>Create</value>
+  </data>
   <data name="Delete" xml:space="preserve">
     <value>Delete</value>
   </data>
@@ -150,15 +153,24 @@
   <data name="DialogsContentConfrimFileDeletion" xml:space="preserve">
     <value>Are you sure you want to delete {0} item(s)?</value>
   </data>
+  <data name="EnterFileName" xml:space="preserve">
+    <value>Please enter file name</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
   <data name="ExabyteShort" xml:space="preserve">
     <value>EB</value>
   </data>
+  <data name="ExcelWorkbook" xml:space="preserve">
+    <value>Excel workbook</value>
+  </data>
   <data name="File" xml:space="preserve">
     <value>File</value>
   </data>
+  <data name="FileName" xml:space="preserve">
+    <value>File name</value>
+  </data>
   <data name="FileUpload" xml:space="preserve">
     <value>File Upload</value>
   </data>
@@ -168,6 +180,9 @@
   <data name="Info" xml:space="preserve">
     <value>Info</value>
   </data>
+  <data name="ItemExist" xml:space="preserve">
+    <value>File already exist</value>
+  </data>
   <data name="ItemsWasRemovedFormat" xml:space="preserve">
     <value>{0} items was removed.</value>
   </data>
@@ -198,6 +213,9 @@
   <data name="PleaseWaitWithDots" xml:space="preserve">
     <value>Please wait...</value>
   </data>
+  <data name="PowerPointPresentation" xml:space="preserve">
+    <value>Powerpoint presentation</value>
+  </data>
   <data name="Processing" xml:space="preserve">
     <value>Processing</value>
   </data>
@@ -231,6 +249,9 @@
   <data name="Upload" xml:space="preserve">
     <value>Upload</value>
   </data>
+  <data name="WordDocument" xml:space="preserve">
+    <value>Word document</value>
+  </data>
   <data name="Yes" xml:space="preserve">
     <value>Yes</value>
   </data>