- Removed Old Settings Windows

- added missing tranlation
webspiderteam · Sep 7, 2022 · 5b55eaf · 5b55eaf
1 parent 6a5e49e
commit 5b55eaf
Show file tree

Hide file tree

Showing 38 changed files with 196 additions and 454 deletions.
diff --git a/BluetoothDMM WPF/BluetoothDMM/BluetoothDMM.csproj b/BluetoothDMM WPF/BluetoothDMM/BluetoothDMM.csproj
@@ -146,16 +146,10 @@
     <Compile Include="Data Viewer.xaml.cs">
       <DependentUpon>Data Viewer.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Devices.xaml.cs">
-      <DependentUpon>Devices.xaml</DependentUpon>
-    </Compile>
     <Compile Include="MQTTDataFormat.xaml.cs">
       <DependentUpon>MQTTDataFormat.xaml</DependentUpon>
     </Compile>
     <Compile Include="Classes\MQTTSetup.cs" />
-    <Compile Include="MQTT_Settings.xaml.cs">
-      <DependentUpon>MQTT_Settings.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Properties\Resources.en.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -166,9 +160,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>MQTT.settings</DependentUpon>
     </Compile>
-    <Compile Include="Settings.xaml.cs">
-      <DependentUpon>Settings.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SettingsNew.xaml.cs">
       <DependentUpon>SettingsNew.xaml</DependentUpon>
     </Compile>
@@ -185,10 +176,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Devices.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -208,14 +195,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="MQTT_Settings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Settings.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="SettingsNew.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Devices.xaml b/BluetoothDMM WPF/BluetoothDMM/Devices.xaml
diff --git a/BluetoothDMM WPF/BluetoothDMM/Devices.xaml.cs b/BluetoothDMM WPF/BluetoothDMM/Devices.xaml.cs
diff --git a/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml b/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml
diff --git a/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml.cs b/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml.cs
diff --git a/BluetoothDMM WPF/BluetoothDMM/MainWindow.xaml b/BluetoothDMM WPF/BluetoothDMM/MainWindow.xaml
@@ -498,7 +498,7 @@
                         </Path>
                     </Viewbox>
                     <TextBlock x:Name="MyGattCDataSymbol" Grid.Row="1" HorizontalAlignment="Right" Height="87" Margin="800,159,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="171" FontSize="72" FontWeight="Bold" d:Text="mV"/>
-                    <TextBlock x:Name="TxtUpdate" Grid.Row="1" d:Opacity="0.5" Opacity="0" Background="#80ff0000" TextWrapping="Wrap" FontSize="23" Text="New version available!" VerticalAlignment="Bottom" TextAlignment="Center" Padding="3" HorizontalAlignment="Stretch" Margin="0,10,0,35" IsEnabled="False" d:Visibility="Visible">
+                    <TextBlock x:Name="TxtUpdate" Grid.Row="1" d:Opacity="0.5" Opacity="0" Background="#80ff0000" TextWrapping="Wrap" FontSize="23" Text="{lex:Loc NewVersionAvail}" VerticalAlignment="Bottom" TextAlignment="Center" Padding="3" HorizontalAlignment="Stretch" Margin="0,10,0,35" IsEnabled="False" d:Visibility="Visible">
                         <TextBlock.Style>
                             <Style TargetType="{x:Type TextBlock}">
                                 <Style.Triggers>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/AssemblyInfo.cs b/BluetoothDMM WPF/BluetoothDMM/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.20.0.0")]
-[assembly: AssemblyFileVersion("1.20.0.0")]
+[assembly: AssemblyVersion("1.22.0.0")]
+[assembly: AssemblyFileVersion("1.22.0.0")]
diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.Designer.cs b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.Designer.cs
diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.ar.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.ar.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>اسم:</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>نسخة جديدة متاحة!</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>غير متصل</value>
   </data>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.de.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.de.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>Name:</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>Neue Version verfügbar!</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>Nicht verbunden</value>
   </data>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.el.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.el.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>Ονομα:</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>Νέα έκδοση διαθέσιμη!</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>Μη συνδεδεμένο</value>
   </data>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.es.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.es.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>Nombre:</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>¡Nueva versión disponible!</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>No conectado</value>
   </data>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.fr.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.fr.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>Nom:</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>Nouvelle version disponible!</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>Pas connecté</value>
   </data>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.it.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.it.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>Nome:</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>Nuova versione disponibile!</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>Non collegata</value>
   </data>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.ja.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.ja.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>名前：</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>新バージョンが登場！</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>接続されていません</value>
   </data>

diff --git a/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.nl.resx b/BluetoothDMM WPF/BluetoothDMM/Properties/Resources.nl.resx
@@ -285,6 +285,9 @@
   <data name="Name" xml:space="preserve">
     <value>Naam:</value>
   </data>
+  <data name="NewVersionAvail" xml:space="preserve">
+    <value>Nieuwe versie beschikbaar!</value>
+  </data>
   <data name="NotConnected" xml:space="preserve">
     <value>Niet verbonden</value>
   </data>