[Initranslator-svncheckins] SF.net SVN: initranslator: [211] translator/trunk/src

[<pe...@us...>]

Revision: 211
          http://svn.sourceforge.net/initranslator/?rev=211&view=rev
Author:   peter3
Date:     2006-12-20 06:27:27 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
Translator:
- after export, set items as not modified
Plugins (all):
 - string replaced with WideString
POParser:
- implements ILocalizable

Modified Paths:
--------------
    translator/trunk/src/FoxitPlugin/FoxitParserImpl.pas
    translator/trunk/src/IBForumsPlugin/IBForumsParserImpl.pas
    translator/trunk/src/MSDictParser/MSDictParserImpl.pas
    translator/trunk/src/MSDictParser/MSDictParserImportFrm.pas
    translator/trunk/src/MainFrm.pas
    translator/trunk/src/MozillaPlugin/MozillaDTDImpl.pas
    translator/trunk/src/MozillaPlugin/MozillaPropsImpl.pas
    translator/trunk/src/OlegPlugin/OlegParserImpl.pas
    translator/trunk/src/OpenOfficeGSIPlugin/OOGSIImportFrm.pas
    translator/trunk/src/OpenOfficeGSIPlugin/OOGSIParserImpl.pas
    translator/trunk/src/PHPNukePlugin/PHPNukeImpl.pas
    translator/trunk/src/PHPPlugin/PHPParserImpl.pas
    translator/trunk/src/POPlugin/POExportFrm.dfm
    translator/trunk/src/POPlugin/POExportFrm.pas
    translator/trunk/src/POPlugin/POParser.dpr
    translator/trunk/src/POPlugin/POParser.res
    translator/trunk/src/POPlugin/POParserImpl.pas
    translator/trunk/src/PluginCommon/DualImportFrm.pas
    translator/trunk/src/PluginCommon/PreviewExportFrm.pas
    translator/trunk/src/PluginCommon/SingleImportFrm.pas
    translator/trunk/src/PolyglotPlugin/PolyGlotParserImpl.pas
    translator/trunk/src/SciTEPlugin/SciTEParserImpl.pas
    translator/trunk/src/XLIFFPlugin/XLIFFParserImpl.pas
    translator/trunk/src/XilisoftPlugin/XilisoftParserImpl.pas

Modified: translator/trunk/src/FoxitPlugin/FoxitParserImpl.pas
===================================================================
--- translator/trunk/src/FoxitPlugin/FoxitParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/FoxitPlugin/FoxitParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -26,7 +26,7 @@
   TFoxitParser = class(TInterfacedObject, IUnknown, IFileParser)
   private
     FOldAppHandle: Cardinal;
-    FOrigFile, FTransFile: string;
+    FOrigFile, FTransFile: WideString;
     procedure LoadSettings;
     procedure SaveSettings;
     procedure BuildPreview(Items: ITranslationItems; Strings: TTntStrings);

Modified: translator/trunk/src/IBForumsPlugin/IBForumsParserImpl.pas
===================================================================
--- translator/trunk/src/IBForumsPlugin/IBForumsParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/IBForumsPlugin/IBForumsParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -33,10 +33,10 @@
     FOldHandle: LongWord;
     FCount: integer;
     FAppServices: IApplicationServices;
-    FOrigFile, FTransFile: string;
+    FOrigFile, FTransFile: WideString;
     FExportRect: TRect;
     procedure BuildPreview(const Items: ITranslationItems; Strings: TTntStrings);
-    function DoImport(const Items, Orphans: ITranslationItems; const OrigFile, TransFile: string): boolean;
+    function DoImport(const Items, Orphans: ITranslationItems; const OrigFile, TransFile: WideString): boolean;
     procedure LoadSettings;
     procedure SaveSettings;
     function Translate(const Value: WideString): WideString;
@@ -65,13 +65,13 @@
   FHeader, FFooter: TTntStringlist;
 
 const
-  cPHPFilter = 'PHP files (*.php)|*.php|All files (*.*)|*.*';
-  cIBFExportTitle = 'Export to IB Forums language file';
-  cIBFImportTitle = 'Import from IB Forums language file';
-  cSectionName = 'IB Forums';
-  SImportError = 'There was an error importing, please check the files and try again';
-  SError = 'IB Forums Parser Error';
-  SFmtErrorMsg = '%s';
+  cPHPFilter:WideString = 'PHP files (*.php)|*.php|All files (*.*)|*.*';
+  cIBFExportTitle:WideString = 'Export to IB Forums language file';
+  cIBFImportTitle:WideString = 'Import from IB Forums language file';
+  cSectionName:WideString = 'IB Forums';
+  SImportError:WideString = 'There was an error importing, please check the files and try again';
+  SError:WideString = 'IB Forums Parser Error';
+  SFmtErrorMsg:WideString = '%s';
 
 
 function MyWideDequotedStr(const S: WideString; Quote: WideChar): WideString;
@@ -84,9 +84,9 @@
     Result := Copy(S, 2, Length(S) - 2)
 end;
 
-procedure ShowError(const Text: string);
+procedure ShowError(const Text: WideString);
 begin
-  Application.MessageBox(PChar(Format(SFmtErrorMsg, [Text])), PChar(SError), MB_OK or MB_ICONERROR);
+  WideMessageBox(GetActiveWindow, PWideChar(WideFormat(SFmtErrorMsg, [Text])), PWideChar(SError), MB_OK or MB_ICONERROR);
 end;
 
 { TIBFParser }
@@ -152,18 +152,18 @@
 end;
 
 function TIBFParser.DoImport(const Items, Orphans: ITranslationItems;
-  const OrigFile, TransFile: string): boolean;
+  const OrigFile, TransFile: WideString): boolean;
 var
   S: TTntStringList;
   HeaderComplete: boolean;
   i: integer;
   FOldSort: TTranslateSortType;
 
-  function ParseRow(const S: string; IsTranslation, TranslateFormat: boolean): boolean;
+  function ParseRow(const S: WideString; IsTranslation, TranslateFormat: boolean): boolean;
   var
     T: ITranslationItem;
     i: integer;
-    tmp, tmp2: Widestring;
+    tmp, tmp2: WideString;
   begin
     Result := false;
     if not TranslateFormat then

Modified: translator/trunk/src/MSDictParser/MSDictParserImpl.pas
===================================================================
--- translator/trunk/src/MSDictParser/MSDictParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/MSDictParser/MSDictParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -39,7 +39,7 @@
     function AddCopyright: boolean;
     function Translate(const Value: WideString): WideString;
   protected
-    FTransFile: string;
+    FTransFile: WideString;
     procedure LoadSettings;
     procedure SaveSettings;
     procedure BuildPreview(Items: ITranslationItems; Strings: TTntStrings);

Modified: translator/trunk/src/MSDictParser/MSDictParserImportFrm.pas
===================================================================
--- translator/trunk/src/MSDictParser/MSDictParserImportFrm.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/MSDictParser/MSDictParserImportFrm.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -44,8 +44,8 @@
     function Translate(const Value:WideString):WideString;
   public
     { Public declarations }
-    class function Execute(var AFilename: string; var SkipLines: integer; const ACaption, Filter, InitialDir, DefaultExt: string): boolean;overload;
-    class function Execute(const ApplicationServices:IApplicationServices; var AFilename: string; var SkipLines: integer; const ACaption, Filter, InitialDir, DefaultExt: string): boolean;overload;
+    class function Execute(var AFilename: WideString; var SkipLines: integer; const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;overload;
+    class function Execute(const ApplicationServices:IApplicationServices; var AFilename: WideString; var SkipLines: integer; const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;overload;
     function GetString(out Section: WideString; out Name: WideString; out Value: WideString): WordBool; safecall;
   end;
 
@@ -55,8 +55,8 @@
 
 { TfrmImport }
 
-class function TfrmImport.Execute(var AFilename: string; var SkipLines: integer;
-  const ACaption, Filter, InitialDir, DefaultExt: string): boolean;
+class function TfrmImport.Execute(var AFilename: WideString; var SkipLines: integer;
+  const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;
 begin
   Result := Execute(nil, AFilename, SkipLines, ACaption, Filter, InitialDir, DefaultExt);
 end;
@@ -69,9 +69,9 @@
 end;
 
 class function TfrmImport.Execute(
-  const ApplicationServices: IApplicationServices; var AFilename: string;
+  const ApplicationServices: IApplicationServices; var AFilename: WideString;
   var SkipLines: integer; const ACaption, Filter, InitialDir,
-  DefaultExt: string): boolean;
+  DefaultExt: WideString): boolean;
 var
   frmImport: TfrmImport;
 begin

Modified: translator/trunk/src/MainFrm.pas
===================================================================
--- translator/trunk/src/MainFrm.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/MainFrm.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -479,9 +479,12 @@
     function CheckDictModified: boolean;
     function CheckOrphans: boolean;
     procedure LoadSettings(FirstLoad: boolean);
+    procedure SetUpLangFile;
+    procedure LoadTranslate;
     procedure SaveSettings;
+    procedure CreateEverything;
+    procedure FreeEverything;
     function CloseApp: boolean;
-    procedure LoadTranslate;
     function LoadOriginal(const FileName: WideString; Encoding: TEncoding): TEncoding;
     function LoadTranslation(const FileName: WideString; Encoding: TEncoding): TEncoding;
     function SaveTranslation(const FileName: WideString; Encoding: TEncoding; const InsertHeader: boolean = false; const InsertFooter: boolean = false): boolean;
@@ -574,7 +577,7 @@
     function GetItems: ITranslationItems;
     function GetOrphans: ITranslationItems;
     function GetAppHandle: Cardinal;
-    function GetMainFormHandle:Cardinal;
+    function GetMainFormHandle: Cardinal;
     function GetDictionaryItems: IDictionaryItems;
     function GetHeader: WideString;
     procedure SetHeader(const Value: WideString);
@@ -619,7 +622,14 @@
   DictEditFrm, ColorsFrm;
 
 {$R *.dfm}
+var
+  FApplicationServices: IApplicationServices = nil;
 
+function InternalApplicationServicesFunc: IApplicationServices;
+begin
+  Result := FApplicationServices;
+end;
+
 type
   TTranslationUndoItem = class(TUndoData)
   private
@@ -791,8 +801,6 @@
   end;
 end;
 
-
-
 function TfrmMain.ProcessCommand(const ACommand: WideString): boolean;
 var
   tmp, tmp2: WideString;
@@ -1333,7 +1341,8 @@
 end;
 
 procedure TfrmMain.SetModified(const Value: boolean);
-  procedure ClearModified;
+
+procedure ClearModified;
   var i: integer;
   begin
     for i := 0 to FTranslateFile.Items.Count - 1 do
@@ -1564,7 +1573,7 @@
   if GlobalAppOptions.MonitorFiles and WideFileExists(AFileName) then
   begin
     StopMonitor(AMonitor);
-    AMonitor := TFileMonitorThread.Create(AFileName);
+    AMonitor := TFileMonitorThread.Create(AFileName, 1000);
     AMonitor.FreeOnTerminate := true;
     AMonitor.OnTerminate := DoThreadTerminate;
     AMonitor.OnChange := DoMonitoredFileChange;
@@ -1681,18 +1690,18 @@
 var
   i: integer;
   S: WideString;
-  {$IFDEF USEADDICTSPELLCHECKER}
-  l:TSpellLanguageString;
-  {$ENDIF}
+{$IFDEF USEADDICTSPELLCHECKER}
+  l: TSpellLanguageString;
+{$ENDIF}
 begin
-  {$IFDEF USEADDICTSPELLCHECKER}
+{$IFDEF USEADDICTSPELLCHECKER}
   // add all spellchecker strings
   for l := Low(TSpellLanguageString) to High(TSpellLanguageString) do
   begin
     S := EncodeStrings(ad3SpellLanguages.GetString(l, ltEnglish));
     ini.WriteString('SpellChecker', S, S);
   end;
-  {$ENDIF}
+{$ENDIF}
 
   // write out all resourcestrings
   ini.WriteString(ClassName, EncodeStrings(SFmtAboutText), EncodeStrings(SFmtAboutText));
@@ -2415,25 +2424,8 @@
   Close;
 end;
 
-var
-  FApplicationServices: IApplicationServices = nil;
-
-function InternalApplicationServicesFunc: IApplicationServices;
+procedure TfrmMain.SetUpLangFile;
 begin
-  Result := FApplicationServices;
-end;
-
-procedure TfrmMain.FormCreate(Sender: TObject);
-begin
-  ScreenCursor(crAppStart);
-  FApplicationServices := TApplicationServices.Create(self);
-  GlobalApplicationServicesFunc := @InternalApplicationServicesFunc;
-  FTranslateFile := TTranslateFiles.Create;
-  FFindReplace := TFindReplace.Create(Self);
-  FDictionary := TDictionaryItems.Create;
-
-  ClearBookmarks;
-
   GlobalLanguageFile.OnRead := DoReadObject;
   GlobalLanguageFile.SkipProperty('Name');
   GlobalLanguageFile.SkipProperty('Category');
@@ -2464,33 +2456,23 @@
   GlobalLanguageFile.SkipClass(TProgressBar);
   GlobalLanguageFile.SkipClass(TTBXSeparatorItem);
   GlobalLanguageFile.SkipClass(TTBXComboBoxItem);
-  DragAcceptFiles(Handle, true);
-  ToolbarFont.CharSet := DEFAULT_CHARSET;
-  SetLength(FFileMonitors, 3);
+end;
 
-  LoadSettings(true);
-  BuildExternalToolMenu(mnuPlugins);
+procedure TfrmMain.CreateEverything;
+begin
+  FApplicationServices := TApplicationServices.Create(self);
+  GlobalApplicationServicesFunc := @InternalApplicationServicesFunc;
+  FTranslateFile := TTranslateFiles.Create;
+  FFindReplace := TFindReplace.Create(Self);
+  FDictionary := TDictionaryItems.Create;
 
-  HandleCommandLine;
-  UpdateStatus;
-  Windows.SetFocus(reTranslation.Handle);
-  // strange bug here: form picks up "Show about box" hint (something to do with TBX maybe?)
-  Hint := '';
+  ClearBookmarks;
+  SetUpLangFile;
 end;
 
-function TfrmMain.CloseApp:boolean;
-var
-  i: integer;
+procedure TfrmMain.FreeEverything;
+var i:integer;
 begin
-  Result := CheckModified and CheckDictModified;
-  if not Result then
-    Exit;
-  lvTranslateStrings.Items.Count := 0;  // clear
-  if acFullScreen.Checked then
-    acFullScreen.Execute;
-  DragAcceptFiles(Handle, false);
-  SaveEditChanges;
-  SaveSettings;
   FreeAndNil(FNotify);
   FreeAndNil(FTranslateFile);
   FreeAndNil(FDictionary);
@@ -2502,10 +2484,45 @@
       FFileMonitors[i].FreeOnTerminate := false;
       FFileMonitors[i].Terminate;
       FFileMonitors[i].Free;
+      FFileMonitors[i] := nil;
     end;
   FApplicationServices := nil;
 end;
 
+procedure TfrmMain.FormCreate(Sender: TObject);
+begin
+  ScreenCursor(crAppStart);
+  CreateEverything;
+
+  DragAcceptFiles(Handle, true);
+  ToolbarFont.CharSet := DEFAULT_CHARSET;
+  SetLength(FFileMonitors, 3);
+
+  LoadSettings(true);
+  BuildExternalToolMenu(mnuPlugins);
+
+  HandleCommandLine;
+  UpdateStatus;
+  Windows.SetFocus(reTranslation.Handle);
+  // strange bug here: form picks up "Show about box" hint (something to do with TBX maybe?)
+  Hint := '';
+end;
+
+function TfrmMain.CloseApp: boolean;
+begin
+  Result := CheckModified and CheckDictModified;
+  if Result then
+  begin
+    lvTranslateStrings.Items.Count := 0; // clear
+    if acFullScreen.Checked then
+      acFullScreen.Execute;
+    DragAcceptFiles(Handle, false);
+    SaveEditChanges;
+    SaveSettings;
+    FreeEverything;
+  end;
+end;
+
 procedure TfrmMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
   WaitCursor;
@@ -3336,10 +3353,10 @@
 
 procedure TfrmMain.acReplaceEverywhereExecute(Sender: TObject);
 var
-  AItem:ITranslationItem;
+  AItem: ITranslationItem;
   FOrig, FTrans: WideString;
   i: integer;
-  FModified:boolean;
+  FModified: boolean;
 begin
   SaveEditChanges;
   FModified := false;
@@ -3422,7 +3439,7 @@
   function IsSameEndControl(const Original, Translation: WideString): boolean;
   begin
     Result := not GlobalAppOptions.MisMatchEndControl
-              or WideSameStr(EndControl(Original), EndControl(Translation));
+      or WideSameStr(EndControl(Original), EndControl(Translation));
   end;
 
   function CountMisMatch(const Original, Translation: WideString): boolean;
@@ -3547,6 +3564,7 @@
     Modified := true;
     NotifyChanged(NOTIFY_ITEM_IMPORT, 0, 0);
   end;
+  reTranslation.Modified := false;
   lvTranslateStrings.Items.Count := FTranslateFile.Items.Count;
   ScrollToTop;
   lvTranslateStrings.Invalidate;
@@ -3566,6 +3584,7 @@
   begin
     NotifyChanged(NOTIFY_ITEM_EXPORT, 0, 0);
     lvTranslateStrings.Items.Count := FTranslateFile.Items.Count;
+    Modified := false;
   end;
 end;
 
@@ -4576,9 +4595,5 @@
   BuildToolMenu(Sender);
 end;
 
-
-
-
 end.
 
-

Modified: translator/trunk/src/MozillaPlugin/MozillaDTDImpl.pas
===================================================================
--- translator/trunk/src/MozillaPlugin/MozillaDTDImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/MozillaPlugin/MozillaDTDImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -27,7 +27,7 @@
     FOldAppHandle: Cardinal;
     FCount: integer;
     FAppServices: IApplicationServices;
-    FOrigFile, FTransFile: string;
+    FOrigFile, FTransFile: WideString;
     procedure LoadSettings;
     procedure SaveSettings;
     procedure BuildPreview(Items: ITranslationItems; Strings: TTntStrings);

Modified: translator/trunk/src/MozillaPlugin/MozillaPropsImpl.pas
===================================================================
--- translator/trunk/src/MozillaPlugin/MozillaPropsImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/MozillaPlugin/MozillaPropsImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -26,7 +26,7 @@
     FOldAppHandle: Cardinal;
     FCount: integer;
     FAppServices: IApplicationServices;
-    FOrigFile, FTransFile: string;
+    FOrigFile, FTransFile: WideString;
     FExportRect: TRect;
     procedure LoadSettings;
     procedure SaveSettings;

Modified: translator/trunk/src/OlegPlugin/OlegParserImpl.pas
===================================================================
--- translator/trunk/src/OlegPlugin/OlegParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/OlegPlugin/OlegParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -26,7 +26,7 @@
     FOldAppHandle: Cardinal;
     FAppServices: IApplicationServices;
     FCount: integer;
-    FTransFile: string;
+    FTransFile: WideString;
     procedure LoadSettings;
     procedure SaveSettings;
     procedure BuildPreview(Items: ITranslationItems; Strings: TTntStrings);

Modified: translator/trunk/src/OpenOfficeGSIPlugin/OOGSIImportFrm.pas
===================================================================
--- translator/trunk/src/OpenOfficeGSIPlugin/OOGSIImportFrm.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/OpenOfficeGSIPlugin/OOGSIImportFrm.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -48,8 +48,8 @@
     procedure SaveSettings;
   public
     { Public declarations }
-    class function Execute(var AOriginalFile, ATranslationFile: string;
-      var OrigIsDualLine, SearchTrans:boolean; const ACaption, Filter, InitialDir, DefaultExt: string): boolean;
+    class function Execute(var AOriginalFile, ATranslationFile: WideString;
+      var OrigIsDualLine, SearchTrans:boolean; const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;
   end;
 
 implementation
@@ -60,8 +60,8 @@
 
 { TfrmImport }
 
-class function TfrmImport.Execute(var AOriginalFile, ATranslationFile: string;
-  var OrigIsDualLine, SearchTrans:boolean; const ACaption, Filter, InitialDir, DefaultExt: string): boolean;
+class function TfrmImport.Execute(var AOriginalFile, ATranslationFile: WideString;
+  var OrigIsDualLine, SearchTrans:boolean; const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;
 var
   frmImport: TfrmImport;
 begin

Modified: translator/trunk/src/OpenOfficeGSIPlugin/OOGSIParserImpl.pas
===================================================================
--- translator/trunk/src/OpenOfficeGSIPlugin/OOGSIParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/OpenOfficeGSIPlugin/OOGSIParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -33,7 +33,7 @@
     FOldHandle: LongWord;
     FAppServices: IApplicationServices;
     FCount: integer;
-    FOrigFile, FTransFile: string;
+    FOrigFile, FTransFile: WideString;
     FOrigIsDual, FSearchTrans: boolean;
     FExportRect: TRect;
     procedure BuildPreview(const Items: ITranslationItems; Strings: TTntStrings);

Modified: translator/trunk/src/PHPNukePlugin/PHPNukeImpl.pas
===================================================================
--- translator/trunk/src/PHPNukePlugin/PHPNukeImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/PHPNukePlugin/PHPNukeImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -28,7 +28,7 @@
     FOldHandle: Cardinal;
     FAppServices: IApplicationServices;
     FCount: integer;
-    FOrigFile, FTransFile: string;
+    FOrigFile, FTransFile: WideString;
     procedure LoadSettings;
     procedure SaveSettings;
     function Translate(const Value: WideString): WideString;
@@ -206,7 +206,7 @@
 var
   T: ITranslationItem;
   S: TTntStringlist;
-  Cmt: string;
+  Cmt: WideString;
   i: integer;
 
   function ParseLine(const S, Cmt: WideString; const Items: ITranslationItems; IsTranslation: boolean): ITranslationItem;

Modified: translator/trunk/src/PHPPlugin/PHPParserImpl.pas
===================================================================
--- translator/trunk/src/PHPPlugin/PHPParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/PHPPlugin/PHPParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -34,10 +34,10 @@
     FOldHandle: LongWord;
     FCount: integer;
     FAppServices: IApplicationServices;
-    FOrigFile, FTransFile: string;
+    FOrigFile, FTransFile: WideString;
     FExportRect: TRect;
     procedure BuildPreview(const Items: ITranslationItems; Strings: TTntStrings);
-    function DoPHPImport(const Items, Orphans: ITranslationItems; const OrigFile, TransFile: string): boolean;
+    function DoPHPImport(const Items, Orphans: ITranslationItems; const OrigFile, TransFile: WideString): boolean;
     procedure LoadSettings;
     procedure SaveSettings;
     function Translate(const Value: WideString): WideString;
@@ -65,14 +65,14 @@
   SError = 'PHP Parser Error';
   cSectionName = 'php';
 
-function YesNo(const Text, Caption: string): boolean;
+function YesNo(const Text, Caption: WideString): boolean;
 begin
-  Result := Application.MessageBox(PChar(Text), PChar(Caption), MB_YESNO or MB_ICONQUESTION) = IDYES;
+  Result := WideMessageBox(GetActiveWindow, PWideChar(Text), PWideChar(Caption), MB_YESNO or MB_ICONQUESTION) = IDYES;
 end;
 
-procedure ShowError(const Text: string);
+procedure ShowError(const Text: WideString);
 begin
-  Application.MessageBox(PChar('There was an error:'#13#10 + Text), PChar('PHP Error'), MB_OK or MB_ICONERROR);
+  WideMessageBox(GetActiveWindow, PWideChar('There was an error:'#13#10 + Text), PWideChar(WideString('PHP Error')), MB_OK or MB_ICONERROR);
 end;
 { TPHPParser }
 
@@ -132,17 +132,17 @@
 end;
 
 function TPHPParser.DoPHPImport(const Items, Orphans: ITranslationItems;
-  const OrigFile, TransFile: string): boolean;
+  const OrigFile, TransFile: WideString): boolean;
 var
   S: TTntStringList;
   i, j: integer;
   FOldSort: TTranslateSortType;
 
-  function ParseRow(const S: string; AIndex: integer; IsTranslation: boolean): boolean;
+  function ParseRow(const S: WideString; AIndex: integer; IsTranslation: boolean): boolean;
   type
     TParseState = (stNone, stDollar, stEqual, stFirstQuote, stLastQuote, stSemi);
   var
-    AName, AStr: string;
+    AName, AStr: WideString;
     State: TParseState;
     i, j: integer;
   begin

Modified: translator/trunk/src/POPlugin/POExportFrm.dfm
===================================================================
--- translator/trunk/src/POPlugin/POExportFrm.dfm	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/POPlugin/POExportFrm.dfm	2006-12-20 14:27:27 UTC (rev 211)
@@ -54,7 +54,7 @@
     266)
   PixelsPerInch = 96
   TextHeight = 13
-  object Label1: TTntLabel
+  object lblFilename: TTntLabel
     Left = 8
     Top = 8
     Width = 46
@@ -62,7 +62,7 @@
     Caption = '&Filename:'
     FocusControl = edFilename
   end
-  object Label3: TTntLabel
+  object lblPreview: TTntLabel
     Left = 8
     Top = 54
     Width = 91

Modified: translator/trunk/src/POPlugin/POExportFrm.pas
===================================================================
--- translator/trunk/src/POPlugin/POExportFrm.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/POPlugin/POExportFrm.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -28,13 +28,13 @@
 
 type
   TfrmPOExport = class(TTntForm)
-    Label1: TTntLabel;
+    lblFilename: TTntLabel;
     edFilename: TTntEdit;
     btnBrowse: TTntButton;
     btnOK: TTntButton;
     btnCancel: TTntButton;
     rePreview: TTntRichEdit;
-    Label3: TTntLabel;
+    lblPreview: TTntLabel;
     alPOExport: TTntActionList;
     acSaveFile: TTntAction;
     SaveDialog1: TTntSaveDialog;
@@ -52,6 +52,8 @@
   end;
 
 implementation
+uses
+  POParserConsts;
 
 {$R *.dfm}
 
@@ -93,8 +95,14 @@
     rePreview.SelStart := 0;
     SendMessage(rePreview.Handle, EM_SCROLLCARET, 0, 0);
     chkCompileMO.Checked := CompileMO;
+    Caption := Translate(SFormCaption);
+    lblFileName.Caption := Translate(SFileNameLabel);
+    lblPreview.Caption := Translate(SPreviewLabel);
+    chkCompileMO.Caption := Translate(SCompileMOCaption);
+    btnBrowse.Caption := Translate(SBrowseCaption);
+    btnOK.Caption := Translate(SOK);
+    btnCancel.Caption := Translate(SCancel);
     Result := ShowModal = mrOK;
-
     if Result then
     begin
       AFilename := edFilename.Text;

Modified: translator/trunk/src/POPlugin/POParser.dpr
===================================================================
--- translator/trunk/src/POPlugin/POParser.dpr	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/POPlugin/POParser.dpr	2006-12-20 14:27:27 UTC (rev 211)
@@ -25,7 +25,8 @@
   TransIntf in '..\TransIntf.pas',
   POExportFrm in 'POExportFrm.pas' {frmPOExport},
   POParserImpl in 'POParserImpl.pas',
-  CommonUtils in '..\CommonUtils.pas';
+  CommonUtils in '..\CommonUtils.pas',
+  POParserConsts in 'POParserConsts.pas';
 
 {$R *.res}
 function InstallPlugin(out Parser:IFileParser):HResult;stdcall;

Modified: translator/trunk/src/POPlugin/POParser.res
===================================================================
(Binary files differ)

Modified: translator/trunk/src/POPlugin/POParserImpl.pas
===================================================================
--- translator/trunk/src/POPlugin/POParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/POPlugin/POParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -18,15 +18,14 @@
 
 unit POParserImpl;
 
-
 interface
 uses
   Windows, Forms, TntClasses, TntSysUtils, TransIntf;
 
 type
-  TPOFileParser = class(TInterfacedObject, IUnknown, IFileParser)
+  TPOFileParser = class(TInterfacedObject, IUnknown, IFileParser, ILocalizable)
   private
-    FOldHandle: LongWord;
+    FIndex: integer;
     FFilename, FCmdLine: string;
     FCompileMO: Boolean;
     procedure LoadSettings;
@@ -36,31 +35,21 @@
       const Filename: string);
     procedure MakePOFile(const Items: ITranslationItems; Header, Result: TTntStrings);
   public
-    constructor Create;
-    destructor Destroy; override;
     function Capabilities: Integer; safecall;
     function Configure(Capability: integer): HResult; safecall;
     function DisplayName(Capability: integer): WideString; safecall;
     function ExportItems(const Items, Orphans: ITranslationItems): HResult; safecall;
     function ImportItems(const Items, Orphans: ITranslationItems): HResult; safecall;
     procedure Init(const ApplicationServices: IApplicationServices); safecall;
+    function GetString(out Section: WideString; out Name: WideString;
+      out Value: WideString): WordBool; safecall;
+
   end;
 
 implementation
 uses
-  CommonUtils, SysUtils, Classes, Controls, Dialogs, IniFiles, POExportFrm;
+  CommonUtils, SysUtils, Classes, Controls, Dialogs, IniFiles, POExportFrm, POParserConsts;
 
-const
-  cDefaultHeader =
-    'Project-Id-Version: <PROJECT>\n' +
-    'POT-Creation-Date: 2003-05-20 12:17\n' +
-    'PO-Revision-Date: 2003-09-23 09:24+0100\n' +
-    'Last-Translator: <none>\n' +
-    'Language-Team: Unknown <unknown>\n' +
-    'MIME-Version: 1.0\n' +
-    'Content-Type: text/plain; charset=UTF-8\n' +
-    'Content-Transfer-Encoding: 8bit';
-
 var
   FHeader: TTntStringList;
 
@@ -101,27 +90,12 @@
   Result := S_OK;
 end;
 
-constructor TPOFileParser.Create;
-begin
-  inherited Create;
-  FOldHandle := Application.Handle;
-  FCmdLine := 'msgfmt "%i" -o "%o"';
-
-//  FHeader.Text := cDefaultHeader;
-end;
-
-destructor TPOFileParser.Destroy;
-begin
-  Application.Handle := FOldHandle;
-  inherited;
-end;
-
 function TPOFileParser.DisplayName(Capability: integer): WideString;
 begin
   case Capability of
-    CAP_IMPORT: Result := 'Import from PO file';
-    CAP_EXPORT: Result := 'Export to PO file';
-    CAP_CONFIGURE: Result := 'Configure PO parser';
+    CAP_IMPORT: Result := Translate(SImportTitle);
+    CAP_EXPORT: Result := Translate(SExportTitle);
+    CAP_CONFIGURE: Result := Translate(SConfigureTitle);
   else
     Result := '';
   end;
@@ -204,16 +178,17 @@
         i := 0;
         while i < S.Count do
         begin
-          if AnsiPos('#', S[i]) = 1 then
+          if Pos('#', S[i]) = 1 then
             FComments.Add(S[i])
-          else if AnsiPos('msgid', WideLowerCase(S[i])) = 1 then
+          else if Pos('msgid', WideLowerCase(S[i])) = 1 then
           begin
             AnItem.Original := trimQuotes(trim(Copy(S[i], 6, MaxInt)), '"');
             while true do
             begin
               Inc(i);
-              if i >= S.Count then Break;
-              if AnsiPos('"', trim(S[i])) = 1 then
+              if i >= S.Count then
+                Break;
+              if Pos('"', trim(S[i])) = 1 then
                 AnItem.Original := AnItem.Original + trimQuotes(trim(S[i]), '"')
               else
               begin
@@ -222,14 +197,15 @@
               end;
             end;
           end
-          else if AnsiPos('msgstr', AnsiLowerCase(S[i])) = 1 then
+          else if Pos('msgstr', AnsiLowerCase(S[i])) = 1 then
           begin
             AnItem.Translation := trimQuotes(trim(Copy(S[i], 7, MaxInt)), '"');
             while true do
             begin
               Inc(i);
-              if i >= S.Count then Break;
-              if AnsiPos('"', trim(S[i])) = 1 then
+              if i >= S.Count then
+                Break;
+              if Pos('"', trim(S[i])) = 1 then
                 AnItem.Translation := AnItem.Translation + trimQuotes(trim(S[i]), '"')
               else
               begin
@@ -349,7 +325,7 @@
       try
         Filename := AFilename;
         Options := Options + [ofFileMustExist];
-        Filter := 'PO files|*.po|All files|*.*';
+        Filter := Translate(SFileFilter);
         if Execute then
           Result := Filename
         else
@@ -363,7 +339,7 @@
       try
         Filename := AFilename;
         Options := Options + [ofOverwritePrompt];
-        Filter := 'PO files|*.po|All files|*.*';
+        Filter := Translate(SFileFilter);
         if Execute then
           Result := Filename
         else
@@ -398,7 +374,7 @@
 
 procedure TPOFileParser.Init(const ApplicationServices: IApplicationServices);
 begin
-  Application.Handle := ApplicationServices.AppHandle;
+  GLobalApplicationServices := ApplicationServices;
 end;
 
 procedure TPOFileParser.LoadSettings;
@@ -409,7 +385,7 @@
 //    FHeader := ReadString('PO', 'Text', FHeader);
 //    FHeaderComment := ReadString('PO', 'Comment', FHeaderComment);
       FFilename := ReadString('PO', 'Filename', FFilename);
-      FCmdLine := ReadString('MO', 'CmdLine', FCmdLine);
+      FCmdLine := ReadString('MO', 'CmdLine', 'msgfmt "%i" -o "%o"');
       FCompileMO := ReadBool('MO', 'CompileMO', FCompileMO);
     finally
       Free;
@@ -437,8 +413,37 @@
   end;
 end;
 
+function TPOFileParser.GetString(out Section, Name, Value: WideString): WordBool;
+begin
+  Result := true;
+  case FIndex of
+    0: Value := SImportTitle;
+    1: Value := SExportTitle;
+    2: Value := SConfigureTitle;
+    3: Value := SFileFilter;
+    4: Value := SFormCaption;
+    5: Value := SFileNameLabel;
+    6: Value := SPreviewLabel;
+    7: Value := SCompileMOCaption;
+    8: Value := SBrowseCaption;
+    9: Value := SOK;
+    10: Value := SCancel;
+  else
+    Result := false;
+  end;
+  if Result then
+  begin
+    Section := cSectionName;
+    Name := Value;
+    Inc(FIndex);
+  end
+  else
+    Findex := 0;
+end;
+
 initialization
   FHeader := TTntStringList.Create;
+
 finalization
   FreeAndNil(FHeader);
 end.

Modified: translator/trunk/src/PluginCommon/DualImportFrm.pas
===================================================================
--- translator/trunk/src/PluginCommon/DualImportFrm.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/PluginCommon/DualImportFrm.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -50,8 +50,8 @@
   public
     { Public declarations }
     // SecondIsOptional parameter suggested by Chris Thornton
-    class function Execute(var AOriginalFile, ATranslationFile: string; const ACaption, Filter, InitialDir, DefaultExt: string; const SecondIsOptional: Boolean = false): boolean; overload;
-    class function Execute(const ApplicationServices: IApplicationServices; var AOriginalFile, ATranslationFile: string; const ACaption, Filter, InitialDir, DefaultExt: string; const SecondIsOptional: Boolean = false): boolean; overload;
+    class function Execute(var AOriginalFile, ATranslationFile: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString; const SecondIsOptional: Boolean = false): boolean; overload;
+    class function Execute(const ApplicationServices: IApplicationServices; var AOriginalFile, ATranslationFile: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString; const SecondIsOptional: Boolean = false): boolean; overload;
     function GetString(out Section: WideString; out Name: WideString; out Value: WideString): WordBool; safecall;
   end;
 
@@ -66,7 +66,7 @@
 
 { TfrmImport }
 
-class function TfrmDualImport.Execute(var AOriginalFile, ATranslationFile: string; const ACaption, Filter, InitialDir, DefaultExt: string; const SecondIsOptional: Boolean = false): boolean;
+class function TfrmDualImport.Execute(var AOriginalFile, ATranslationFile: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString; const SecondIsOptional: Boolean = false): boolean;
 begin
   Result := Execute(nil, AOriginalFile, ATranslationFile, ACaption, Filter, InitialDir, DefaultExt, SecondIsOptional);
 end;
@@ -160,8 +160,8 @@
 
 class function TfrmDualImport.Execute(
   const ApplicationServices: IApplicationServices; var AOriginalFile,
-  ATranslationFile: string; const ACaption, Filter, InitialDir,
-  DefaultExt: string; const SecondIsOptional: Boolean): boolean;
+  ATranslationFile: WideString; const ACaption, Filter, InitialDir,
+  DefaultExt: WideString; const SecondIsOptional: Boolean): boolean;
 var
   frmImport: TfrmDualImport;
 begin

Modified: translator/trunk/src/PluginCommon/PreviewExportFrm.pas
===================================================================
--- translator/trunk/src/PluginCommon/PreviewExportFrm.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/PluginCommon/PreviewExportFrm.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -48,10 +48,10 @@
     function Translate(const Value: WideString): WideString;
   public
     { Public declarations }
-    class function Execute(var FileName: string; const ACaption, Filter, InitialDir, DefaultExt: string;
+    class function Execute(var FileName: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString;
       Preview: TTntStrings; WordWrap:boolean = false): boolean; overload;
-    class function Execute(const ApplicationServices: IApplicationServices; var FileName: string;
-      const ACaption, Filter, InitialDir, DefaultExt: string; Preview: TTntStrings; WordWrap:boolean = false): boolean; overload;
+    class function Execute(const ApplicationServices: IApplicationServices; var FileName: WideString;
+      const ACaption, Filter, InitialDir, DefaultExt: WideString; Preview: TTntStrings; WordWrap:boolean = false): boolean; overload;
     function GetString(out Section: WideString; out Name: WideString; out Value: WideString): WordBool; safecall;
   end;
 
@@ -69,13 +69,51 @@
 
 { TfrmExport }
 
-class function TfrmExport.Execute(var FileName: string;
-  const ACaption, Filter, InitialDir, DefaultExt: string;
-  Preview: TTntStrings; WordWrap:boolean = false): boolean;
+class function TfrmExport.Execute(var FileName: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString; Preview: TTntStrings; WordWrap:boolean = false): boolean;
 begin
   Result := Execute(nil, Filename, ACaption, Filter, InitialDir, DefaultExt, Preview, WordWrap);
 end;
 
+class function TfrmExport.Execute(const ApplicationServices: IApplicationServices; var FileName: WideString;
+  const ACaption, Filter, InitialDir, DefaultExt: WideString;
+  Preview: TTntStrings; WordWrap:boolean = false): boolean;
+var
+  frmExport: TfrmExport;
+begin
+  Result := false;
+  frmExport := self.Create(Application);
+  with frmExport do
+  try
+    LoadSettings;
+    FApplicationServices := ApplicationServices;
+    if ACaption <> '' then
+      Caption := Translate(ACaption)
+    else
+      Caption := Translate(Caption);
+    lblFilename.Caption := Translate(lblFilename.Caption);
+    lblPreview.Caption := Translate(lblPreview.Caption);
+    btnOK.Caption := Translate(btnOK.Caption);
+    btnCancel.Caption := Translate(btnCancel.Caption);
+    SaveDialog1.Filter := Translate(Filter);
+    SaveDialog1.InitialDir := InitialDir;
+    SaveDialog1.DefaultExt := DefaultExt;
+    edFilename.Text := Filename;
+    rePreview.WordWrap := WordWrap;
+    rePreview.Lines := Preview;
+    rePreview.SelStart := 0;
+    SendMessage(rePreview.Handle, EM_SCROLLCARET, 0, 0);
+    if (ShowModal = mrOK) and CheckFilename and OverwriteOK then
+    begin
+      Result := true;
+      Preview.Assign(rePreview.Lines);
+      Filename := edFilename.Text;
+    end;
+    SaveSettings;
+  finally
+    Free;
+  end;
+end;
+
 procedure TfrmExport.btnBrowseClick(Sender: TObject);
 begin
   SaveDialog1.FileName := edFilename.Text;
@@ -168,7 +206,7 @@
   begin
     // try to create a new file: either it will fail because the file exists
     // or because the name is invalid
-    AHandle := CreateFile(PChar(string(edFilename.Text)), 0, 0, nil, CREATE_NEW, 0, 0);
+    AHandle := CreateFileW(PWideChar(WideString(edFilename.Text)), 0, 0, nil, CREATE_NEW, 0, 0);
     try
       ALastError := GetLastError;
       Result := (ALastError = ERROR_FILE_EXISTS) or (AHandle <> INVALID_HANDLE_VALUE);
@@ -189,46 +227,6 @@
     WideMessageBox(Handle, PWideChar(Translate(Format(SFmtErrIvalidFilename, [edFilename.Text]))), PWideChar(Translate(SError)), MB_OK or MB_TASKMODAl or MB_ICONERROR);
 end;
 
-class function TfrmExport.Execute(const ApplicationServices: IApplicationServices; var FileName: string;
-  const ACaption, Filter, InitialDir, DefaultExt: string;
-  Preview: TTntStrings; WordWrap:boolean = false): boolean;
-var
-  frmExport: TfrmExport;
-begin
-  Result := false;
-  frmExport := self.Create(Application);
-  with frmExport do
-  try
-    LoadSettings;
-    FApplicationServices := ApplicationServices;
-    if ACaption <> '' then
-      Caption := Translate(ACaption)
-    else
-      Caption := Translate(Caption);
-    lblFilename.Caption := Translate(lblFilename.Caption);
-    lblPreview.Caption := Translate(lblPreview.Caption);
-    btnOK.Caption := Translate(btnOK.Caption);
-    btnCancel.Caption := Translate(btnCancel.Caption);
-    SaveDialog1.Filter := Translate(Filter);
-    SaveDialog1.InitialDir := InitialDir;
-    SaveDialog1.DefaultExt := DefaultExt;
-    edFilename.Text := Filename;
-    rePreview.WordWrap := WordWrap;
-    rePreview.Lines := Preview;
-    rePreview.SelStart := 0;
-    SendMessage(rePreview.Handle, EM_SCROLLCARET, 0, 0);
-    if (ShowModal = mrOK) and CheckFilename and OverwriteOK then
-    begin
-      Result := true;
-      Preview.Assign(rePreview.Lines);
-      Filename := edFilename.Text;
-    end;
-    SaveSettings;
-  finally
-    Free;
-  end;
-end;
-
 function TfrmExport.Translate(const Value: WideString): WideString;
 begin
   if FApplicationServices <> nil then

Modified: translator/trunk/src/PluginCommon/SingleImportFrm.pas
===================================================================
--- translator/trunk/src/PluginCommon/SingleImportFrm.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/PluginCommon/SingleImportFrm.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -39,8 +39,8 @@
     function Translate(const Value:WideString):WideString;
   public
     { Public declarations }
-    class function Execute(var AFilename: string; const ACaption, Filter, InitialDir, DefaultExt: string): boolean;overload;
-    class function Execute(const ApplicationServices:IApplicationServices; var AFilename: string; const ACaption, Filter, InitialDir, DefaultExt: string): boolean;overload;
+    class function Execute(var AFilename: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;overload;
+    class function Execute(const ApplicationServices:IApplicationServices; var AFilename: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;overload;
     function GetString(out Section, Name, Value: WideString): WordBool; safecall;
 
   end;
@@ -51,7 +51,7 @@
 
 { TfrmImport }
 
-class function TfrmSingleImport.Execute(var AFilename: string; const ACaption, Filter, InitialDir, DefaultExt: string): boolean;
+class function TfrmSingleImport.Execute(var AFilename: WideString; const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;
 begin
   Result := Execute(nil, AFilename, ACaption, Filter, InitialDir, DefaultExt);
 end;
@@ -63,8 +63,8 @@
     edFilename.Text := OpenDialog1.Filename;
 end;
 
-class function TfrmSingleImport.Execute(const ApplicationServices: IApplicationServices; var AFilename: string;
-  const ACaption, Filter, InitialDir, DefaultExt: string): boolean;
+class function TfrmSingleImport.Execute(const ApplicationServices: IApplicationServices; var AFilename: WideString;
+  const ACaption, Filter, InitialDir, DefaultExt: WideString): boolean;
 var
   frmImport: TfrmSingleImport;
 begin

Modified: translator/trunk/src/PolyglotPlugin/PolyGlotParserImpl.pas
===================================================================
--- translator/trunk/src/PolyglotPlugin/PolyGlotParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/PolyglotPlugin/PolyGlotParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -35,7 +35,7 @@
   TPolyGlotParser = class(TInterfacedObject, IUnknown, IFileParser)
   private
     FOldAppHandle: Cardinal;
-    FTransFile, FOrigFile: string;
+    FTransFile, FOrigFile: WideString;
     FSection: WideString;
     procedure LoadSettings;
     procedure SaveSettings;

Modified: translator/trunk/src/SciTEPlugin/SciTEParserImpl.pas
===================================================================
--- translator/trunk/src/SciTEPlugin/SciTEParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/SciTEPlugin/SciTEParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -32,10 +32,10 @@
   TSciTEParser = class(TInterfacedObject, IUnknown, IFileParser)
   private
     FOldHandle: LongWord;
-    FTransFile: string;
+    FTransFile: WideString;
     FExportRect: TRect;
     procedure BuildPreview(const Items: ITranslationItems; Strings: TTntStrings);
-    function DoSciTEImport(const Items, Orphans: ITranslationItems; const TransFile: string): boolean;
+    function DoSciTEImport(const Items, Orphans: ITranslationItems; const TransFile: WideString): boolean;
     procedure LoadSettings;
     procedure SaveSettings;
   public
@@ -51,7 +51,7 @@
 
 implementation
 uses
-  Windows, Forms, IniFiles, PreviewExportFrm, SingleImportFrm;
+  Windows, Forms, IniFiles, CommonUtils, PreviewExportFrm, SingleImportFrm;
 
 const
   cSciTEFilter = 'SciTE files (locale.properties)|*.properties|All files (*.*)|*.*';
@@ -61,14 +61,14 @@
   SImportError = 'There was an error importing, please check the files and try again';
   SError = 'SciTE Parser Error';
 
-function YesNo(const Text, Caption: string): boolean;
+function YesNo(const Text, Caption: WideString): boolean;
 begin
-  Result := Application.MessageBox(PChar(Text), PChar(Caption), MB_YESNO or MB_ICONQUESTION) = IDYES;
+  Result := WideMessageBox(GetActiveWindow, PWideChar(Text), PWideChar(Caption), MB_YESNO or MB_ICONQUESTION) = IDYES;
 end;
 
-procedure ShowError(const Text: string);
+procedure ShowError(const Text: WideString);
 begin
-  Application.MessageBox(PChar('There was an error:'#13#10 + Text), PChar('SciTE Error'), MB_OK or MB_ICONERROR);
+  WideMessageBox(GetActiveWindow, PWideChar('There was an error:'#13#10 + Text), PWideChar(WideString('SciTE Error')), MB_OK or MB_ICONERROR);
 end;
 
 { TSciTEParser }
@@ -131,7 +131,7 @@
 end;
 
 function TSciTEParser.DoSciTEImport(const Items, Orphans: ITranslationItems;
-  const TransFile: string): boolean;
+  const TransFile: WideString): boolean;
 var
   S: TTntStringList;
   i: integer;

Modified: translator/trunk/src/XLIFFPlugin/XLIFFParserImpl.pas
===================================================================
--- translator/trunk/src/XLIFFPlugin/XLIFFParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/XLIFFPlugin/XLIFFParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -27,7 +27,7 @@
   private
     FOldAppHandle: Cardinal;
     FApplicationServices: IApplicationServices;
-    FFilename: string;
+    FFilename: WideString;
     procedure LoadSettings;
     procedure SaveSettings;
     function Translate(const Value:WideString):WideString;
@@ -271,7 +271,7 @@
       end;
       SaveSettings;
       Items.Modified := false;
-      FXMLImport.SaveToXML(XML); // save the imported data in a string
+      FXMLImport.SaveToXML(XML); // save the imported data in a WideString
       Result := S_OK;
     end;
     FXMLImport := nil;

Modified: translator/trunk/src/XilisoftPlugin/XilisoftParserImpl.pas
===================================================================
--- translator/trunk/src/XilisoftPlugin/XilisoftParserImpl.pas	2006-12-19 00:06:37 UTC (rev 210)
+++ translator/trunk/src/XilisoftPlugin/XilisoftParserImpl.pas	2006-12-20 14:27:27 UTC (rev 211)
@@ -25,8 +25,8 @@
   TXilisoftParser = class(TInterfacedObject, IUnknown, IFileParser, ILocalizable)
   private
     FOldAppHandle: Cardinal;
-    FOrigFile: string;
-    FTransFile: string;
+    FOrigFile: WideString;
+    FTransFile: WideString;
     FSkip: Boolean;
     FStringIndex: integer;
     FAppServices: IApplicationServices;
@@ -54,10 +54,10 @@
 
 implementation
 uses
-  XilisoftParserCfgForm, XiliSoftParserConsts,
+  XilisoftParserCfgForm, XiliSoftParserConsts, CommonUtils,
   Controls, Windows, SysUtils, Forms, IniFiles, DualImportFrm;
 
-function GetLocaleInformation(Flag: Integer): string;
+function GetLocaleInformation(Flag: Integer): WideString;
 var
   pcLCA: array[0..20] of Char;
 begin
@@ -138,7 +138,7 @@
     LoadSettings;
     if not FileExists(FTransFile) then
     begin
-      MessageBox(0, PChar(string(Translate(SImportBeforeExport))), PChar(string(Translate(SFileNotFound))), MB_OK);
+      WideMessageBox(0, PWideChar(Translate(SImportBeforeExport)), PWideChar(Translate(SFileNotFound)), MB_OK);
       Exit;
     end;
     S := TTntStringlist.Create;
@@ -162,7 +162,7 @@
   SO, ST: TTntStringlist;
   i, j, k: integer;
   TI: ITranslationItem;
-  ssi, sst, sName, sValue: string;
+  ssi, sst, sName, sValue: WideString;
   IsInT: Boolean;
 begin
   Result := S_FALSE;
@@ -185,7 +185,7 @@
           ssi := SO[i];
           if ssi = '' then
             Continue;
-          if ssi[1] in ['/', ';'] then
+          if ssi[1] in [WideChar('/'), WideChar(';')] then
             Continue;
           k := Pos('=', ssi);
           if k > 0 then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.