Merge pull request #2 from willowrose/master

Language text (small changes)

Units/Forms/UFRMOperation.dfm

@@ -118,11 +118,11 @@ object FRMOperation: TFRMOperation
         Caption = ' Operation: '
         TabOrder = 0
         object lblDestAccount: TLabel
-          Left = 96
+          Left = 68
           Top = 42
-          Width = 68
+          Width = 95
           Height = 13
-          Caption = 'Dest. Account'
+          Caption = 'Destination account'
         end
         object lblAmount: TLabel
           Left = 255
@@ -132,11 +132,11 @@ object FRMOperation: TFRMOperation
           Caption = 'Amount'
         end
         object lblNewPrivateKey: TLabel
-          Left = 59
+          Left = 82
           Top = 85
-          Width = 83
+          Width = 78
           Height = 13
-          Caption = 'New Private Key:'
+          Caption = 'New private key'
         end
         object lblTransactionErrors: TLabel
           Left = 170
@@ -169,11 +169,11 @@ object FRMOperation: TFRMOperation
           ParentFont = False
         end
         object lblNewOwnerPublicKey: TLabel
-          Left = 59
+          Left = 50
           Top = 138
-          Width = 105
+          Width = 111
           Height = 13
-          Caption = 'New owner Public Key'
+          Caption = 'New owner'#39's public key'
         end
         object lblNewOwnerErrors: TLabel
           Left = 199
@@ -211,7 +211,7 @@ object FRMOperation: TFRMOperation
           Top = 62
           Width = 220
           Height = 17
-          Caption = 'Change Private key'
+          Caption = 'Change private key'
           TabOrder = 4
           OnClick = rbTransactionClick
         end
@@ -391,7 +391,7 @@ object FRMOperation: TFRMOperation
           Top = 53
           Width = 231
           Height = 17
-          Caption = 'Encrypted with Password'
+          Caption = 'Encrypted with password'
           TabOrder = 2
           OnClick = memoPayloadClick
         end

Units/Forms/UFRMOperation.pas

@@ -169,7 +169,7 @@ begin
 
   // Execute operation
   If FNode.AddOperation(nil,FOperation,errors) then begin
-    Application.MessageBox(PChar('Executed opreation:'+#10+FOperation.ToString),PChar(Application.Title),MB_OK+MB_ICONINFORMATION);
+    Application.MessageBox(PChar('Operation executed:'+#10+FOperation.ToString),PChar(Application.Title),MB_OK+MB_ICONINFORMATION);
     ModalResult := MrOk;
   end else begin
     raise Exception.Create(errors);
@@ -199,7 +199,7 @@ begin
   end else begin
     s := '';
     Repeat
-      if Not InputQuery('Wallet Password','Insert Wallet Password',s) then exit;
+      if Not InputQuery('Wallet password','Enter wallet password',s) then exit;
       FWalletKeys.WalletPassword := s;
     Until FWalletKeys.IsValidPassword;
     UpdateOperationOptions(errors);
@@ -416,7 +416,7 @@ begin
       end;
       i := WalletKeys.IndexOfAccountKey(P^.accountkey);
       if (i<0) then begin
-        errors := 'Private Key not found in Wallet... You cannot operate with this account';
+        errors := 'Private key not found in wallet... You cannot operate with this account';
         lblGlobalErrors.Caption := errors;
         exit;
       end;
@@ -427,7 +427,7 @@ begin
           bbPassword.Visible := true;
           bbPassword.Enabled := true;
         end else begin
-          errors := 'Private Key not found in Wallet, only public key. You cannot operate with this account';
+          errors := 'Private key not found in wallet, only public key. You cannot operate with this account';
         end;
         lblGlobalErrors.Caption := errors;
         exit;
@@ -449,14 +449,14 @@ begin
       lblChangeKeyErrors.Caption := '';
       lblNewOwnerErrors.Caption := '';
       rbEncryptedWithOldEC.Checked := false;
-      rbEncryptedWithEC.Caption := 'Encrypted with dest account public key';
+      rbEncryptedWithEC.Caption := 'Encrypted with dest. account public key';
       ebDestAccount.ParentFont := true;
       ebAmount.ParentFont := true;
       ebFee.ParentFont := true;
       cbNewPrivateKey.Font.Color := clGrayText;
       ebNewPublicKey.Font.Color := clGrayText;
       if not (TAccountComp.AccountTxtNumberToAccountNumber(ebDestAccount.Text,FTxDestAccount)) then begin
-        errors := 'Invalid dest account ('+ebDestAccount.Text+')';
+        errors := 'Invalid dest. account ('+ebDestAccount.Text+')';
         lblTransactionErrors.Caption := errors;
         exit;
       end;
@@ -471,7 +471,7 @@ begin
         exit;
       end;
       if (P^.balance<(FTxAmount+FFee)) then begin
-        errors := 'Insufficient founds';
+        errors := 'Insufficient funds';
         lblTransactionErrors.Caption := errors;
         exit;
       end;
@@ -492,7 +492,7 @@ begin
       ebNewPublicKey.Font.Color := clGrayText;
       //
       if cbNewPrivateKey.ItemIndex<0 then begin
-        errors := 'Must select a new Private key';
+        errors := 'Must select a new private key';
         lblChangeKeyErrors.Caption := errors;
         exit;
 
@@ -597,7 +597,7 @@ begin
           valid := payload_encrypted<>'';
         end else begin
           valid := false;
-          errors := 'New owner public key not valid';
+          errors := 'New owner of public key not valid';
         end;
       end else begin
         errors := 'Must select operation type to encrypt payload';

Units/Forms/UFRMPascalCoinWalletConfig.dfm

@@ -61,9 +61,9 @@ object FRMPascalCoinWalletConfig: TFRMPascalCoinWalletConfig
   object Label5: TLabel
     Left = 30
     Top = 176
-    Width = 60
+    Width = 58
     Height = 13
-    Caption = 'CPU'#39's to use'
+    Caption = 'CPUs to use'
   end
   object lblMaxCPUS: TLabel
     Left = 248
@@ -231,7 +231,7 @@ object FRMPascalCoinWalletConfig: TFRMPascalCoinWalletConfig
     Top = 359
     Width = 171
     Height = 17
-    Caption = 'Show Modal Messages'
+    Caption = 'Show modal messages'
     TabOrder = 13
   end
   object udCPUs: TUpDown
@@ -267,7 +267,7 @@ object FRMPascalCoinWalletConfig: TFRMPascalCoinWalletConfig
       Top = 20
       Width = 301
       Height = 17
-      Caption = 'Generate a new Private Key for each new generated block'
+      Caption = 'Generate a new private key for each generated block'
       TabOrder = 0
     end
     object rbUseARandomKey: TRadioButton
@@ -275,7 +275,7 @@ object FRMPascalCoinWalletConfig: TFRMPascalCoinWalletConfig
       Top = 40
       Width = 216
       Height = 17
-      Caption = 'Use a random existing Key'
+      Caption = 'Use a random existing key'
       TabOrder = 1
     end
     object rbMineAllwaysWithThisKey: TRadioButton
@@ -283,7 +283,7 @@ object FRMPascalCoinWalletConfig: TFRMPascalCoinWalletConfig
       Top = 61
       Width = 216
       Height = 17
-      Caption = 'Mine allways with this Key:'
+      Caption = 'Always mine with this key:'
       TabOrder = 2
     end
     object cbPrivateKeyToMine: TComboBox

Units/Forms/UFRMPayloadDecoder.pas

@@ -213,7 +213,7 @@ begin
         lblDecodedMethod.Caption := 'Encrypted with EC '+TAccountComp.GetECInfoTxt(WalletKey.PrivateKey.EC_OpenSSL_NID);
       end else if (cbUsingPasswords.Checked) And (UsePassword(raw,Decrypted,PasswordUsed)) then begin
         memoDecoded.Lines.Text := Decrypted;
-        lblDecodedMethod.Caption := 'Encrypted with Pwd:"'+PasswordUsed+'"';
+        lblDecodedMethod.Caption := 'Encrypted with pwd:"'+PasswordUsed+'"';
       end else begin
         memoDecoded.Lines.Text := 'CANNOT DECRYPT';
         lblDecodedMethod.Caption := '';

Units/Forms/UFRMWallet.dfm

@@ -792,10 +792,6 @@ object FRMWallet: TFRMWallet
     object tsNodeStats: TTabSheet
       Caption = 'Node Stats'
       ImageIndex = 3
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       DesignSize = (
         891
         420)
@@ -1043,7 +1039,7 @@ object FRMWallet: TFRMWallet
     Left = 105
     Top = 180
     Bitmap = {
-      494C010102000800C00010003000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010102000800C40010003000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000003000000001002000000000000030
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000002A292929D60B0B0BF4111111EE0000006B000000000000

Units/Forms/UFRMWallet.pas

@@ -266,14 +266,14 @@ begin
   FIsActivated := true;
   try
     // Check OpenSSL dll
-    if Not LoadSSLCrypt then raise Exception.Create('Cannot load '+SSL_C_LIB+#10+'To use this software make sure this file is available on you system or reinstall this Application');
+    if Not LoadSSLCrypt then raise Exception.Create('Cannot load '+SSL_C_LIB+#10+'To use this software make sure this file is available on you system or reinstall the application');
     TCrypto.InitCrypto;
     // Read Wallet
     Try
       FWalletKeys.WalletFileName := TFolderHelper.GetPascalCoinDataFolder+'\WalletKeys.dat';
     Except
       On E:Exception do begin
-        E.Message := 'Cannot open your Wallet... Perhaps another instance of Pascal Coin is active!'+#10+#10+E.Message;
+        E.Message := 'Cannot open your wallet... Perhaps another instance of Pascal Coin is active!'+#10+#10+E.Message;
         Raise;
       end;
     End;
@@ -339,7 +339,7 @@ Var basem,m : String;
   nc : TNetConnection;
 begin
   CheckIsReady;
-  if (lbNetConnections.SelCount<=0) Or (lbNetConnections.ItemIndex<0) then raise Exception.Create('Select at least 1 connection');
+  if (lbNetConnections.SelCount<=0) Or (lbNetConnections.ItemIndex<0) then raise Exception.Create('Select at least one connection');
   if lbNetConnections.SelCount<=0 then n := 1
   else n := lbNetConnections.SelCount;
 
@@ -354,7 +354,7 @@ begin
   if trim(m)='' then raise Exception.Create('No message');
 
   if Application.MessageBox(PChaR('Send this message to '+inttostr(n)+' nodes?'+#10+
-    'ALERT: Sending unauthorized messages will be considered spam and you will be banned'+#10+
+    'NOTE: Sending unauthorized messages will be considered spam and you will be banned'+#10+
     #10+
     'Message: '+#10+
     m),PChar(Application.Title),MB_ICONQUESTION+MB_YESNO+MB_DEFBUTTON1)<>IdYes then exit;
@@ -387,11 +387,11 @@ begin
   if cbAllowMining.Checked then begin
     if (TNetData.NetData.NetStatistics.ClientsConnections<=0) then begin
       Application.MessageBox(PChar(Format(
-        'In order to Mine is necessary that you open your external port %d from the Internet to allow other nodes of Pascal Coin to connect to you.'+#10+
-        '(Note: This is not mandatory... but will work better with open ports)'+#10+
+        'In order to mine is necessary that you open your external port %d from the Internet to allow other Pascal Coin nodes to connect to you.'+#10+
+        '(Note: This is not mandatory... but it will work better with open ports)'+#10+
         #10+
         'To do this you must configure your Router/Firewall and enable NAT to your local machine at port: %d'+#10+#10+
-        'After allowing incoming connections... you must wait until other nodes connects to you to mine'+#10+
+        'After allowing incoming connections... you must wait until other nodes connect to you to mine'+#10+
         #10+
         'PLEASE... BE PATIENT !!!'+#10+#10+
         'Help mining Pascal Coin and win Pascal Coins!',[FNode.NetServer.Port,FNode.NetServer.Port])),
@@ -1025,10 +1025,10 @@ begin
           s := s+' ** NOT VALID ** '+P.BlackListText;
         end;
         if P.last_connection>0 then begin
-          s := s + ' Last Connection: '+DateTimeToStr(UnivDateTime2LocalDateTime( UnixToUnivDateTime(P^.last_connection)));
+          s := s + ' Last connection: '+DateTimeToStr(UnivDateTime2LocalDateTime( UnixToUnivDateTime(P^.last_connection)));
         end;
         if (P.last_attempt_to_connect>0) then begin
-          s := s + ' Last Attempt to connect: '+DateTimeToStr(P^.last_attempt_to_connect)+' (Attempts: '+inttostr(P^.total_failed_attemps_to_connect)+')';
+          s := s + ' Last attempt to connect: '+DateTimeToStr(P^.last_attempt_to_connect)+' (Attempts: '+inttostr(P^.total_failed_attemps_to_connect)+')';
         end;
         strings.Add(s);
       end;
@@ -1388,7 +1388,7 @@ begin
   OnNetStatisticsChanged(Nil);
   if Assigned(FNode) then begin
     if FNode.IsBlockChainValid(errors) then begin
-      StatusBar.Panels[2].Text := Format('Last Account time:%s',
+      StatusBar.Panels[2].Text := Format('Last account time:%s',
        [FormatDateTime('dd/mm/yyyy hh:nn:ss',UnivDateTime2LocalDateTime(UnixToUnivDateTime( FNode.Bank.LastOperationBlock.timestamp )))]);
     end else begin
       StatusBar.Panels[2].Text := 'NO BLOCKCHAIN: '+errors;
@@ -1411,7 +1411,7 @@ begin
         if TNetData.NetData.IsDiscoveringServers then begin
           lblNodeStatus.Caption := 'Discovering servers';
         end else if TNetData.NetData.IsGettingNewBlockChainFromClient then begin
-          lblNodeStatus.Caption := 'Obtaining new BlockChain';
+          lblNodeStatus.Caption := 'Obtaining new blockchain';
         end else begin
           lblNodeStatus.Caption := 'Running';
         end;

Units/Forms/UFRMWalletKeys.pas

@@ -96,11 +96,11 @@ Var wk : TWalletKey;
   s : String;
 begin
   if Not GetSelectedWalletKeyAndIndex(wk,index) then exit;
-  s := 'Are you sure to delete selected private key?'+#10+wk.Name+#10+#10+
-    'Please note that this will remove FOREVER access to accounts using this key...';
+  s := 'Are you sure you want to delete the selected private key?'+#10+wk.Name+#10+#10+
+    'Please note that this will forever remove access to accounts using this key...';
   if Application.MessageBox(Pchar(s),PChar('Delete key'),
     MB_YESNO+MB_DEFBUTTON2+MB_ICONWARNING)<>Idyes then exit;
-  if Application.MessageBox(PChar('Sure? You want to delete?'),PChar('Delete key'),
+  if Application.MessageBox(PChar('Are you sure you want to delete?'),PChar('Delete key'),
     MB_YESNO+MB_DEFBUTTON2+MB_ICONWARNING)<>Idyes then exit;
   WalletKeys.Delete(index);
   UpdateWalletKeys;
@@ -113,7 +113,7 @@ begin
   if WalletKeys.Count<=0 then raise Exception.Create('Your wallet is empty. No keys!');
   if ((WalletKeys.IsValidPassword) And (WalletKeys.WalletPassword='')) then begin
     if Application.MessageBox(PChar('Your wallet has NO PASSWORD'+#10+#10+
-      'I think that prior to export it you must consider to protect it!'+#10+#10+
+      'It is recommend to protect your wallet with a password prior to exporting it!'+#10+#10+
       'Continue without password protection?'),PChar(Application.Title),MB_YESNO+MB_ICONWARNING+MB_DEFBUTTON2)<>IdYes then exit;
   end;
 
@@ -202,7 +202,7 @@ begin
     if wki.Count<=0 then raise Exception.Create('Wallet file has no valid data');
     pwd := '';
     While (Not wki.IsValidPassword) do begin
-      if Not InputQuery('Import','Insert the wallet file Password:',pwd) then exit;
+      if Not InputQuery('Import','Enter the wallet file password:',pwd) then exit;
       wki.WalletPassword := pwd;
       if not wki.IsValidPassword then begin
         If Application.MessageBox(PChar('Password entered is not valid, retry?'),PChar(Application.Title),MB_ICONERROR+MB_YESNO)<>Idyes then exit;
@@ -226,15 +226,15 @@ begin
     if (cPrivatekeys>0) Or (cPublicKeys>0) then begin
       Application.MessageBox(PChar('Wallet file imported successfully'+#10+#10+
         'File:'+ifn+#10+#10+
-        'Total Keys in wallet: '+inttostr(wki.Count)+#10+
-        'Imported Private keys: '+IntToStr(cPrivatekeys)+#10+
+        'Total keys in wallet: '+inttostr(wki.Count)+#10+
+        'Imported private keys: '+IntToStr(cPrivatekeys)+#10+
         'Imported public keys only: '+IntToStr(cPublicKeys)+#10+
         'Duplicated (not imported): '+InttoStr(wki.Count - cPrivatekeys - cPublicKeys)),
         PChar(Application.Title),MB_OK+MB_ICONINFORMATION);
     end else begin
-      Application.MessageBox(PChar('Wallet file keys were allready in your Wallet. Nothing imported'+#10+#10+
+      Application.MessageBox(PChar('Wallet file keys were already in your wallet. Nothing imported'+#10+#10+
         'File:'+ifn+#10+#10+
-        'Total Keys in wallet: '+inttostr(wki.Count)),
+        'Total keys in wallet: '+inttostr(wki.Count)),
         PChar(Application.Title),MB_OK+MB_ICONWARNING);
     end;
   finally
@@ -254,17 +254,17 @@ begin
   if InputQuery('Import private key','Insert the password protected private key',s) then begin
     if (trim(s)='') then raise Exception.Create('No valid key');
     enc := TCrypto.HexaToRaw(trim(s));
-    if (enc='') then raise Exception.Create('Invalid text... You must enter an Hexadecimal value ("0".."9" or "A".."F"');
+    if (enc='') then raise Exception.Create('Invalid text... You must enter an hexadecimal value ("0".."9" or "A".."F"');
     Repeat
       s := '';
       desenc := '';
-      if InputQuery('Import private key','Insert the password:',s) then begin
+      if InputQuery('Import private key','Enter the password:',s) then begin
         If (TAESComp.EVP_Decrypt_AES256(enc,s,desenc)) then begin
           if (desenc<>'') then begin
             EC := TECPrivateKey.ImportFromRaw(desenc);
             Try
               if Not Assigned(EC) then begin
-                if Application.MessageBox(PChar('Invalid password or corrupted data after decryption!'),'',MB_RETRYCANCEL+MB_ICONERROR)<>IDRETRY then exit;
+                if Application.MessageBox(PChar('Invalid password or corrupted data!'),'',MB_RETRYCANCEL+MB_ICONERROR)<>IDRETRY then exit;
                 desenc := '';
               end else begin
                 i := WalletKeys.IndexOfAccountKey(EC.PublicKey);
@@ -324,21 +324,21 @@ Var s,s2 : String;
 begin
   if FWalletKeys.IsValidPassword then begin
     s := ''; s2 := '';
-    if Not InputQuery('Change password','Type new password',s) then exit;
+    if Not InputQuery('Change password','Enter new password',s) then exit;
     if trim(s)<>s then raise Exception.Create('Password cannot start or end with a space character');
-    if Not InputQuery('Change password','Type new password again',s2) then exit;
+    if Not InputQuery('Change password','Enter new password again',s2) then exit;
     if s<>s2 then raise Exception.Create('Two passwords are different!');
 
     FWalletKeys.WalletPassword := s;
     Application.MessageBox(PChar('Password changed!'+#10+#10+
       'Please note that your new password is "'+s+'"'+#10+#10+
-      '(If you lose this password, you will lose your Wallet forever !)'),
+      '(If you lose this password, you will lose your wallet forever!)'),
       PChar(Application.Title),MB_ICONWARNING+MB_OK);
     UpdateWalletKeys;
   end else begin
     s := '';
     Repeat
-      if Not InputQuery('Wallet Password','Insert Wallet Password',s) then exit;
+      if Not InputQuery('Wallet password','Enter wallet password',s) then exit;
       FWalletKeys.WalletPassword := s;
       if Not FWalletKeys.IsValidPassword then Application.MessageBox(PChar('Invalid password'),PChar(Application.Title),MB_ICONERROR+MB_OK);
     Until FWalletKeys.IsValidPassword;
@@ -351,7 +351,7 @@ begin
   if Not Assigned(FWalletKeys) then exit;
 
   if Not FWalletKeys.IsValidPassword then begin
-    Application.MessageBox(PChar('Wallet key is encrypted!'+#10+#10+'You must insert password to continue...'),
+    Application.MessageBox(PChar('Wallet key is encrypted!'+#10+#10+'You must enter password to continue...'),
       PCHar(Application.Title),MB_OK+MB_ICONWARNING);
     bbUpdatePasswordClick(Nil);
     if Not FWalletKeys.IsValidPassword then raise Exception.Create('Cannot continue without valid password');