diff --git a/applications/json_packager/deploywin/locale/jsoneditor.en.po b/applications/json_packager/deploywin/locale/jsoneditor.en.po
index cb0b69456..1c17bd98b 100644
--- a/applications/json_packager/deploywin/locale/jsoneditor.en.po
+++ b/applications/json_packager/deploywin/locale/jsoneditor.en.po
@@ -37,17 +37,17 @@ msgstr ""
"Remove Package File:\n"
"Deletes the last entry from the list\n"
-#: tfrmmain.cbforceupdate.caption
-msgid "Force Update"
-msgstr "Force Update"
+#: tfrmmain.cbforcenotify.caption
+msgid "Force Notify"
+msgstr "Force Notify"
-#: tfrmmain.cbforceupdate.hint
+#: tfrmmain.cbforcenotify.hint
msgid ""
-"Force Update check box:\n"
+"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 ""
-"Force Update check box:\n"
+"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"
diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi
index 0e3ca3850..740d1c28b 100644
--- a/applications/json_packager/jsonpackage.lpi
+++ b/applications/json_packager/jsonpackage.lpi
@@ -24,7 +24,7 @@
-
+
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index 3e6c2d0f6..3d405e2bc 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -3,14 +3,14 @@
-
+
-
+
@@ -20,12 +20,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -33,7 +33,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,123 +129,123 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res
index f3302118f..4dab5e6be 100644
Binary files a/applications/json_packager/jsonpackage.res and b/applications/json_packager/jsonpackage.res differ
diff --git a/applications/json_packager/locale/jsoneditor.en.po b/applications/json_packager/locale/jsoneditor.en.po
index cb0b69456..1c17bd98b 100644
--- a/applications/json_packager/locale/jsoneditor.en.po
+++ b/applications/json_packager/locale/jsoneditor.en.po
@@ -37,17 +37,17 @@ msgstr ""
"Remove Package File:\n"
"Deletes the last entry from the list\n"
-#: tfrmmain.cbforceupdate.caption
-msgid "Force Update"
-msgstr "Force Update"
+#: tfrmmain.cbforcenotify.caption
+msgid "Force Notify"
+msgstr "Force Notify"
-#: tfrmmain.cbforceupdate.hint
+#: tfrmmain.cbforcenotify.hint
msgid ""
-"Force Update check box:\n"
+"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 ""
-"Force Update check box:\n"
+"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"
diff --git a/applications/json_packager/locale/jsoneditor.es.po b/applications/json_packager/locale/jsoneditor.es.po
index d256abe85..6c91becb8 100644
--- a/applications/json_packager/locale/jsoneditor.es.po
+++ b/applications/json_packager/locale/jsoneditor.es.po
@@ -37,13 +37,13 @@ msgstr ""
"Quitar Archivo de Paquete:\n"
"Elimina la última entrada de la lista\n"
-#: tfrmmain.cbforceupdate.caption
-msgid "Force Update"
-msgstr "Forzar Actualización"
+#: tfrmmain.cbforcenotify.caption
+msgid "Force Notify"
+msgstr "Forzar Actualizaciones"
-#: tfrmmain.cbforceupdate.hint
+#: tfrmmain.cbforcenotify.hint
msgid ""
-"Force Update check box:\n"
+"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 ""
@@ -69,8 +69,6 @@ msgstr ""
"como un archivo JSON de actualización\n"
#: tfrmmain.editdownloadzipurl.hint
-#, fuzzy
-msgctxt "tfrmmain.editdownloadzipurl.hint"
msgid ""
"Download URL:\n"
"Include the FULL url needed to download the package Zip file\n"
@@ -211,26 +209,18 @@ msgid "Compiled with FPC V:%s and Lazarus V:%d.%d%s for the %s - %s platform%s%s
msgstr "Compilado con FPC V:%s y Lazarus V:%d.%d%s para la plataforma %s - %s %s%s"
#: umain.rsdownloadzipurld
-#, fuzzy
-msgctxt "umain.rsdownloadzipurld"
msgid "- Download URL does not contain the zipfile name"
msgstr "- URL de descarga no contiene el nombre del zip"
#: umain.rsdownloadzipurli
-#, fuzzy
-msgctxt "umain.rsdownloadzipurli"
msgid "- Download URL is too short or missing"
msgstr "- URL de descarga es muy corta o está vacía"
#: umain.rsdownloadzipurli2
-#, fuzzy
-msgctxt "umain.rsdownloadzipurli2"
msgid "- Download URL is incomplete"
msgstr "- URL de descarga incompleta"
#: umain.rsdownloadzipurls
-#, fuzzy
-msgctxt "umain.rsdownloadzipurls"
msgid "- Download URL should start with \"http\""
msgstr "- URL de descarga debe empezar con \"http\""
@@ -267,7 +257,6 @@ msgid "One of the required fields is missing or wrong."
msgstr "Uno de los campos requeridos esta vacío o mal."
#: umain.rsoneofthereqn
-msgctxt "umain.rsoneofthereqn"
msgid "One or more of the required fields are missing or wrong."
msgstr "Uno de los campos requeridos esta vacío o mal. Arréglalo, luego intenta de nuevo."
diff --git a/applications/json_packager/locale/jsoneditor.po b/applications/json_packager/locale/jsoneditor.po
index 782fa9a60..e36092afc 100644
--- a/applications/json_packager/locale/jsoneditor.po
+++ b/applications/json_packager/locale/jsoneditor.po
@@ -22,13 +22,14 @@ msgid ""
"Deletes the last entry from the list\n"
msgstr ""
-#: tfrmmain.cbforceupdate.caption
-msgid "Force Update"
+#: tfrmmain.cbforcenotify.caption
+msgid "Force Notify"
msgstr ""
-#: tfrmmain.cbforceupdate.hint
+#: tfrmmain.cbforcenotify.hint
+msgctxt "tfrmmain.cbforcenotify.hint"
msgid ""
-"Force Update check box:\n"
+"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 ""
diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm
index 1f825d599..353616267 100644
--- a/applications/json_packager/umain.lfm
+++ b/applications/json_packager/umain.lfm
@@ -35,15 +35,15 @@ object frmMain: TfrmMain
Color = clWindow
TabOrder = 0
end
- object cbForceUpdate: TCheckBox
+ object cbForceNotify: TCheckBox
Left = 8
Height = 19
- Hint = 'Force Update check box:'#13#10'If this is checked the OPM user will be notified'#13#10'of your update. Only check this if the update is important.'
+ Hint = 'Force Notify check box:'#13#10'If this is checked the OPM user will be notified'#13#10'of your update. Only check this if the update is important.'
Top = 72
- Width = 90
- Caption = 'Force Update'
+ Width = 85
+ Caption = 'Force Notify'
Color = clWindow
- OnMouseUp = cbForceUpdateMouseUp
+ OnMouseUp = cbForceNotifyMouseUp
ParentColor = False
TabOrder = 1
end
diff --git a/applications/json_packager/umain.lrj b/applications/json_packager/umain.lrj
index c1af9d3e7..fae00fefe 100644
--- a/applications/json_packager/umain.lrj
+++ b/applications/json_packager/umain.lrj
@@ -1,8 +1,8 @@
{"version":1,"strings":[
{"hash":183952426,"name":"tfrmmain.lblname.caption","sourcebytes":[85,112,100,97,116,101,32,90,105,112,32,78,97,109,101,58],"value":"Update Zip Name:"},
{"hash":260482813,"name":"tfrmmain.editname.hint","sourcebytes":[85,112,100,97,116,101,32,90,105,112,32,78,97,109,101,58,13,10,84,104,105,115,32,105,115,32,106,117,115,116,32,116,104,101,32,102,105,108,101,110,97,109,101,32,40,110,111,116,32,105,110,99,108,117,100,105,110,103,32,116,104,101,32,112,97,116,104,41,13,10,111,102,32,121,111,117,114,32,117,112,100,97,116,101,32,122,105,112,46,32,84,121,112,101,44,32,111,114,32,99,108,105,99,107,32,116,104,101,32,91,46,46,46,93],"value":"Update Zip Name:\r\nThis is just the filename (not including the path)\r\nof your update zip. Type, or click the [...]"},
-{"hash":190949342,"name":"tfrmmain.cbforceupdate.hint","sourcebytes":[70,111,114,99,101,32,85,112,100,97,116,101,32,99,104,101,99,107,32,98,111,120,58,13,10,73,102,32,116,104,105,115,32,105,115,32,99,104,101,99,107,101,100,32,116,104,101,32,79,80,77,32,117,115,101,114,32,119,105,108,108,32,98,101,32,110,111,116,105,102,105,101,100,13,10,111,102,32,121,111,117,114,32,117,112,100,97,116,101,46,32,32,79,110,108,121,32,99,104,101,99,107,32,116,104,105,115,32,105,102,32,116,104,101,32,117,112,100,97,116,101,32,105,115,32,105,109,112,111,114,116,97,110,116,46],"value":"Force Update check box:\r\nIf this is checked the OPM user will be notified\r\nof your update. Only check this if the update is important."},
-{"hash":17834453,"name":"tfrmmain.cbforceupdate.caption","sourcebytes":[70,111,114,99,101,32,85,112,100,97,116,101],"value":"Force Update"},
+{"hash":147876574,"name":"tfrmmain.cbforcenotify.hint","sourcebytes":[70,111,114,99,101,32,78,111,116,105,102,121,32,99,104,101,99,107,32,98,111,120,58,13,10,73,102,32,116,104,105,115,32,105,115,32,99,104,101,99,107,101,100,32,116,104,101,32,79,80,77,32,117,115,101,114,32,119,105,108,108,32,98,101,32,110,111,116,105,102,105,101,100,13,10,111,102,32,121,111,117,114,32,117,112,100,97,116,101,46,32,32,79,110,108,121,32,99,104,101,99,107,32,116,104,105,115,32,105,102,32,116,104,101,32,117,112,100,97,116,101,32,105,115,32,105,109,112,111,114,116,97,110,116,46],"value":"Force Notify check box:\r\nIf this is checked the OPM user will be notified\r\nof your update. Only check this if the update is important."},
+{"hash":27272873,"name":"tfrmmain.cbforcenotify.caption","sourcebytes":[70,111,114,99,101,32,78,111,116,105,102,121],"value":"Force Notify"},
{"hash":202110442,"name":"tfrmmain.lbldownloadzipurl.caption","sourcebytes":[68,111,119,110,108,111,97,100,32,85,82,76,58],"value":"Download URL:"},
{"hash":265021141,"name":"tfrmmain.editdownloadzipurl.hint","sourcebytes":[68,111,119,110,108,111,97,100,32,85,82,76,58,13,10,73,110,99,108,117,100,101,32,116,104,101,32,70,85,76,76,32,117,114,108,32,110,101,101,100,101,100,32,116,111,32,100,111,119,110,108,111,97,100,32,116,104,101,32,112,97,99,107,97,103,101,32,90,105,112,32,102,105,108,101],"value":"Download URL:\r\nInclude the FULL url needed to download the package Zip file"},
{"hash":57627770,"name":"tfrmmain.lblpackagefiles.caption","sourcebytes":[80,97,99,107,97,103,101,32,70,105,108,101,115,58],"value":"Package Files:"},
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index 5a9e420e2..d3ead688e 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -33,13 +33,14 @@ unit umain;
Comment out Self.AutoAdjustLayout line in Form.Create (GetMem)
Removed StrUtils from uses (minesadorada)
Fixed memory leaks with CFG and slErrorList (minesadorada)
- Moved inline procedure CreateUniqueINI to separate function
- Added Const C_DEBUGMESSAGES=TRUE/FALSE
+ Moved inline procedure CreateUniqueINI to separate function (minesadorada)
+ Added Const C_DEBUGMESSAGES=TRUE/FALSE (minesadorada)
0.1.14.0: Various changes (GetMem)
- BugFix: FormCloseQuery
- 0.1.15.0: BugFix: File/Save didn't add the '.json' suffix in Linux
- Addition: After Loading, run validation tests
- 0.1.16.0: ??
+ BugFix: FormCloseQuery(minesadorada)
+ 0.1.15.0: BugFix: File/Save didn't add the '.json' suffix in Linux (minesadorada)
+ Addition: After Loading, run validation tests(minesadorada)
+ 0.1.16.0: Renamed ForceUpdate to ForceNotify (GetMem/minesadorada)
+ 0.1.17.0: ??
}
{$mode objfpc}{$H+}
@@ -75,13 +76,13 @@ type
TUpdatePackageData = class(TPersistent)
private
FDownloadZipURL: string;
- FForceUpdate: boolean;
+ FForceNotify: boolean;
FName: string;
public
constructor Create;
published
property Name: string read FName write FName;
- property ForceUpdate: boolean read FForceUpdate write FForceUpdate;
+ property ForceNotify: boolean read FForceNotify write FForceNotify;
property DownloadZipURL: string read FDownloadZipURL write FDownloadZipURL;
end;
@@ -109,7 +110,7 @@ type
cmd_save: TBitBtn;
btnAdd: TButton;
btnRemove: TButton;
- cbForceUpdate: TCheckBox;
+ cbForceNotify: TCheckBox;
editName: TEdit;
editDownloadZipURL: TEdit;
FileOpen1: TFileOpen;
@@ -136,7 +137,7 @@ type
stringPackageFiles: TStringGrid;
procedure btnAddClick(Sender: TObject);
procedure btnRemoveClick(Sender: TObject);
- procedure cbForceUpdateMouseUp(Sender: TObject; Button: TMouseButton;
+ procedure cbForceNotifyMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: integer);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
@@ -228,7 +229,7 @@ resourcestring
constructor TUpdatePackageData.Create;
begin
FName := '';
- FForceUpdate := False;
+ FForceNotify := False;
FDownloadZipURL := '';
end;
@@ -357,18 +358,18 @@ begin
stringPackageFiles.RowCount := stringPackageFiles.RowCount - 1;
end;
-procedure TfrmMain.cbForceUpdateMouseUp(Sender: TObject; Button: TMouseButton;
+procedure TfrmMain.cbForceNotifyMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: integer);
var
s: string;
begin
if bDisableWarnings then
exit;
- if cbForceUpdate.Checked then
+ if cbForceNotify.Checked then
begin
s := rsThisOptionSh;
if MessageDlg(s, mtConfirmation, [mbOK, mbAbort], 0, mbAbort) = mrAbort then
- cbForceUpdate.Checked := False;
+ cbForceNotify.Checked := False;
end;
end;
@@ -495,7 +496,7 @@ begin
begin
editName.Text := JSONPackage.UpdatePackageData.Name;
editDownloadZipURL.Text := JSONPackage.UpdatePackageData.DownloadZipURL;
- cbForceUpdate.Checked := JSONPackage.UpdatePackageData.ForceUpdate;
+ cbForceNotify.Checked := JSONPackage.UpdatePackageData.ForceNotify;
stringPackageFiles.RowCount := JSONPackage.UpdatePackageFiles.Count + 1;
for i := 0 to JSONPackage.UpdatePackageFiles.Count - 1 do
begin
@@ -528,7 +529,7 @@ procedure TfrmMain.mnu_fileNewClick(Sender: TObject);
begin
editname.Text := rsMypackagenam;
editDownloadZipURL.Text := rsHttpWwwUpdat;
- cbForceUpdate.Checked := False;
+ cbForceNotify.Checked := False;
stringPackageFiles.RowCount := 1;
sJSONFilePath := '';
sZipDirectory := '';
@@ -751,7 +752,7 @@ begin
try
JSONPackage.UpdatePackageData.Name := editName.Text;
JSONPackage.UpdatePackageData.DownloadZipURL := editDownloadZipURL.Text;
- JSONPackage.UpdatePackageData.ForceUpdate := cbForceUpdate.Checked;
+ JSONPackage.UpdatePackageData.ForceNotify := cbForceNotify.Checked;
for i := 1 to stringPackageFiles.RowCount - 1 do
begin