From b141334661f65b83982c7373a3011081457c6e37 Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Mon, 21 Mar 2016 11:02:15 +0100
Subject: [PATCH] jj 21.03.2016 update translations

---
 app/DD-Record-Organiser/ClassControlProperties.vb        | 7 ++++---
 .../Strings/ControlProperties.Designer.vb                | 9 +++++++++
 .../Strings/ControlProperties.en.resx                    | 5 ++++-
 app/DD-Record-Organiser/Strings/ControlProperties.resx   | 3 +++
 app/DD-Record-Organiser/frmTool_ControlProperties.vb     | 4 ++--
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/DD-Record-Organiser/ClassControlProperties.vb b/app/DD-Record-Organiser/ClassControlProperties.vb
index 74fae67..fa16060 100644
--- a/app/DD-Record-Organiser/ClassControlProperties.vb
+++ b/app/DD-Record-Organiser/ClassControlProperties.vb
@@ -310,7 +310,8 @@ Module ClassControlProperties
             End Set
         End Property
 
-        <CategoryAttribute("Kontextmenue")>
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_masterdataid")>
         Public Property MasterDataId() As Integer
             Get
                 Return _master_data_id
@@ -568,7 +569,7 @@ Module ClassControlProperties
         End Property
 
         <LocalizedCategoryAttribute("category_form")>
-        <LocalizedDescriptionAttribute("Gibt die Form-ID der zu öffnenden Form an.")>
+        <LocalizedDescriptionAttribute("desc_formid")>
         Public Property FormID() As Integer
             Get
                 Return _form_id
@@ -579,7 +580,7 @@ Module ClassControlProperties
         End Property
 
         <LocalizedCategoryAttribute("category_form")>
-        <LocalizedDescriptionAttribute("Gibt die Screen-ID der zu öffnenden Form an.")>
+        <LocalizedDescriptionAttribute("desc_screenid")>
         Public Property ScreenID() As Integer
             Get
                 Return _screen_id
diff --git a/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb b/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb
index 23585a1..f861327 100644
--- a/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb
+++ b/app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb
@@ -262,6 +262,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Die Id des Formulars, das über das Kontextmenü geöffnet wird. ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property desc_masterdataid() As String
+            Get
+                Return ResourceManager.GetString("desc_masterdataid", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Gibt an, ob das Feld mehrzeilig sein soll. ähnelt.
         '''</summary>
diff --git a/app/DD-Record-Organiser/Strings/ControlProperties.en.resx b/app/DD-Record-Organiser/Strings/ControlProperties.en.resx
index 675fb42..e939d6a 100644
--- a/app/DD-Record-Organiser/Strings/ControlProperties.en.resx
+++ b/app/DD-Record-Organiser/Strings/ControlProperties.en.resx
@@ -183,6 +183,9 @@
   <data name="desc_location" xml:space="preserve">
     <value>The element's location</value>
   </data>
+  <data name="desc_masterdataid" xml:space="preserve">
+    <value>The Form's Id that will be opened via the contextmenu.</value>
+  </data>
   <data name="desc_multiline" xml:space="preserve">
     <value>Should the element be a multiline field?</value>
   </data>
@@ -208,7 +211,7 @@
     <value>The element's size</value>
   </data>
   <data name="desc_sqlcommand" xml:space="preserve">
-    <value>Gibt die Datenbank-Abfrage für dieses Element an. Es können @RECORD_ID und @FORM_ID als Platzhalter verwendet werden. The database query for this element. @RECORD_ID and @FORM_ID can be used as placeholders. Dynamic values from other controls can be inserted with the Syntax @controlid@.</value>
+    <value>The database query for this element. @RECORD_ID and @FORM_ID can be used as placeholders. Dynamic values from other controls can be inserted with the Syntax @controlid@.</value>
   </data>
   <data name="desc_staticlist" xml:space="preserve">
     <value>A list of static values seperated by a semicolon (;)</value>
diff --git a/app/DD-Record-Organiser/Strings/ControlProperties.resx b/app/DD-Record-Organiser/Strings/ControlProperties.resx
index bbbbcdd..877559d 100644
--- a/app/DD-Record-Organiser/Strings/ControlProperties.resx
+++ b/app/DD-Record-Organiser/Strings/ControlProperties.resx
@@ -183,6 +183,9 @@
   <data name="desc_location" xml:space="preserve">
     <value>Gibt die Position des Elements an.</value>
   </data>
+  <data name="desc_masterdataid" xml:space="preserve">
+    <value>Die Id des Formulars, das über das Kontextmenü geöffnet wird.</value>
+  </data>
   <data name="desc_multiline" xml:space="preserve">
     <value>Gibt an, ob das Feld mehrzeilig sein soll.</value>
   </data>
diff --git a/app/DD-Record-Organiser/frmTool_ControlProperties.vb b/app/DD-Record-Organiser/frmTool_ControlProperties.vb
index 4d8af5f..d8c8b33 100644
--- a/app/DD-Record-Organiser/frmTool_ControlProperties.vb
+++ b/app/DD-Record-Organiser/frmTool_ControlProperties.vb
@@ -260,7 +260,7 @@
             ' Aktuelle Control Eigenschaften anzeigen
             Me.pgControlProperties.SelectedObject = props
             ' Fenster Titel aktualisieren
-            Me.Text = String.Format("Eigenschaften von {0}({1})", type, props.ID.ToString())
+            Me.Text = String.Format("Properties of {0} ({1})", type, props.ID.ToString())
 
         Catch ex As Exception
             MsgBox("Error in LoadControlProperties" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -599,7 +599,7 @@
             End If
 
             If ClassControlCommands.DeleteControl() = True Then
-                MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information)
+                'MsgBox("Element gelöscht, Elemente werden neu geladen.", MsgBoxStyle.Information)
                 CtrlBuilder.ClearControls()
                 frmLevel_Designer.Instance.LoadControls()
             End If