diff --git a/fpcupdeluxe.lps b/fpcupdeluxe.lps
index 0fc32331..bef2971b 100644
--- a/fpcupdeluxe.lps
+++ b/fpcupdeluxe.lps
@@ -5,7 +5,7 @@
     <Version Value="12"/>
     <ManyBuildModesSelection Value="win32,win64,linuxi386,linux64,linuxaarch64,linuxaarch64QT5,linuxaarch64QT5zip,linuxarm,linuxarmQT5,linuxarmQT5zip,linuxarmv6,linuxi386QT5,linuxx64QT5,linuxx64QT5zip,linuxppc64,freebsdi386,freebsdx64,netbsdx64,solarisx64,dragonflyx64,openbsdx64"/>
     <BuildModes Active="Default"/>
-    <Units Count="15">
+    <Units Count="19">
       <Unit0>
         <Filename Value="up.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -23,8 +23,8 @@
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="2006"/>
-        <CursorPos X="25" Y="2010"/>
+        <TopLine Value="25"/>
+        <CursorPos X="48" Y="13"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -120,105 +120,137 @@
         <CursorPos X="72" Y="2530"/>
         <UsageCount Value="10"/>
       </Unit14>
+      <Unit15>
+        <Filename Value="languages\fpcupdeluxe.en.po"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="138"/>
+        <CursorPos X="24" Y="154"/>
+        <UsageCount Value="10"/>
+        <DefaultSyntaxHighlighter Value="PO"/>
+      </Unit15>
+      <Unit16>
+        <Filename Value="languages\fpcupdeluxe.nl.po"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="163"/>
+        <CursorPos X="24" Y="179"/>
+        <UsageCount Value="10"/>
+        <DefaultSyntaxHighlighter Value="PO"/>
+      </Unit16>
+      <Unit17>
+        <Filename Value="languages\fpcupdeluxe.fr.po"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="152"/>
+        <CursorPos X="23" Y="168"/>
+        <UsageCount Value="10"/>
+        <DefaultSyntaxHighlighter Value="PO"/>
+      </Unit17>
+      <Unit18>
+        <Filename Value="languages\fpcupdeluxe.de.po"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="275"/>
+        <CursorPos X="24" Y="164"/>
+        <UsageCount Value="10"/>
+        <DefaultSyntaxHighlighter Value="PO"/>
+      </Unit18>
     </Units>
     <JumpHistory Count="25" HistoryIndex="24">
       <Position1>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="5" Column="10"/>
+        <Caret Line="12" Column="12"/>
       </Position1>
       <Position2>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="17" Column="25"/>
+        <Caret Line="107" Column="13" TopLine="103"/>
       </Position2>
       <Position3>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="5" Column="11"/>
+        <Caret Line="198" Column="14" TopLine="182"/>
       </Position3>
       <Position4>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="17" Column="23" TopLine="13"/>
+        <Caret Line="639" TopLine="512"/>
       </Position4>
       <Position5>
-        <Filename Value="up.lpr"/>
-        <Caret Line="55" TopLine="41"/>
+        <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="424" TopLine="403"/>
       </Position5>
       <Position6>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="12" Column="12"/>
+        <Caret Line="425" Column="28" TopLine="403"/>
       </Position6>
       <Position7>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="107" Column="13" TopLine="103"/>
+        <Caret Line="3889" Column="42" TopLine="3863"/>
       </Position7>
       <Position8>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="198" Column="14" TopLine="182"/>
+        <Caret Line="312" Column="15" TopLine="308"/>
       </Position8>
       <Position9>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="639" TopLine="512"/>
+        <Caret Line="314" Column="57" TopLine="308"/>
       </Position9>
       <Position10>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="424" TopLine="403"/>
+        <Caret Line="329" Column="28" TopLine="308"/>
       </Position10>
       <Position11>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="425" Column="28" TopLine="403"/>
+        <Caret Line="427" Column="28" TopLine="399"/>
       </Position11>
       <Position12>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="3889" Column="42" TopLine="3863"/>
+        <Caret Line="4491" Column="43" TopLine="4464"/>
       </Position12>
       <Position13>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="312" Column="15" TopLine="308"/>
+        <Caret Line="315" Column="54" TopLine="297"/>
       </Position13>
       <Position14>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="314" Column="57" TopLine="308"/>
+        <Caret Line="426" TopLine="401"/>
       </Position14>
       <Position15>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="329" Column="28" TopLine="308"/>
       </Position15>
       <Position16>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="427" Column="28" TopLine="399"/>
+        <Caret Line="315" Column="9" TopLine="287"/>
       </Position16>
       <Position17>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="4491" Column="43" TopLine="4464"/>
+        <Caret Line="4396" Column="42" TopLine="4369"/>
       </Position17>
       <Position18>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="315" Column="54" TopLine="297"/>
       </Position18>
       <Position19>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="426" TopLine="401"/>
+        <Caret Line="329" TopLine="297"/>
       </Position19>
       <Position20>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="330" TopLine="298"/>
       </Position20>
       <Position21>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="315" Column="9" TopLine="287"/>
+        <Caret Line="2018" Column="33" TopLine="2005"/>
       </Position21>
       <Position22>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="4396" Column="42" TopLine="4369"/>
+        <Caret Line="322" Column="25" TopLine="301"/>
       </Position22>
       <Position23>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
+        <Caret Line="329" Column="16" TopLine="301"/>
       </Position23>
       <Position24>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="329" TopLine="297"/>
+        <Caret Line="319" TopLine="301"/>
       </Position24>
       <Position25>
         <Filename Value="sources\updeluxe\fpcupdeluxemainform.pas"/>
-        <Caret Line="330" TopLine="298"/>
+        <Caret Line="27" Column="25" TopLine="16"/>
       </Position25>
     </JumpHistory>
     <RunParams>
diff --git a/languages/fpcupdeluxe.de.po b/languages/fpcupdeluxe.de.po
index f0e53c04..cf0951da 100644
--- a/languages/fpcupdeluxe.de.po
+++ b/languages/fpcupdeluxe.de.po
@@ -25,7 +25,7 @@ msgstr "Bitten Sie immer um Bestätigung."
 
 #: extrasettings.captioncheckautoswitchurl
 msgid "Auto-switch repo URL."
-msgstr "Repository-URL für automatischen Wechsel."
+msgstr "Automatischen Wechsel von Repository-URL."
 
 #: extrasettings.captioncheckenableonlinepatching
 msgid "Allow patching of sources by online patches."
@@ -53,7 +53,7 @@ msgstr "Hilfe einbeziehen."
 
 #: extrasettings.captioncheckincludelcl
 msgid "Include LCL with cross-compiler."
-msgstr "LCL mit Cross-Compiler einbinden."
+msgstr "LCL mit Cross-Compiler einbeziehen."
 
 #: extrasettings.captioncheckpackagerepo
 msgid "Get package repositories."
@@ -138,12 +138,12 @@ msgid "Enable software emulation of 80 bit floats."
 msgstr "Aktivieren Sie die Software-Emulation von 80-Bit-Gleitkommazahlen."
 
 #: fpcupdeluxemainform.upadvertisetools
-msgid "Fpcupdeluxe can try to download them if available !"
-msgstr ""
+msgid "FPCUPdeluxe can try to download them if available !"
+msgstr "FPCUPdeluxe kann versuchen, sie herunterzuladen, falls verfügbar!"
 
 #: fpcupdeluxemainform.upbuildallcrosscompilers
 msgid "Going to auto-build all installed cross-compilers !"
-msgstr "Alle installierten Cross-Compiler werden automatisch erstellt!"
+msgstr "Alle installierten Cross-Compiler werden automatisch erstellt !"
 
 #: fpcupdeluxemainform.upbuildallcrosscompilerscheck
 msgid "Checking FPC configfile [fpc.cfg] for cross-compilers in "
@@ -163,99 +163,123 @@ msgstr "Ich werde einen Cross-Compiler aus verfügbaren Quellen installieren."
 
 #: fpcupdeluxemainform.upcheckupdate
 msgid "Please wait. Checking for updates."
-msgstr "Warten Sie mal. Suche nach Updates."
+msgstr "Bitte warten. "
+
+#: fpcupdeluxemainform.updarwinfolderwarning1
+msgid "FPCUPdeluxe cannot be run inside the Downloads folder."
+msgstr "FPCUPdeluxe kann nicht im Downloads-Ordner ausgeführt werden."
+
+#: fpcupdeluxemainform.updarwinfolderwarning2
+msgid "This is NOT allowed by OSX security measures."
+msgstr "Dies wird von den OSX-Sicherheitsmaßnahmen NICHT zugelassen."
+
+#: fpcupdeluxemainform.updarwinfolderwarning3
+msgid "Copy FPCUPdeluxe into its own directory and run from there."
+msgstr "Kopieren Sie FPCUPdeluxe in ein eigenes Verzeichnis und führen Sie es von dort aus aus."
+
+#: fpcupdeluxemainform.upfolderwarning1
+msgid "FPCUPdeluxe could not create its necessary setting-files."
+msgstr "FPCUPdeluxe konnte die notwendigen Einstellungsdateien nicht erstellen."
+
+#: fpcupdeluxemainform.upfolderwarning2
+msgid "Please check the folder permissions, and re-start."
+msgstr "Bitte überprüfen Sie die Ordnerberechtigungen und starten Sie neu."
 
 #: fpcupdeluxemainform.upinstallcrosscompiler
 msgid "Going to install the cross-compiler for"
-msgstr ""
+msgstr "Cross-Compiler wird installiert für"
 
 #: fpcupdeluxemainform.upinstalldirectory
 msgid "Install directory"
-msgstr ""
+msgstr "Installationsverzeichnis"
 
 #: fpcupdeluxemainform.upinstalldirectorycurrent
 msgid "Current install directory"
-msgstr ""
+msgstr "Aktuelles Installationsverzeichnis"
 
 #: fpcupdeluxemainform.upinstallfpc
 msgid "Going to install/update FPC."
-msgstr ""
+msgstr "FPC wird installiert/aktualisiert."
 
 #: fpcupdeluxemainform.upinstallfpclazarus
 msgid "Going to install/update FPC and Lazarus."
-msgstr ""
+msgstr "Ich werde FPC und Lazarus installieren/aktualisieren."
 
 #: fpcupdeluxemainform.upinstalllazarus
 msgid "Going to install/update Lazarus."
-msgstr ""
+msgstr "Lazarus wird installiert/aktualisiert."
 
 #: fpcupdeluxemainform.upinstallmodule
 msgid "Going to install/update module"
-msgstr ""
+msgstr "Modul wird installiert/aktualisiert"
 
 #: fpcupdeluxemainform.upinstallsettingscurrent
 msgid "Got settings from install directory"
-msgstr ""
+msgstr "Einstellungen aus dem Installationsverzeichnis erhalten"
 
 #: fpcupdeluxemainform.uplookup
 msgid "Looking for"
-msgstr ""
+msgstr "Suche"
 
 #: fpcupdeluxemainform.uplookupbintools
 msgid "Going to look for the right cross-bins. Can (will) take some time !"
-msgstr ""
+msgstr "Ich werde nach den richtigen Cross-Bins suchen. "
 
 #: fpcupdeluxemainform.uplookuplibtools
 msgid "Going to look for the right cross-libraries. Can (will) take some time !"
-msgstr ""
+msgstr "Suche nach den richtigen Kreuzbibliotheken. "
 
 #: fpcupdeluxemainform.uplookuptools
-msgid "Looking for fpcupdeluxe cross-tools on GitHub (if any)."
-msgstr ""
+msgid "Looking for FPCUPdeluxe cross-tools on GitHub (if any)."
+msgstr "Suche nach FPCUPdeluxe-Cross-Tools auf GitHub (falls vorhanden)."
 
 #: fpcupdeluxemainform.upmissingtools
 msgid "The building of a crosscompiler failed due to missing cross-tools."
-msgstr ""
+msgstr "Das Erstellen eines Crosscompilers ist aufgrund fehlender Cross-Tools fehlgeschlagen."
 
 #: fpcupdeluxemainform.upquestioncontinue
 msgid "Do you want to continue ?"
-msgstr ""
+msgstr "Wollen Sie fortfahren?"
+
+#: fpcupdeluxemainform.upquitrequest
+msgid "Please quit FPCUPdeluxe."
+msgstr "Bitte beenden Sie FPCUPdeluxe."
 
 #: fpcupdeluxemainform.upremovecrosscompiler
 msgid "Going to remove the cross-compiler for"
-msgstr ""
+msgstr "Der Cross-Compiler wird entfernt für"
 
 #: fpcupdeluxemainform.upremovemodule
 msgid "Going to remove module"
-msgstr ""
+msgstr "Modul wird entfernt"
 
 #: fpcupdeluxemainform.upselectfpclazarustarget
 msgid "Please select a FPC and Lazarus target first"
-msgstr ""
+msgstr "Bitte wählen Sie zuerst ein FPC- und Lazarus-Target aus"
 
 #: fpcupdeluxemainform.upselectfpctarget
 msgid "Please select a FPC target first"
-msgstr ""
+msgstr "Bitte wählen Sie zuerst ein FPC-Ziel aus"
 
 #: fpcupdeluxemainform.upselectlazarustarget
 msgid "Please select a Lazarus target first"
-msgstr ""
+msgstr "Bitte wählen Sie zuerst ein Lazarus-Ziel aus"
 
 #: fpcupdeluxemainform.upspacewarning
 msgid "Having a space in your install path is very ill-advised !"
-msgstr ""
+msgstr "Ein Leerzeichen in Ihrem Installationspfad zu haben, ist sehr unklug!"
 
 #: fpcupdeluxemainform.uptrybuildcrosscompiler
 msgid "Trying to build the cross-compiler for"
-msgstr ""
+msgstr "Versuch, den Cross-Compiler für zu bauen"
 
 #: fpcupdeluxemainform.upupdatecrossall
 msgid "Going to update all crosscompilers"
-msgstr ""
+msgstr "Alle Crosscompiler werden aktualisiert"
 
 #: fpcupdeluxemainform.upupdatefound
-msgid "New fpcupdeluxe version available"
-msgstr "Neue fpcupdeluxe-Version verfügbar"
+msgid "New FPCUPdeluxe version available"
+msgstr "Neue FPCUPdeluxe-Version verfügbar"
 
 #: fpcupdeluxemainform.upupdatenotfound
 msgid "No updates found."
@@ -268,17 +292,17 @@ msgstr "Abgebrochen"
 #: processutils.liscannotexecute
 #, object-pascal-format
 msgid "cannot execute \"%s\""
-msgstr "kann nicht ausführen \\\"%s \\\""
+msgstr "Kann \"%s\" nicht ausführen"
 
 #: processutils.liscannotfindexecutable
 #, object-pascal-format
 msgid "cannot find executable \"%s\""
-msgstr "kann keine ausführbare Datei finden \\\"%s \\\""
+msgstr "Kann die ausführbare Datei »%s« nicht finden"
 
 #: processutils.lisexecutableisadirectory
 #, object-pascal-format
 msgid "executable \"%s\" is a directory"
-msgstr "ausführbar \\\"%s \\\" ist ein Verzeichnis"
+msgstr "Ausführbare Datei »%s« ist ein Verzeichnis"
 
 #: processutils.lisexecutablelacksthepermissiontorun
 #, object-pascal-format
@@ -288,22 +312,22 @@ msgstr "ausführbar \\\"%s \\\" fehlt die Berechtigung zum Ausführen"
 #: processutils.lisexitcode
 #, object-pascal-format
 msgid "Exit code %s"
-msgstr "Exit-Code%s"
+msgstr "Exit-Code %s"
 
 #: processutils.lisfreeingbufferlines
 #, object-pascal-format
 msgid "freeing buffer lines: %s"
-msgstr "Pufferleitungen freigeben:%s"
+msgstr "Pufferzeilen werden freigegeben: %s"
 
 #: processutils.lismissingdirectory
 #, object-pascal-format
 msgid "missing directory \"%s\""
-msgstr "fehlendes Verzeichnis \\\"%s \\\""
+msgstr "Verzeichnis »%s« fehlt"
 
 #: processutils.lismissingexecutable
 #, object-pascal-format
 msgid "missing executable \"%s\""
-msgstr "ausführbare Datei fehlt \\\"%s \\\""
+msgstr "fehlende ausführbare Datei »%s«"
 
 #: processutils.lissuccess
 msgid "Success"
@@ -317,7 +341,7 @@ msgstr "Werkzeug \\\"%s \\\" hat keine ausführbare Datei"
 #: processutils.lisunabletoexecute
 #, object-pascal-format
 msgid "unable to execute: %s"
-msgstr "kann nicht ausgeführt werden:%s"
+msgstr "Ausführung nicht möglich: %s"
 
 #: processutils.lisunabletoreadprocessexitstatus
 msgid "unable to read process ExitStatus"
@@ -325,11 +349,11 @@ msgstr "Prozess ExitStatus kann nicht gelesen werden"
 
 #: tform1.actfileexit.caption
 msgid "E&xit"
-msgstr "Ausgang"
+msgstr "Ende"
 
 #: tform1.actfileexit.hint
 msgid "Exit"
-msgstr "Ausgang"
+msgstr "Ende"
 
 #: tform1.actfilesave.caption
 msgid "&Save log"
@@ -337,7 +361,7 @@ msgstr "&Protokoll speichern"
 
 #: tform1.actfilesave.hint
 msgid "Save As"
-msgstr "Speichern als"
+msgstr ""
 
 #: tform1.androidbtn.caption
 msgid "LAMW"
@@ -588,7 +612,7 @@ msgstr "Lazarus-Version"
 #: tform1.listboxfpchistory.columns[0].caption
 msgctxt "tform1.listboxfpchistory.columns[0].caption"
 msgid "Hash"
-msgstr "Haschisch"
+msgstr "Hash"
 
 #: tform1.listboxfpchistory.columns[1].caption
 msgctxt "tform1.listboxfpchistory.columns[1].caption"
@@ -598,7 +622,7 @@ msgstr "Datum"
 #: tform1.listboxlazarushistory.columns[0].caption
 msgctxt "tform1.listboxlazarushistory.columns[0].caption"
 msgid "Hash"
-msgstr "Haschisch"
+msgstr "Hash"
 
 #: tform1.listboxlazarushistory.columns[1].caption
 msgctxt "tform1.listboxlazarushistory.columns[1].caption"
@@ -610,8 +634,8 @@ msgid "Chinese (CN)"
 msgstr "Chinesisch (CN)"
 
 #: tform1.memosummary.hint
-msgid "Will show error"
-msgstr "Wird Fehler zeigen"
+msgid "Will show info and error"
+msgstr "Zeigt Informationen und Fehler an"
 
 #: tform1.menglishlanguage.caption
 msgid "English (EN)"
@@ -631,7 +655,7 @@ msgstr "Sprachen"
 
 #: tform1.menuitem3.caption
 msgid "Issues"
-msgstr "Ausgaben"
+msgstr "Fehler"
 
 #: tform1.menuitem5.caption
 msgid "Exit"
@@ -659,11 +683,11 @@ msgstr "Niederländisch (NL)"
 
 #: tform1.missuesforum.caption
 msgid "Up Lazarus forum"
-msgstr "Nach oben Lazarus-Forum"
+msgstr "Nach Lazarus-Forum"
 
 #: tform1.missuesgithub.caption
 msgid "Up GitHub issues"
-msgstr "Up GitHub-Probleme"
+msgstr "Nach GitHub-Probleme"
 
 #: tform1.mkoreanlanguage.caption
 msgid "Korean (KR)"
@@ -671,7 +695,7 @@ msgstr "Koreanisch (KR)"
 
 #: tform1.mlazarusbugs.caption
 msgid "Lazarus bugs"
-msgstr "Lazarus-Käfer"
+msgstr "Lazarus-Fehler"
 
 #: tform1.modulesheet.caption
 msgid "Modules"
@@ -769,7 +793,7 @@ msgstr "FPC-Patch hinzufügen"
 
 #: tform2.btnaddlazpatch.caption
 msgid "Add Laz. patch"
-msgstr "Laz hinzufügen. Patch"
+msgstr "Laz.-Patch hinzufügen."
 
 #: tform2.btnlistcustomoptions.caption
 msgid "List All"
@@ -777,11 +801,11 @@ msgstr "Liste alle auf"
 
 #: tform2.btnremfpcpatch.caption
 msgid "Rem. FPC patch"
-msgstr "Rem. FPC Patch"
+msgstr "FPC-Patch entfernen"
 
 #: tform2.btnremlazpatch.caption
 msgid "Rem. Laz. patch"
-msgstr "Rem. Laz. Patch"
+msgstr "Laz.-Patch entfernen"
 
 #: tform2.btnselectbindir.caption
 msgid "Tools"
diff --git a/languages/fpcupdeluxe.en.po b/languages/fpcupdeluxe.en.po
index f05202b9..934da1f6 100644
--- a/languages/fpcupdeluxe.en.po
+++ b/languages/fpcupdeluxe.en.po
@@ -132,32 +132,26 @@ msgid "FPCUPdeluxe can try to download them if available !"
 msgstr ""
 
 #: fpcupdeluxemainform.upbuildallcrosscompilers
-msgctxt "fpcupdeluxemainform.upbuildallcrosscompilers"
 msgid "Going to auto-build all installed cross-compilers !"
 msgstr ""
 
 #: fpcupdeluxemainform.upbuildallcrosscompilerscheck
-msgctxt "fpcupdeluxemainform.upbuildallcrosscompilerscheck"
 msgid "Checking FPC configfile [fpc.cfg] for cross-compilers in "
 msgstr ""
 
 #: fpcupdeluxemainform.upbuildallcrosscompilersfound
-msgctxt "fpcupdeluxemainform.upbuildallcrosscompilersfound"
 msgid "Found crosscompiler for "
 msgstr ""
 
 #: fpcupdeluxemainform.upbuildallcrosscompilersupdate
-msgctxt "fpcupdeluxemainform.upbuildallcrosscompilersupdate"
 msgid "Going to update cross-compiler."
 msgstr ""
 
 #: fpcupdeluxemainform.upbuildcrosscompiler
-msgctxt "fpcupdeluxemainform.upbuildcrosscompiler"
 msgid "Going to install a cross-compiler from available sources."
 msgstr ""
 
 #: fpcupdeluxemainform.upcheckupdate
-msgctxt "fpcupdeluxemainform.upcheckupdate"
 msgid "Please wait. Checking for updates."
 msgstr ""
 
@@ -166,7 +160,6 @@ msgid "FPCUPdeluxe cannot be run inside the Downloads folder."
 msgstr ""
 
 #: fpcupdeluxemainform.updarwinfolderwarning2
-msgctxt "fpcupdeluxemainform.updarwinfolderwarning2"
 msgid "This is NOT allowed by OSX security measures."
 msgstr ""
 
@@ -175,67 +168,54 @@ msgid "Copy FPCUPdeluxe into its own directory and run from there."
 msgstr ""
 
 #: fpcupdeluxemainform.upfolderwarning1
-msgctxt "fpcupdeluxemainform.upfolderwarning1"
 msgid "FPCUPdeluxe could not create its necessary setting-files."
 msgstr ""
 
 #: fpcupdeluxemainform.upfolderwarning2
-msgctxt "fpcupdeluxemainform.upfolderwarning2"
 msgid "Please check the folder permissions, and re-start."
 msgstr ""
 
 #: fpcupdeluxemainform.upinstallcrosscompiler
-msgctxt "fpcupdeluxemainform.upinstallcrosscompiler"
 msgid "Going to install the cross-compiler for"
 msgstr ""
 
 #: fpcupdeluxemainform.upinstalldirectory
-msgctxt "fpcupdeluxemainform.upinstalldirectory"
 msgid "Install directory"
 msgstr ""
 
 #: fpcupdeluxemainform.upinstalldirectorycurrent
-msgctxt "fpcupdeluxemainform.upinstalldirectorycurrent"
 msgid "Current install directory"
 msgstr ""
 
 #: fpcupdeluxemainform.upinstallfpc
-msgctxt "fpcupdeluxemainform.upinstallfpc"
 msgid "Going to install/update FPC."
 msgstr ""
 
 #: fpcupdeluxemainform.upinstallfpclazarus
-msgctxt "fpcupdeluxemainform.upinstallfpclazarus"
 msgid "Going to install/update FPC and Lazarus."
 msgstr ""
 
 #: fpcupdeluxemainform.upinstalllazarus
-msgctxt "fpcupdeluxemainform.upinstalllazarus"
 msgid "Going to install/update Lazarus."
 msgstr ""
 
 #: fpcupdeluxemainform.upinstallmodule
-msgctxt "fpcupdeluxemainform.upinstallmodule"
 msgid "Going to install/update module"
 msgstr ""
 
 #: fpcupdeluxemainform.upinstallsettingscurrent
-msgctxt "fpcupdeluxemainform.upinstallsettingscurrent"
 msgid "Got settings from install directory"
 msgstr ""
 
 #: fpcupdeluxemainform.uplookup
-msgctxt "fpcupdeluxemainform.uplookup"
 msgid "Looking for"
 msgstr ""
 
 #: fpcupdeluxemainform.uplookupbintools
-msgctxt "fpcupdeluxemainform.uplookupbintools"
 msgid "Going to look for the right cross-bins. Can (will) take some time !"
 msgstr ""
 
 #: fpcupdeluxemainform.uplookuplibtools
-msgctxt "fpcupdeluxemainform.uplookuplibtools"
 msgid "Going to look for the right cross-libraries. Can (will) take some time !"
 msgstr ""
 
@@ -244,12 +224,10 @@ msgid "Looking for FPCUPdeluxe cross-tools on GitHub (if any)."
 msgstr ""
 
 #: fpcupdeluxemainform.upmissingtools
-msgctxt "fpcupdeluxemainform.upmissingtools"
 msgid "The building of a crosscompiler failed due to missing cross-tools."
 msgstr ""
 
 #: fpcupdeluxemainform.upquestioncontinue
-msgctxt "fpcupdeluxemainform.upquestioncontinue"
 msgid "Do you want to continue ?"
 msgstr ""
 
@@ -258,42 +236,34 @@ msgid "Please quit FPCUPdeluxe."
 msgstr ""
 
 #: fpcupdeluxemainform.upremovecrosscompiler
-msgctxt "fpcupdeluxemainform.upremovecrosscompiler"
 msgid "Going to remove the cross-compiler for"
 msgstr ""
 
 #: fpcupdeluxemainform.upremovemodule
-msgctxt "fpcupdeluxemainform.upremovemodule"
 msgid "Going to remove module"
 msgstr ""
 
 #: fpcupdeluxemainform.upselectfpclazarustarget
-msgctxt "fpcupdeluxemainform.upselectfpclazarustarget"
 msgid "Please select a FPC and Lazarus target first"
 msgstr ""
 
 #: fpcupdeluxemainform.upselectfpctarget
-msgctxt "fpcupdeluxemainform.upselectfpctarget"
 msgid "Please select a FPC target first"
 msgstr ""
 
 #: fpcupdeluxemainform.upselectlazarustarget
-msgctxt "fpcupdeluxemainform.upselectlazarustarget"
 msgid "Please select a Lazarus target first"
 msgstr ""
 
 #: fpcupdeluxemainform.upspacewarning
-msgctxt "fpcupdeluxemainform.upspacewarning"
 msgid "Having a space in your install path is very ill-advised !"
 msgstr ""
 
 #: fpcupdeluxemainform.uptrybuildcrosscompiler
-msgctxt "fpcupdeluxemainform.uptrybuildcrosscompiler"
 msgid "Trying to build the cross-compiler for"
 msgstr ""
 
 #: fpcupdeluxemainform.upupdatecrossall
-msgctxt "fpcupdeluxemainform.upupdatecrossall"
 msgid "Going to update all crosscompilers"
 msgstr ""
 
@@ -302,7 +272,6 @@ msgid "New FPCUPdeluxe version available"
 msgstr ""
 
 #: fpcupdeluxemainform.upupdatenotfound
-msgctxt "fpcupdeluxemainform.upupdatenotfound"
 msgid "No updates found."
 msgstr ""
 
@@ -654,6 +623,10 @@ msgstr ""
 msgid "Chinese (CN)"
 msgstr ""
 
+#: tform1.mdutchlanguage.caption
+msgid "Dutch (NL)"
+msgstr ""
+
 #: tform1.memosummary.hint
 msgid "Will show info and error"
 msgstr ""
@@ -678,14 +651,6 @@ msgstr ""
 msgid "Issues"
 msgstr ""
 
-#: tform1.menuitem5.caption
-msgid "Exit"
-msgstr ""
-
-#: tform1.menuitem6.caption
-msgid "Save log"
-msgstr ""
-
 #: tform1.mfpcbugs.caption
 msgid "FPC bugs"
 msgstr ""
@@ -698,10 +663,6 @@ msgstr ""
 msgid "German (D)"
 msgstr ""
 
-#: tform1.mdutchlanguage.caption
-msgid "Dutch (NL)"
-msgstr ""
-
 #: tform1.missuesforum.caption
 msgid "Up Lazarus forum"
 msgstr ""
diff --git a/languages/fpcupdeluxe.fr.po b/languages/fpcupdeluxe.fr.po
index f8b07c04..61839447 100644
--- a/languages/fpcupdeluxe.fr.po
+++ b/languages/fpcupdeluxe.fr.po
@@ -77,7 +77,7 @@ msgstr "Diviser la source et les bacs de Lazarus."
 
 #: extrasettings.captionchecksystemfpc
 msgid "Use system FPC for Lazarus."
-msgstr "Utiliser le système FPC pour les Lazarus."
+msgstr "Utiliser le système FPC pour Lazarus."
 
 #: extrasettings.captioncheckupdateonly
 msgid "FPC/Laz rebuild only."
@@ -138,8 +138,8 @@ msgid "Enable software emulation of 80 bit floats."
 msgstr "Active l'émulation logicielle des flottants de 80 bits."
 
 #: fpcupdeluxemainform.upadvertisetools
-msgid "Fpcupdeluxe can try to download them if available !"
-msgstr ""
+msgid "FPCUPdeluxe can try to download them if available !"
+msgstr "FPCUPdeluxe peut essayer de les télécharger s'ils sont disponibles !"
 
 #: fpcupdeluxemainform.upbuildallcrosscompilers
 msgid "Going to auto-build all installed cross-compilers !"
@@ -147,11 +147,11 @@ msgstr "Compilation automatique de tous les compilateurs croisés installés !"
 
 #: fpcupdeluxemainform.upbuildallcrosscompilerscheck
 msgid "Checking FPC configfile [fpc.cfg] for cross-compilers in "
-msgstr "Vérification du fichier de configuration de FPC [fpc.cfg] pour les compilateurs croisés en "
+msgstr "Vérification du fichier de configuration de FPC [fpc.cfg] pour les compilateurs croisés en"
 
 #: fpcupdeluxemainform.upbuildallcrosscompilersfound
 msgid "Found crosscompiler for "
-msgstr "Trouvé un compilateur croisé pour "
+msgstr "Trouvé un compilateur croisé pour"
 
 #: fpcupdeluxemainform.upbuildallcrosscompilersupdate
 msgid "Going to update cross-compiler."
@@ -165,97 +165,121 @@ msgstr "Installer un compilateur croisé à partir des sources disponibles."
 msgid "Please wait. Checking for updates."
 msgstr "Veuillez patienter. Vérification des mises à jour."
 
+#: fpcupdeluxemainform.updarwinfolderwarning1
+msgid "FPCUPdeluxe cannot be run inside the Downloads folder."
+msgstr "FPCUPdeluxe ne peut pas être exécuté dans le dossier Téléchargements."
+
+#: fpcupdeluxemainform.updarwinfolderwarning2
+msgid "This is NOT allowed by OSX security measures."
+msgstr "Ceci n'est PAS autorisé par les mesures de sécurité d'OSX."
+
+#: fpcupdeluxemainform.updarwinfolderwarning3
+msgid "Copy FPCUPdeluxe into its own directory and run from there."
+msgstr "Copiez FPCUPdeluxe dans son propre répertoire et exécutez-le à partir de là."
+
+#: fpcupdeluxemainform.upfolderwarning1
+msgid "FPCUPdeluxe could not create its necessary setting-files."
+msgstr "FPCUPdeluxe n'a pas pu créer ses fichiers de configuration nécessaires."
+
+#: fpcupdeluxemainform.upfolderwarning2
+msgid "Please check the folder permissions, and re-start."
+msgstr "Veuillez vérifier les permissions du dossier, et redémarrer."
+
 #: fpcupdeluxemainform.upinstallcrosscompiler
 msgid "Going to install the cross-compiler for"
-msgstr ""
+msgstr "Je vais installer le compilateur croisé pour"
 
 #: fpcupdeluxemainform.upinstalldirectory
 msgid "Install directory"
-msgstr ""
+msgstr "Répertoire d'installation"
 
 #: fpcupdeluxemainform.upinstalldirectorycurrent
 msgid "Current install directory"
-msgstr ""
+msgstr "Répertoire d'installation actuel"
 
 #: fpcupdeluxemainform.upinstallfpc
 msgid "Going to install/update FPC."
-msgstr ""
+msgstr "Je vais installer/mettre à jour FPC."
 
 #: fpcupdeluxemainform.upinstallfpclazarus
 msgid "Going to install/update FPC and Lazarus."
-msgstr ""
+msgstr "Je vais installer/mettre à jour FPC et Lazarus."
 
 #: fpcupdeluxemainform.upinstalllazarus
 msgid "Going to install/update Lazarus."
-msgstr ""
+msgstr "Je vais installer/mettre à jour Lazarus."
 
 #: fpcupdeluxemainform.upinstallmodule
 msgid "Going to install/update module"
-msgstr ""
+msgstr "Installer/mettre à jour le module"
 
 #: fpcupdeluxemainform.upinstallsettingscurrent
 msgid "Got settings from install directory"
-msgstr ""
+msgstr "Obtenir les paramètres du répertoire d'installation"
 
 #: fpcupdeluxemainform.uplookup
 msgid "Looking for"
-msgstr ""
+msgstr "Vous cherchez"
 
 #: fpcupdeluxemainform.uplookupbintools
 msgid "Going to look for the right cross-bins. Can (will) take some time !"
-msgstr ""
+msgstr "Je vais chercher les bons bacs transversaux. Cela peut (va) prendre du temps !"
 
 #: fpcupdeluxemainform.uplookuplibtools
 msgid "Going to look for the right cross-libraries. Can (will) take some time !"
-msgstr ""
+msgstr "Je vais chercher les bonnes bibliothèques croisées. Cela peut (va) prendre du temps !"
 
 #: fpcupdeluxemainform.uplookuptools
-msgid "Looking for fpcupdeluxe cross-tools on GitHub (if any)."
-msgstr ""
+msgid "Looking for FPCUPdeluxe cross-tools on GitHub (if any)."
+msgstr "Recherche d'outils croisés FPCUPdeluxe sur GitHub (s'il y en a)."
 
 #: fpcupdeluxemainform.upmissingtools
 msgid "The building of a crosscompiler failed due to missing cross-tools."
-msgstr ""
+msgstr "La construction d'un compilateur croisé a échoué en raison de l'absence de cross-tools."
 
 #: fpcupdeluxemainform.upquestioncontinue
 msgid "Do you want to continue ?"
-msgstr ""
+msgstr "Voulez-vous continuer ?"
+
+#: fpcupdeluxemainform.upquitrequest
+msgid "Please quit FPCUPdeluxe."
+msgstr "S'il te plaît, quitte FPCUPdeluxe."
 
 #: fpcupdeluxemainform.upremovecrosscompiler
 msgid "Going to remove the cross-compiler for"
-msgstr ""
+msgstr "Je vais supprimer le compilateur croisé pour"
 
 #: fpcupdeluxemainform.upremovemodule
 msgid "Going to remove module"
-msgstr ""
+msgstr "Je vais enlever le module"
 
 #: fpcupdeluxemainform.upselectfpclazarustarget
 msgid "Please select a FPC and Lazarus target first"
-msgstr ""
+msgstr "Veuillez d'abord sélectionner une cible FPC et Lazarus"
 
 #: fpcupdeluxemainform.upselectfpctarget
 msgid "Please select a FPC target first"
-msgstr ""
+msgstr "Veuillez d'abord sélectionner une cible FPC"
 
 #: fpcupdeluxemainform.upselectlazarustarget
 msgid "Please select a Lazarus target first"
-msgstr ""
+msgstr "Veuillez d'abord sélectionner une cible Lazarus"
 
 #: fpcupdeluxemainform.upspacewarning
 msgid "Having a space in your install path is very ill-advised !"
-msgstr ""
+msgstr "Avoir un espace dans votre chemin d'installation est très mal venu !"
 
 #: fpcupdeluxemainform.uptrybuildcrosscompiler
 msgid "Trying to build the cross-compiler for"
-msgstr ""
+msgstr "Essayer de construire le compilateur croisé pour"
 
 #: fpcupdeluxemainform.upupdatecrossall
 msgid "Going to update all crosscompilers"
-msgstr ""
+msgstr "Mise à jour de tous les compilateurs croisés"
 
 #: fpcupdeluxemainform.upupdatefound
-msgid "New fpcupdeluxe version available"
-msgstr "Nouvelle version de fpcupdeluxe disponible"
+msgid "New FPCUPdeluxe version available"
+msgstr "Nouvelle version de FPCUPdeluxe disponible"
 
 #: fpcupdeluxemainform.upupdatenotfound
 msgid "No updates found."
@@ -283,7 +307,7 @@ msgstr "exécutable \\\"%s \\\" est un répertoire"
 #: processutils.lisexecutablelacksthepermissiontorun
 #, object-pascal-format
 msgid "executable \"%s\" lacks the permission to run"
-msgstr "l'exécutable \"%s \" n'a pas la permission de s'exécuter"
+msgstr "L'exécutable \"%s \" n'a pas la permission de s'exécuter."
 
 #: processutils.lisexitcode
 #, object-pascal-format
@@ -321,7 +345,7 @@ msgstr "incapable de s'exécuter : %s"
 
 #: processutils.lisunabletoreadprocessexitstatus
 msgid "unable to read process ExitStatus"
-msgstr "impossible de lire le processus ExitStatus"
+msgstr "Impossible de lire le processus ExitStatus"
 
 #: tform1.actfileexit.caption
 msgid "E&xit"
@@ -394,7 +418,7 @@ msgstr "Essayer d'arrêter le processus d'installation en cours"
 
 #: tform1.bitbtnlazarusonly.caption
 msgid "Only Lazarus"
-msgstr "Seulement Lazare"
+msgstr "Seulement Lazarus"
 
 #: tform1.bitbtnlazarusonly.hint
 msgid "Only install/update selected Lazarus version."
@@ -455,7 +479,7 @@ msgstr "Envoyez un courriel au mainteneur de fpcup contenant la sortie de l'écr
 
 #: tform1.btnsetupplus.caption
 msgid "Setup+"
-msgstr "Setup+"
+msgstr "Ajuster+"
 
 #: tform1.btnsetupplus.hint
 msgid "Open the extended settings form."
@@ -503,7 +527,7 @@ msgstr "Définir la sous-architecture"
 
 #: tform1.buttonsubarchselect.hint
 msgid "Select a subarch for embedded target."
-msgstr "Sélectionner un sous-arche pour la cible intégrée."
+msgstr "Sélectionnez un sous-arche pour la cible intégrée."
 
 #: tform1.checkautoclear.caption
 msgid "Auto clear"
@@ -535,7 +559,7 @@ msgstr "ESP32"
 
 #: tform1.espbtn.hint
 msgid "Get FPC for ESP32 [lx6] boards"
-msgstr "Obtenir un FPC pour les cartes ESP32 [lx6]"
+msgstr "Obtenir un FPC pour les cartes ESP32 [lx6]."
 
 #: tform1.extrasheet.caption
 msgid "Extras"
@@ -543,7 +567,7 @@ msgstr "Extras"
 
 #: tform1.fixesbtn.caption
 msgid "Fixes"
-msgstr "Corrections"
+msgstr "Fixes"
 
 #: tform1.fixesbtn.hint
 msgid "Will install/update current fixes versions of both FPC and Lazarus"
@@ -610,8 +634,8 @@ msgid "Chinese (CN)"
 msgstr "Chinois (CN)"
 
 #: tform1.memosummary.hint
-msgid "Will show error"
-msgstr "Montrera l'erreur"
+msgid "Will show info and error"
+msgstr "Affiche les informations et les erreurs"
 
 #: tform1.menglishlanguage.caption
 msgid "English (EN)"
@@ -643,7 +667,7 @@ msgstr "Enregistrer le journal"
 
 #: tform1.mfpcbugs.caption
 msgid "FPC bugs"
-msgstr "Bogues du CPE"
+msgstr "Bogues du FPC"
 
 #: tform1.mfrenchlanguage.caption
 msgid "French (F)"
@@ -659,17 +683,15 @@ msgstr "Néerlandais (NL)"
 
 #: tform1.missuesforum.caption
 msgid "Up Lazarus forum"
-msgstr "Up Lazarus forum"
+msgstr "Aller à Lazarus forum"
 
 #: tform1.missuesgithub.caption
 msgid "Up GitHub issues"
-msgstr "Up GitHub issues"
+msgstr "Aller à GitHub issues"
 
 #: tform1.mkoreanlanguage.caption
-#, fuzzy
-#| msgid "Korean"
 msgid "Korean (KR)"
-msgstr "Coreen (KR)"
+msgstr "Coréen (KR)"
 
 #: tform1.mlazarusbugs.caption
 msgid "Lazarus bugs"
@@ -727,7 +749,7 @@ msgstr "Stable"
 
 #: tform1.stablebtn.hint
 msgid "Will install/update stable versions of both FPC and Lazarus"
-msgstr "Installera/mettra à jour les versions stables de FPC et Lazarus"
+msgstr "Installera/mettra à jour les versions stables de FPC et Lazarus."
 
 #: tform1.statusmessage.text
 msgid "Sitting and waiting"
@@ -771,7 +793,7 @@ msgstr "Ajouter un patch FPC"
 
 #: tform2.btnaddlazpatch.caption
 msgid "Add Laz. patch"
-msgstr "Ajouter Laz. patch"
+msgstr "Ajouter un patch Laz."
 
 #: tform2.btnlistcustomoptions.caption
 msgid "List All"
@@ -779,11 +801,11 @@ msgstr "Lister tout"
 
 #: tform2.btnremfpcpatch.caption
 msgid "Rem. FPC patch"
-msgstr "Rem. FPC patch"
+msgstr "Retirer FPC patch"
 
 #: tform2.btnremlazpatch.caption
 msgid "Rem. Laz. patch"
-msgstr "Rem. Laz. patch"
+msgstr "Retirer Laz. patch"
 
 #: tform2.btnselectbindir.caption
 msgid "Tools"
@@ -880,7 +902,7 @@ msgstr "Annulation des options de compilation croisée (p.e. -CfSoft)"
 
 #: tform2.labelfpcbranch.caption
 msgid "FPC branch"
-msgstr "Branche CPE"
+msgstr "Branche FPC"
 
 #: tform2.labelfpcoptions.caption
 msgid "FPC options"
@@ -888,19 +910,19 @@ msgstr "Options FPC"
 
 #: tform2.labelfpcpostinstall.caption
 msgid "FPC post"
-msgstr "Poste CPE"
+msgstr "Poste FPC"
 
 #: tform2.labelfpcpreinstall.caption
 msgid "FPC pre"
-msgstr "FPC pre"
+msgstr "FPC pré"
 
 #: tform2.labelfpcrevision.caption
 msgid "FPC hash/tag"
-msgstr "hash/tag FPC"
+msgstr "FPC hash/tag"
 
 #: tform2.labellazarusbranch.caption
 msgid "Laz. branch"
-msgstr "Branche Laz"
+msgstr "Branche Laz."
 
 #: tform2.labellazarusoptions.caption
 msgid "Laz. options"
@@ -908,11 +930,11 @@ msgstr "Laz. options"
 
 #: tform2.labellazaruspostinstall.caption
 msgid "Lazarus post"
-msgstr "Poste de Lazare"
+msgstr "Poste Lazarus"
 
 #: tform2.labellazaruspreinstall.caption
 msgid "Lazarus pre"
-msgstr "Lazare pré"
+msgstr "Lazarus pré"
 
 #: tform2.labellazarusrevision.caption
 msgid "Laz. hash/tag"
@@ -932,7 +954,7 @@ msgstr "Options de recherche"
 
 #: tform2.rgrpsubarch.caption
 msgid "Select subarch"
-msgstr "Sélectionner la sous-division"
+msgstr "Sélectionnez subarch"
 
 #: tform2.tscpuos.caption
 msgid "CPU/OS"
diff --git a/languages/fpcupdeluxe.ko.po b/languages/fpcupdeluxe.ko.po
index b2b08e58..89082bee 100644
--- a/languages/fpcupdeluxe.ko.po
+++ b/languages/fpcupdeluxe.ko.po
@@ -740,7 +740,7 @@ msgstr "Stable"
 msgid "Will install/update stable versions of both FPC and Lazarus"
 msgstr "FPC 및 Lazarus의 안정적인 버전 설치/업데이트"
 
-#: tform1.statusmessage.text
+#: fpcupdeluxemainform.statusmessage.text
 msgid "Sitting and waiting"
 msgstr "기다리세요"
 
diff --git a/languages/fpcupdeluxe.nl.po b/languages/fpcupdeluxe.nl.po
index 1a9a69fc..cfb94d8b 100644
--- a/languages/fpcupdeluxe.nl.po
+++ b/languages/fpcupdeluxe.nl.po
@@ -394,7 +394,11 @@ msgstr "kan proces niet lezen ExitStatus"
 msgid "E&xit"
 msgstr "Einde"
 
-#: tform1.actfileexit.hint tform1.menuitem5.caption
+#: tform1.actfileexit.hint
+msgid "Exit"
+msgstr "Afsluiten"
+
+#: tform1.menuitem5.caption
 msgid "Exit"
 msgstr "Afsluiten"
 
@@ -793,7 +797,7 @@ msgstr "Stabiel"
 msgid "Will install/update stable versions of both FPC and Lazarus"
 msgstr "Zal stabiele versies van zowel FPC als Lazarus installeren/bijwerken"
 
-#: tform1.statusmessage.text
+#: fpcupdeluxemainform.statusmessage.text
 msgid "Sitting and waiting"
 msgstr "Zitten en wachten"
 
diff --git a/languages/fpcupdeluxe.zh.po b/languages/fpcupdeluxe.zh.po
index f715b268..d8da0cdf 100644
--- a/languages/fpcupdeluxe.zh.po
+++ b/languages/fpcupdeluxe.zh.po
@@ -35,7 +35,7 @@ msgstr "仅使用 FPCUP 引导程序。"
 
 #: extrasettings.captioncheckgetupdates
 msgid "Check for fpcupdeluxe updates."
-msgstr "检查 FPCupDeluxe 更新。"
+msgstr "检查 FPCUPdeluxe 更新。"
 
 #: extrasettings.captioncheckincludehelp
 msgid "Include Help."
@@ -92,7 +92,7 @@ msgstr "双击 FPC 和拉撒路文件将打开拉撒路。"
 
 #: extrasettings.hintcheckapplylocalchanges
 msgid "Fpcupdeluxe can re-apply the local changes automagically by using local auto-patch."
-msgstr "通过使用本地自动修补，FPCupDeluxe 可以自动重新应用本地更改。"
+msgstr "通过使用本地自动修补，FPCUPdeluxe 可以自动重新应用本地更改。"
 
 #: extrasettings.hintcheckaskconfirmation
 msgid "Show a confirmation dialog with yes/no before every build."
@@ -100,15 +100,15 @@ msgstr "在每次生成之前显示一个带有“是/否”的确认对话框
 
 #: extrasettings.hintcheckenableonlinepatching
 msgid "Fpcupdeluxe can patch the sources automagically by using online patches."
-msgstr "FPCupDeluxe 可以使用在线补丁程序自动修补源代码。"
+msgstr "FPCUPdeluxe 可以使用在线补丁程序自动修补源代码。"
 
 #: extrasettings.hintcheckforcelocalrepoclient
 msgid "Use the repo-client by fpcupdeluxe."
-msgstr "通过 fpcupdeluxe 使用 repo-client."
+msgstr "通过 FPCUPdeluxe 使用 repo-client."
 
 #: extrasettings.hintcheckgetupdates
 msgid "Check for updates of fpcupdeluxe binaries."
-msgstr "检查 fpcupdeluxe 二进制文件的更新。"
+msgstr "检查 FPCUPdeluxe 二进制文件的更新。"
 
 #: extrasettings.hintcheckrepo
 msgid "Download whole repository, or only latest files."
@@ -116,7 +116,7 @@ msgstr "下载整个存储库，或仅下载最新文件。"
 
 #: extrasettings.hintchecksendinfo
 msgid "Location and install info will be send to public central fpcupdeluxe server."
-msgstr "位置和安装信息将发送到公共中心 FPCupDeluxe 服务器。"
+msgstr "位置和安装信息将发送到公共中心 FPCUPdeluxe 服务器。"
 
 #: extrasettings.hintchecksystemfpc
 msgid "Use the system wide install of FPC to build Lazarus."
@@ -129,7 +129,7 @@ msgstr "启用 80 位浮点数的软件模拟。"
 
 #: fpcupdeluxemainform.upadvertisetools
 msgid "Fpcupdeluxe can try to download them if available !"
-msgstr ""
+msgstr "FPCUPdeluxe 可以尝试下载它们（如果可用）"
 
 #: fpcupdeluxemainform.upbuildallcrosscompilers
 msgid "Going to auto-build all installed cross-compilers !"
@@ -157,7 +157,7 @@ msgstr "请稍等。正在检查更新。"
 
 #: fpcupdeluxemainform.upinstallcrosscompiler
 msgid "Going to install the cross-compiler for"
-msgstr ""
+msgstr "准备安装交叉编译器"
 
 #: fpcupdeluxemainform.upinstalldirectory
 msgid "Install directory"
@@ -165,55 +165,55 @@ msgstr ""
 
 #: fpcupdeluxemainform.upinstalldirectorycurrent
 msgid "Current install directory"
-msgstr ""
+msgstr "当前安装目录"
 
 #: fpcupdeluxemainform.upinstallfpc
 msgid "Going to install/update FPC."
-msgstr ""
+msgstr "准备安装/更新 FPC"
 
 #: fpcupdeluxemainform.upinstallfpclazarus
 msgid "Going to install/update FPC and Lazarus."
-msgstr ""
+msgstr "准备安装/更新 FPC 和 Lazarus"
 
 #: fpcupdeluxemainform.upinstalllazarus
 msgid "Going to install/update Lazarus."
-msgstr ""
+msgstr "安装/更新 Lazarus"
 
 #: fpcupdeluxemainform.upinstallmodule
 msgid "Going to install/update module"
-msgstr ""
+msgstr "安装/更新模块"
 
 #: fpcupdeluxemainform.upinstallsettingscurrent
 msgid "Got settings from install directory"
-msgstr ""
+msgstr "从安装目录获取设置"
 
 #: fpcupdeluxemainform.uplookup
 msgid "Looking for"
-msgstr ""
+msgstr "寻找"
 
 #: fpcupdeluxemainform.uplookupbintools
 msgid "Going to look for the right cross-bins. Can (will) take some time !"
-msgstr ""
+msgstr "去寻找合适的交叉箱。 可以（将）需要一些时间"
 
 #: fpcupdeluxemainform.uplookuplibtools
 msgid "Going to look for the right cross-libraries. Can (will) take some time !"
-msgstr ""
+msgstr "去寻找合适的交叉库。 可以（将）需要一些时间"
 
 #: fpcupdeluxemainform.uplookuptools
 msgid "Looking for fpcupdeluxe cross-tools on GitHub (if any)."
-msgstr ""
+msgstr "在 GitHub 上寻找 fpcupdeluxe 交叉工具（如果有的话）"
 
 #: fpcupdeluxemainform.upmissingtools
 msgid "The building of a crosscompiler failed due to missing cross-tools."
-msgstr ""
+msgstr "由于缺少交叉工具，交叉编译器的构建失败"
 
 #: fpcupdeluxemainform.upquestioncontinue
 msgid "Do you want to continue ?"
-msgstr ""
+msgstr "你想继续吗"
 
 #: fpcupdeluxemainform.upremovecrosscompiler
 msgid "Going to remove the cross-compiler for"
-msgstr ""
+msgstr "将删除交叉编译器"
 
 #: fpcupdeluxemainform.upremovemodule
 msgid "Going to remove module"
@@ -221,27 +221,27 @@ msgstr ""
 
 #: fpcupdeluxemainform.upselectfpclazarustarget
 msgid "Please select a FPC and Lazarus target first"
-msgstr ""
+msgstr "请先选择一个 FPC 和 Lazarus 目标"
 
 #: fpcupdeluxemainform.upselectfpctarget
 msgid "Please select a FPC target first"
-msgstr ""
+msgstr "请先选择一个 FPC 目标"
 
 #: fpcupdeluxemainform.upselectlazarustarget
 msgid "Please select a Lazarus target first"
-msgstr ""
+msgstr "请先选择一个 Lazarus 目标"
 
 #: fpcupdeluxemainform.upspacewarning
 msgid "Having a space in your install path is very ill-advised !"
-msgstr ""
+msgstr "在您的安装路径中有一个空间是非常不明智的"
 
 #: fpcupdeluxemainform.uptrybuildcrosscompiler
 msgid "Trying to build the cross-compiler for"
-msgstr ""
+msgstr "尝试构建交叉编译器"
 
 #: fpcupdeluxemainform.upupdatecrossall
 msgid "Going to update all crosscompilers"
-msgstr ""
+msgstr "将更新所有交叉编译器"
 
 #: fpcupdeluxemainform.upupdatefound
 msgid "New fpcupdeluxe version available"
@@ -635,6 +635,10 @@ msgstr "法语（F）"
 msgid "German (D)"
 msgstr "德语（D）"
 
+#: tform1.mdutchlanguage.caption
+msgid "Dutch (NL)"
+msgstr "荷兰语（NL）"
+
 #: tform1.missuesforum.caption
 msgid "Up Lazarus forum"
 msgstr "拉撒路论坛"
@@ -681,11 +685,11 @@ msgstr "获取 ARMV6M RPI Pico 的 FPC"
 
 #: tform1.radgrpcpu.caption
 msgid "CPU"
-msgstr "中央处理器"
+msgstr "CPU"
 
 #: tform1.radgrpos.caption
 msgid "OS"
-msgstr "奥斯"
+msgstr "OS"
 
 #: tform1.realfpcurl.hint
 msgctxt "tform1.realfpcurl.hint"
@@ -705,7 +709,7 @@ msgstr "稳定的"
 msgid "Will install/update stable versions of both FPC and Lazarus"
 msgstr "将安装/更新 FPC 和 Lazarus 的稳定版本"
 
-#: tform1.statusmessage.text
+#: fpcupdeluxemainform.statusmessage.text
 msgid "Sitting and waiting"
 msgstr "坐着等待"
 
@@ -896,7 +900,7 @@ msgstr "拉兹。哈希/标签"
 
 #: tform2.labelos.caption
 msgid "Select OS"
-msgstr "选择操作系统"
+msgstr "选择 OS"
 
 #: tform2.radiogrouparmarch.caption
 msgid "ARM target"
@@ -912,9 +916,35 @@ msgstr "选择子拱"
 
 #: tform2.tscpuos.caption
 msgid "CPU/OS"
-msgstr "CPU/操作系统"
+msgstr "CPU/OS"
 
 #: tform2.tssubarch.caption
 msgid "Subarch"
 msgstr "亚拱"
 
+#: fpcupdeluxemainform.updarwinfolderwarning1
+msgid "FPCUPdeluxe cannot be run inside the Downloads folder."
+msgstr "FPCUPdeluxe 无法在 Downloads 文件夹中运行。"
+
+#: fpcupdeluxemainform.updarwinfolderwarning2
+msgctxt "fpcupdeluxemainform.updarwinfolderwarning2"
+msgid "This is NOT allowed by OSX security measures."
+msgstr "这是 OSX 安全措施所不允许的。"
+
+#: fpcupdeluxemainform.updarwinfolderwarning3
+msgid "Copy FPCUPdeluxe into its own directory and run from there."
+msgstr "将 FPCUPdeluxe 复制到它自己的目录中并从那里运行。"
+
+#: fpcupdeluxemainform.upfolderwarning1
+msgctxt "fpcupdeluxemainform.upfolderwarning1"
+msgid "FPCUPdeluxe could not create its necessary setting-files."
+msgstr "FPCupDeluxe 无法创建必要的设置文件。"
+
+#: fpcupdeluxemainform.upfolderwarning2
+msgctxt "fpcupdeluxemainform.upfolderwarning2"
+msgid "Please check the folder permissions, and re-start."
+msgstr "请检查文件夹权限，然后重新启动。"
+
+#: fpcupdeluxemainform.upquitrequest
+msgid "Please quit FPCUPdeluxe."
+msgstr "请退出 FPCUPdeluxe."
diff --git a/public/gitrevision.txt b/public/gitrevision.txt
index 9b23cfb2..d48ebe75 100644
--- a/public/gitrevision.txt
+++ b/public/gitrevision.txt
@@ -1 +1 @@
-[master]r2.2.0n-2632(930bc1e)
+[master]r2.2.0n-2633(284baa3)
diff --git a/sources/updeluxe/fpcupdeluxemainform.pas b/sources/updeluxe/fpcupdeluxemainform.pas
index 0982e48a..d20d9f4d 100644
--- a/sources/updeluxe/fpcupdeluxemainform.pas
+++ b/sources/updeluxe/fpcupdeluxemainform.pas
@@ -316,9 +316,6 @@   TForm1 = class(TForm)
   upInstallDirectoryCurrent = 'Current install directory';
   upInstallSettingsCurrent = 'Got settings from install directory';
 
-
-  // New
-
   upDarwinFolderWarning1 = 'FPCUPdeluxe cannot be run inside the Downloads folder.';
   upDarwinFolderWarning2 = 'This is NOT allowed by OSX security measures.';
   upDarwinFolderWarning3 = 'Copy FPCUPdeluxe into its own directory and run from there.';
diff --git a/up.res b/up.res
index 7ef55823..97650647 100644
Binary files a/up.res and b/up.res differ