Push release 0.60........

builtbybel · Jun 19, 2022 · 0349dd9 · 0349dd9
1 parent 93a9ac4
commit 0349dd9
Show file tree

Hide file tree

Showing 47 changed files with 418 additions and 176 deletions.
diff --git a/latest.txt b/latest.txt
@@ -1 +1 @@
-0.50.0
+0.60.0
diff --git a/src/Privatezilla/Locales/Locale.Designer.cs b/src/Privatezilla/Locales/Locale.Designer.cs
diff --git a/src/Privatezilla/Locales/Locale.de.resx b/src/Privatezilla/Locales/Locale.de.resx
@@ -378,10 +378,10 @@ Sie können mir außerdem folgen auf
     <value>Dadurch werden alle integrierten Apps, außer der Microsoft Store, entfernt.</value>
   </data>
   <data name="settingsBloatwareRemoveUWPDefaults" xml:space="preserve">
-    <value>Alle integrierten Apps, außer Standard-Apps, entfernen</value>
+    <value>Nur vorinstallierte Bloatware Apps entfernen</value>
   </data>
   <data name="settingsBloatwareRemoveUWPDefaultsInfo" xml:space="preserve">
-    <value>Dadurch werden alle integrierten Apps, außer folgenden, entfernt:\nMicrosoft Store\nApp Installer\nKalender\nMail\nRechner\nKamera\nSkype\nGroove Music\nKarte\n3D Paint\nIhr Telefon\nFotos\nNotizen\nWetter\nXbox</value>
+    <value>Der Abgleich findet anhand einer Community Liste statt</value>
   </data>
   <data name="settingsCortanaDisableBing" xml:space="preserve">
     <value>Bing in Windows-Suche deaktivieren</value>

diff --git a/src/Privatezilla/Locales/Locale.resx b/src/Privatezilla/Locales/Locale.resx
@@ -411,11 +411,11 @@ Add translation credits here!</comment>
     <comment>Settings &gt; Bloatware</comment>
   </data>
   <data name="settingsBloatwareRemoveUWPDefaults" xml:space="preserve">
-    <value>Remove all built-in apps except defaults</value>
+    <value>Remove pre-installed bloatware apps ONLY</value>
     <comment>Settings &gt; Bloatware</comment>
   </data>
   <data name="settingsBloatwareRemoveUWPDefaultsInfo" xml:space="preserve">
-    <value>This will remove all built-in apps except the following:\nMicrosoft Store\nApp Installer\nCalendar\nMail\nCalculator\nCamera\nSkype\nGroove Music\nMaps\nPaint 3D\nYour Phone\nPhotos\nSticky Notes\nWeather\nXbox</value>
+    <value>This will search and remove pre-installed bloatware apps fully automatically.\nThe matching takes place on the basis of a community list</value>
     <comment>Settings &gt; Bloatware</comment>
   </data>
   <data name="settingsCortanaDisableBing" xml:space="preserve">

diff --git a/src/Privatezilla/MainWindow.Designer.cs b/src/Privatezilla/MainWindow.Designer.cs
diff --git a/src/Privatezilla/MainWindow.cs b/src/Privatezilla/MainWindow.cs
@@ -281,6 +281,7 @@ private void Reset()
             LvwStatus.Refresh();
         }
 
+
         private void IncrementProgress()
         {
             _progress += _progressIncrement;
@@ -367,7 +368,7 @@ private async void BtnSettingsAnalyze_Click(object sender, EventArgs e)
 
                 state.Tag = setting;
                 LvwStatus.Items.Add(state);
-                IncrementProgress();
+
             }
 
             DoProgress(100);
@@ -684,6 +685,7 @@ private void PSImport_Click(object sender, EventArgs e)
                     try
                     {
                         File.Copy(fileName, strDestPath + @"\" + Path.GetFileName(fileName));
+                        File.Delete(fileName);
                     }
                     catch (Exception ex)
                     { MessageBox.Show(ex.Message, this.Text); }