diff --git a/applications/json_packager/deploywin/json_packager.iss b/applications/json_packager/deploywin/json_packager.iss
index b08c48bb2..959e32d35 100644
--- a/applications/json_packager/deploywin/json_packager.iss
+++ b/applications/json_packager/deploywin/json_packager.iss
@@ -40,6 +40,9 @@ Source: "jsoneditor.exe"; DestDir: "{app}"; Check: not Is64BitInstallMode; Flags
 ; Source: "readme.txt"; DestDir: "{app}"; Flags: isreadme
 Source: ".\locale\jsoneditor.en.po"; DestDir: "{app}\locale";  Flags: solidbreak
 Source: ".\locale\jsoneditor.es.po"; DestDir: "{app}\locale";
+Source: ".\locale\jsoneditor.en.mo"; DestDir: "{app}\locale";
+Source: ".\locale\jsoneditor.es.mo"; DestDir: "{app}\locale";
+Source: ".\locale\jsoneditor.po"; DestDir: "{app}\locale";
 
 [Icons]
 Name: "{group}\External OPM JSON package Editor"; Filename: "{app}\jsoneditor.exe"
diff --git a/applications/json_packager/deploywin/locale/jsoneditor.po b/applications/json_packager/deploywin/locale/jsoneditor.po
new file mode 100644
index 000000000..ffab0c425
--- /dev/null
+++ b/applications/json_packager/deploywin/locale/jsoneditor.po
@@ -0,0 +1,321 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: jsoneditor\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: tfrmmain.btnadd.caption
+msgid "Add"
+msgstr ""
+
+#: tfrmmain.btnadd.hint
+msgid ""
+"Add Package File:\n"
+"The update zip can contain more than one lpk file\n"
+"deployed to the same place.\n"
+msgstr ""
+
+#: tfrmmain.btnremove.caption
+msgid "Remove"
+msgstr ""
+
+#: tfrmmain.btnremove.hint
+msgid ""
+"Remove Package File:\n"
+"Deletes the last entry from the list\n"
+msgstr ""
+
+#: tfrmmain.cbforcenotify.caption
+msgid "Force Notify"
+msgstr ""
+
+#: tfrmmain.cbforcenotify.hint
+msgid ""
+"Force Notify check box:\n"
+"If this is checked the OPM user will be notified\n"
+"of your update.  Only check this if the update is important.\n"
+msgstr ""
+
+#: tfrmmain.cmd_close.caption
+msgid "&Close"
+msgstr ""
+
+#: tfrmmain.cmd_save.caption
+msgid "&Save"
+msgstr ""
+
+#: tfrmmain.cmd_save.hint
+msgid ""
+"Save the current configuration to disk\n"
+"as a JSON update file\n"
+msgstr ""
+
+#: tfrmmain.editdownloadzipurl.hint
+msgid ""
+"Download URL:\n"
+"Include the FULL url needed to download the package Zip file\n"
+msgstr ""
+
+#: tfrmmain.editname.hint
+msgid ""
+"Update Zip Name:\n"
+"This is just the filename (not including the path)\n"
+"of your update zip. Type, or click the [...]\n"
+msgstr ""
+
+#: tfrmmain.filemenu.caption
+msgid "File"
+msgstr ""
+
+#: tfrmmain.fileopen1.caption
+msgid "&Open ..."
+msgstr ""
+
+#: tfrmmain.fileopen1.hint
+msgid "Open"
+msgstr ""
+
+#: tfrmmain.filesaveas1.caption
+msgid "&Save As ..."
+msgstr ""
+
+#: tfrmmain.filesaveas1.hint
+msgid "Save As"
+msgstr ""
+
+#: tfrmmain.lbldownloadzipurl.caption
+msgid "Download URL:"
+msgstr ""
+
+#: tfrmmain.lblname.caption
+msgid "Update Zip Name:"
+msgstr ""
+
+#: tfrmmain.lblpackagefiles.caption
+msgid "Package Files:"
+msgstr ""
+
+#: tfrmmain.loaditem.caption
+msgid "Load..."
+msgstr ""
+
+#: tfrmmain.mnu_filenew.caption
+msgid "New"
+msgstr ""
+
+#: tfrmmain.mnu_filesave.caption
+msgid "Save"
+msgstr ""
+
+#: tfrmmain.mnu_help.caption
+msgid "&Help"
+msgstr ""
+
+#: tfrmmain.mnu_helpabout.caption
+msgid "About.."
+msgstr ""
+
+#: tfrmmain.mnu_helpdisablewarnings.caption
+msgid "Disable warnings"
+msgstr ""
+
+#: tfrmmain.mnu_helpshowhints.caption
+msgid "Show Popup Hints"
+msgstr ""
+
+#: tfrmmain.mnu_lang.caption
+msgid "Languages.."
+msgstr ""
+
+#: tfrmmain.mnu_lang_en.caption
+msgid "English"
+msgstr ""
+
+#: tfrmmain.mnu_lang_es.caption
+msgid "Español"
+msgstr ""
+
+#: tfrmmain.saveasitem.caption
+msgid "Save As..."
+msgstr ""
+
+#: tfrmmain.sb_editname.caption
+msgid "..."
+msgstr ""
+
+#: tfrmmain.sb_editname.hint
+msgid ""
+"Update Zip Name:\n"
+"Click this to browse your system to find\n"
+" an existing Update Zip\n"
+msgstr ""
+
+#: tfrmmain.spd_checkurl.caption
+msgid "Check URL"
+msgstr ""
+
+#: tfrmmain.spd_checkurl.hint
+msgid "Attempting to Open URL"
+msgstr ""
+
+#: tfrmmain.stringpackagefiles.hint
+msgid ""
+"Package Files:\n"
+"[Add]:  to make a new entry\n"
+"[Remove]: Remove last entry\n"
+"lpk filename: i.e. mycontrol.lpk\n"
+"Version: The FULL version (i.e. not 1.0 but 1.0.0.0)\n"
+msgstr ""
+
+#: umain.rsabout
+msgid "About"
+msgstr ""
+
+#: umain.rscompiledwith2
+msgid "Compiled with FPC V:%s and Lazarus V:%d.%d%s for the %s - %s platform%s%s"
+msgstr ""
+
+#: umain.rsdownloadzipurld
+msgid "- Download URL does not contain the zipfile name"
+msgstr ""
+
+#: umain.rsdownloadzipurli
+msgid "- Download URL is too short or missing"
+msgstr ""
+
+#: umain.rsdownloadzipurli2
+msgid "- Download URL is incomplete"
+msgstr ""
+
+#: umain.rsdownloadzipurls
+msgid "- Download URL should start with \"http\""
+msgstr ""
+
+#: umain.rsfilemaybeuns
+msgid "JSON may be unsaved. Are you sure you want to quit?"
+msgstr ""
+
+#: umain.rsfixthentryag
+msgid "Fix, then try again."
+msgstr ""
+
+#: umain.rshelpandinfor
+msgid "Help and Information"
+msgstr ""
+
+#: umain.rshttpwwwupdat
+msgid "http://www.updatesite.com/myupdate/mypackagename.zip"
+msgstr ""
+
+#: umain.rslanguagechan
+msgid "Language changed to \"%s\"."
+msgstr ""
+
+#: umain.rslpkfilename
+msgid "lpk FileName"
+msgstr ""
+
+#: umain.rsmypackagenam
+msgid "mypackagename.zip"
+msgstr ""
+
+#: umain.rsoneofthereq1
+msgid "One of the required fields is missing or wrong."
+msgstr ""
+
+#: umain.rsoneofthereqn
+msgid "One or more of the required fields are missing or wrong."
+msgstr ""
+
+#: umain.rsoverwrite
+msgid "Overwrite"
+msgstr ""
+
+#: umain.rssavedok
+msgid "Saved OK"
+msgstr ""
+
+#: umain.rssaveunsucces
+msgid "Save unsuccessful"
+msgstr ""
+
+#: umain.rssorrycopyope
+msgid "Sorry - copy operation was unsuccessful"
+msgstr ""
+
+#: umain.rssorrythislan
+msgid "Sorry, this language is unavailable at this time."
+msgstr ""
+
+#: umain.rsswassuccessf
+msgid "%s was successfully copied to the %s folder"
+msgstr ""
+
+#: umain.rsthelpkentryd
+msgid "The .lpk entry #%d is missing the .lpk extension"
+msgstr ""
+
+#: umain.rsthelpkentryd2
+msgid "The .lpk entry #%d is is absent"
+msgstr ""
+
+#: umain.rstherearenolp
+msgid "- There are no .lpk files in the list yet"
+msgstr ""
+
+#: umain.rsthereareoneo
+msgid "- There are one or more .lpk entries with the same name.%s- Every .lpk entry must have a unique name."
+msgstr ""
+
+#: umain.rsthisoptionsh
+msgid "This option should only be used for crucial updates or bug-fixed packages. Are you OK with that?"
+msgstr ""
+
+#: umain.rsturnhintsoff
+msgid "(You can toggle these hints on/off in the Help menu)"
+msgstr ""
+
+#: umain.rsupdate
+msgid "Update"
+msgstr ""
+
+#: umain.rsupdatejsonsf
+msgid "Update file \"%s\" failed to load correctly."
+msgstr ""
+
+#: umain.rsupdatezipnam
+msgid "- Update zip name is too short or missing"
+msgstr ""
+
+#: umain.rsupdatezipnam2
+msgid "- Update zip name missing extension \".zip\""
+msgstr ""
+
+#: umain.rsversion0000
+msgid "Version (n.n.n.n)"
+msgstr ""
+
+#: umain.rsversionentry
+msgid "Version Entry #%d is absent"
+msgstr ""
+
+#: umain.rsversionentry2
+msgid "Version entry #%d needs to be of the form n.n.n.n"
+msgstr ""
+
+#: umain.rswouldyoulike
+msgid "Would you like to copy %s to the %s folder?"
+msgstr ""
+
+#: umain.rsyoumayneedto
+msgid "(You may need to restart the app to see the change)"
+msgstr ""
+
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index ee434597e..04a54ca92 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="10"/>
-    <BuildModes Active="DEBUG Win64"/>
+    <BuildModes Active="Win64"/>
     <Units Count="18">
       <Unit0>
         <Filename Value="jsonpackage.lpr"/>
@@ -160,7 +160,7 @@
     <OtherDefines Count="1">
       <Define0 Value="IGNOREPICTURE"/>
     </OtherDefines>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
         <Filename Value="umain.pas"/>
         <Caret Line="632" Column="23" TopLine="593"/>
@@ -262,25 +262,21 @@
         <Caret Line="77" Column="72" TopLine="43"/>
       </Position25>
       <Position26>
-        <Filename Value="umain.pas"/>
-        <Caret Line="34" Column="30" TopLine="52"/>
+        <Filename Value="D:\lazarustrunk\common_components\kcontrols_1.7\source\kgrids.pas"/>
+        <Caret Line="5887" Column="12" TopLine="5883"/>
       </Position26>
       <Position27>
         <Filename Value="D:\lazarustrunk\common_components\kcontrols_1.7\source\kgrids.pas"/>
-        <Caret Line="5887" Column="12" TopLine="5883"/>
+        <Caret Line="5885" Column="19" TopLine="5883"/>
       </Position27>
       <Position28>
-        <Filename Value="D:\lazarustrunk\common_components\kcontrols_1.7\source\kgrids.pas"/>
-        <Caret Line="5885" Column="19" TopLine="5883"/>
-      </Position28>
-      <Position29>
         <Filename Value="C:\NewPascalDarwin\lazarus\lcl\lcltype.pp"/>
         <Caret Line="1643" Column="21" TopLine="1619"/>
-      </Position29>
-      <Position30>
+      </Position28>
+      <Position29>
         <Filename Value="C:\NewPascalDarwin\lazarus\ide\lazarus.pp"/>
         <Caret Line="154" TopLine="108"/>
-      </Position30>
+      </Position29>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/applications/json_packager/locale/jsoneditor.en.mo b/applications/json_packager/locale/jsoneditor.en.mo
index 2f42acae9..85493cc43 100644
Binary files a/applications/json_packager/locale/jsoneditor.en.mo and b/applications/json_packager/locale/jsoneditor.en.mo differ
diff --git a/applications/json_packager/locale/jsoneditor.en.po b/applications/json_packager/locale/jsoneditor.en.po
index 070fbe351..f06b373dc 100644
--- a/applications/json_packager/locale/jsoneditor.en.po
+++ b/applications/json_packager/locale/jsoneditor.en.po
@@ -1,5 +1,15 @@
 msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: tfrmmain.btnadd.caption
 msgid "Add"
diff --git a/applications/json_packager/locale/jsoneditor.es.po b/applications/json_packager/locale/jsoneditor.es.po
index aec3882ce..e782ea1c5 100644
--- a/applications/json_packager/locale/jsoneditor.es.po
+++ b/applications/json_packager/locale/jsoneditor.es.po
@@ -20,7 +20,7 @@ msgid ""
 "Add Package File:\n"
 "The update zip can contain more than one lpk file\n"
 "deployed to the same place.\n"
-msgstr "Agregar archivo del paquete: La actualización postal puede contener más de un archivo LPK desplegado en el mismo lugar.\n"
+msgstr "Agregar archivo del paquete: La actualización postal puede contener más de un archivo LPK desplegado en el mismo lugar."
 
 #: tfrmmain.btnremove.caption
 msgid "Remove"
@@ -30,7 +30,7 @@ msgstr "Eliminar"
 msgid ""
 "Remove Package File:\n"
 "Deletes the last entry from the list\n"
-msgstr "Eliminar archivo del paquete: Borra la última entrada de la lista\n"
+msgstr "Eliminar archivo del paquete: Borra la última entrada de la lista"
 
 #: tfrmmain.cbforcenotify.caption
 msgid "Force Notify"
@@ -41,7 +41,7 @@ msgid ""
 "Force Notify check box:\n"
 "If this is checked the OPM user will be notified\n"
 "of your update.  Only check this if the update is important.\n"
-msgstr "Casilla de verificación notificar de fuerza: Si esto se comprueba se notificará al usuario de la OPM de su actualización.  Sólo esto Compruebe si la actualización es importante.\n"
+msgstr "Casilla de verificación notificar de fuerza: Si esto se comprueba se notificará al usuario de la OPM de su actualización.  Sólo esto Compruebe si la actualización es importante."
 
 #: tfrmmain.cmd_close.caption
 msgid "&Close"
@@ -55,13 +55,13 @@ msgstr "Guardar"
 msgid ""
 "Save the current configuration to disk\n"
 "as a JSON update file\n"
-msgstr "Guardar la configuración actual en el disco como un archivo de actualización JSON\n"
+msgstr "Guardar la configuración actual en el disco como un archivo de actualización JSON"
 
 #: tfrmmain.editdownloadzipurl.hint
 msgid ""
 "Download URL:\n"
 "Include the FULL url needed to download the package Zip file\n"
-msgstr "URL de descarga: Incluir el url COMPLETO necesario para descargar el archivo Zip del paquete\n"
+msgstr "URL de descarga: Incluir el url COMPLETO necesario para descargar el archivo Zip del paquete"
 
 #: tfrmmain.editname.hint
 msgid ""
@@ -157,7 +157,7 @@ msgid ""
 "Update Zip Name:\n"
 "Click this to browse your system to find\n"
 " an existing Update Zip\n"
-msgstr "Actualización Zip nombre: Haga clic aquí para ver su sistema para encontrar un Zip de actualización existentes\n"
+msgstr "Actualización Zip nombre: Haga clic aquí para ver su sistema para encontrar un Zip de actualización existentes"
 
 #: tfrmmain.spd_checkurl.caption
 msgid "Check URL"
@@ -323,3 +323,4 @@ msgstr "¿Quieres copiar la carpeta de %s %s?"
 #: umain.rsyoumayneedto
 msgid "(You may need to restart the app to see the change)"
 msgstr "(Puede que necesite reiniciar la aplicación para ver el cambio)"
+
diff --git a/applications/json_packager/locale/jsoneditor.mo b/applications/json_packager/locale/jsoneditor.mo
index f8f1859fb..89032fdf9 100644
Binary files a/applications/json_packager/locale/jsoneditor.mo and b/applications/json_packager/locale/jsoneditor.mo differ
diff --git a/applications/json_packager/locale/jsoneditor.po b/applications/json_packager/locale/jsoneditor.po
index 5124062b6..ffab0c425 100644
--- a/applications/json_packager/locale/jsoneditor.po
+++ b/applications/json_packager/locale/jsoneditor.po
@@ -1,5 +1,16 @@
 msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: jsoneditor\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
 #: tfrmmain.btnadd.caption
 msgid "Add"