diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi index 179976d59..b8590d4a9 100644 --- a/applications/json_packager/jsonpackage.lpi +++ b/applications/json_packager/jsonpackage.lpi @@ -28,7 +28,7 @@ - + diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps index 7bd48eac8..535662263 100644 --- a/applications/json_packager/jsonpackage.lps +++ b/applications/json_packager/jsonpackage.lps @@ -3,7 +3,7 @@ - + @@ -20,8 +20,8 @@ - - + + @@ -31,9 +31,9 @@ - - - + + + @@ -336,7 +336,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -387,7 +387,7 @@ - + @@ -396,7 +396,7 @@ - + @@ -422,123 +422,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res index d722e395c..5861b3b30 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 73419b8c9..48105eca1 100644 --- a/applications/json_packager/locale/jsoneditor.en.po +++ b/applications/json_packager/locale/jsoneditor.en.po @@ -391,3 +391,4 @@ msgstr "Would you like to copy %s to the %s folder?" #: umain.rsyoumayneedto msgid "(You may need to restart the app to see the change)" msgstr "(You may need to restart the app to see the change)" + diff --git a/applications/json_packager/locale/jsoneditor.es.po b/applications/json_packager/locale/jsoneditor.es.po index 613e175d4..6777319b0 100644 --- a/applications/json_packager/locale/jsoneditor.es.po +++ b/applications/json_packager/locale/jsoneditor.es.po @@ -384,3 +384,4 @@ msgstr "¿Quieres copiar %s a la carpeta %s?" #: umain.rsyoumayneedto msgid "(You may need to restart the app to see the change)" msgstr "(Quizás necesites reiniciar la aplicación para ver los cambios)" + diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm index 5a28196c7..4135ef598 100644 --- a/applications/json_packager/umain.lfm +++ b/applications/json_packager/umain.lfm @@ -1,7 +1,7 @@ object frmMain: TfrmMain - Left = 5 + Left = 537 Height = 398 - Top = 444 + Top = 192 Width = 618 Anchors = [] BorderIcons = [biSystemMenu] diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas index 12a552bb9..df64b0c18 100644 --- a/applications/json_packager/umain.pas +++ b/applications/json_packager/umain.pas @@ -66,7 +66,8 @@ unit umain; 0.2.5.0: BugFix: regression error: CreateUniqueINIFile (minesadorada) 0.2.6.0: Added feature: Help menu/AutoLoad Last File (minesadorada) 0.2.7.0: Updated: Save procedure (minesadorada) - 0.2.8.0: ?? + 0.2.8.0: BugFix: ValidationFailed repeated messages about FoundDuplicates + 0.2.9.0: ?? } {$mode objfpc}{$H+} @@ -1066,7 +1067,11 @@ begin SetDefaultLang('en', 'locale', True); if Length(GetDefaultLang) > 0 then begin - ShowMessageFmt(rsLanguageChan, [GetDefaultLang]); + if bIsVirgin then + ShowMessageFmt(rsLanguageChan + '%s' + rsYouMayNeedTo, [GetDefaultLang,LineEnding]) + else + ShowMessageFmt(rsLanguageChan, [GetDefaultLang]); + CFG.WriteString('Options', 'Language', GetDefaultLang); mnu_lang_en.Checked := True; end @@ -1083,7 +1088,10 @@ begin SetDefaultLang('es', 'locale', True); if Length(GetDefaultLang) > 0 then begin - ShowMessageFmt(rsLanguageChan, [GetDefaultLang]); + if bIsVirgin then + ShowMessageFmt(rsLanguageChan + '%s' + rsYouMayNeedTo, [GetDefaultLang,LineEnding]) + else + ShowMessageFmt(rsLanguageChan, [GetDefaultLang]); CFG.WriteString('Options', 'Language', GetDefaultLang); mnu_lang_es.Checked := True; end @@ -1188,11 +1196,12 @@ begin end; // Check for duplicate .lpk entries if FoundADuplicateLPK then - begin - ArrayEdtPackageFileName[iCount].Color := clYellow; - slErrorList.Add(Format(rsThereAreOneO, [LineEnding])); - Result := True; - end; + if slErrorList.IndexOf(Format(rsThereAreOneO, [LineEnding])) = -1 then + begin + ArrayEdtPackageFileName[iCount].Color := clYellow; + slErrorList.Add(Format(rsThereAreOneO, [LineEnding])); + Result := True; + end; end; end;