[Initranslator-svncheckins] SF.net SVN: initranslator: [246] translator/trunk/src
Brought to you by:
peter3
Menu
▾
▴
[Initranslator-svncheckins] SF.net SVN: initranslator: [246] translator/trunk/src
|
From: <pe...@us...> - 2007-08-14 12:26:28
|
Revision: 246
http://initranslator.svn.sourceforge.net/initranslator/?rev=246&view=rev
Author: peter3
Date: 2007-08-14 05:26:19 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
- modifications to compile with Delphi 2007
Modified Paths:
--------------
translator/trunk/src/CommonUtils.pas
translator/trunk/src/DCPPPlugin/DCPPParser.res
translator/trunk/src/ExceptDlg.dfm
translator/trunk/src/ExceptDlg.pas
translator/trunk/src/FoxitPlugin/FoxitParser.res
translator/trunk/src/IBForumsPlugin/IBForumsParser.res
translator/trunk/src/ImportExportFrm.pas
translator/trunk/src/KeePassPlugin/KeePassParser.res
translator/trunk/src/KeePassPlugin/KeePassParserImpl.pas
translator/trunk/src/MainFrm.dfm
translator/trunk/src/MozillaPlugin/MozillaDTDParser.res
translator/trunk/src/MozillaPlugin/MozillaPropsParser.res
translator/trunk/src/MsDictBuild/MainFrm.pas
translator/trunk/src/MsTermBuild/MainFrm.dfm
translator/trunk/src/MsTermBuild/MainFrm.pas
translator/trunk/src/OlegPlugin/OlegParser.res
translator/trunk/src/OpenOfficeGSIPlugin/OOGSIParser.res
translator/trunk/src/OrphansFrm.dfm
translator/trunk/src/OrphansFrm.pas
translator/trunk/src/PHPNukePlugin/PHPNukeParser.res
translator/trunk/src/PHPPlugin/PHPParser.res
translator/trunk/src/POPlugin/POParser.res
translator/trunk/src/PolyglotPlugin/PolyGlotParser.res
translator/trunk/src/SciTEPlugin/SciTEParser.res
translator/trunk/src/TMXPlugin/TMXParser.res
translator/trunk/src/TRANSLATOR.INC
translator/trunk/src/ToolConsistency/ToolConsistency.res
translator/trunk/src/ToolItems.pas
translator/trunk/src/ToolKeyCheck/ToolKeyCheck.res
translator/trunk/src/ToolListEdit/ToolListEdit.res
translator/trunk/src/ToolPropertiesView/ToolPropertiesView.res
translator/trunk/src/ToolTreeView/ToolTreeView.res
translator/trunk/src/ToolTrim/ToolTrim.res
translator/trunk/src/TranslateFile.pas
translator/trunk/src/WideIniFiles.pas
translator/trunk/src/WixPlugin/WixParser.res
translator/trunk/src/XLIFFPlugin/XLIFFParser.res
translator/trunk/src/XilisoftPlugin/XilisoftParser.res
translator/trunk/src/translator.dpr
translator/trunk/src/translator.res
Modified: translator/trunk/src/CommonUtils.pas
===================================================================
--- translator/trunk/src/CommonUtils.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/CommonUtils.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -16,6 +16,7 @@
}
// $Id$
unit CommonUtils;
+{$I TRANSLATOR.INC}
interface
uses
@@ -85,7 +86,7 @@
uses
Forms, Dialogs, Math, Registry, StrUtils,
ShlObj, ActiveX, ShFolder,
- TntWindows, TntSysUtils, TntWideStrUtils;
+ TntWindows, TntSysUtils, {$IFDEF COMPILER_9_UP}WideStrUtils{$ELSE}TntWideStrUtils{$ENDIF};
function AutoWideDequotedStr(const S: WideString): WideString;
begin
Modified: translator/trunk/src/DCPPPlugin/DCPPParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/ExceptDlg.dfm
===================================================================
--- translator/trunk/src/ExceptDlg.dfm 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/ExceptDlg.dfm 2007-08-14 12:26:19 UTC (rev 246)
@@ -1,12 +1,11 @@
object ExceptionDialog: TExceptionDialog
Left = 360
Top = 150
+ Width = 497
+ Height = 444
ActiveControl = OkBtn
- AutoScroll = False
BorderIcons = [biSystemMenu]
Caption = 'ExceptionDialog'
- ClientHeight = 410
- ClientWidth = 472
Color = clBtnFace
Constraints.MinHeight = 235
Constraints.MinWidth = 480
@@ -26,7 +25,7 @@
OnResize = FormResize
OnShow = FormShow
DesignSize = (
- 472
+ 489
410)
PixelsPerInch = 96
TextHeight = 13
@@ -62,7 +61,7 @@
object pnlTop: TTntPanel
Left = 0
Top = 0
- Width = 472
+ Width = 489
Height = 64
Align = alTop
BevelInner = bvRaised
@@ -70,7 +69,7 @@
Color = clWhite
TabOrder = 3
DesignSize = (
- 472
+ 489
64)
object Label1: TTntLabel
Left = 8
Modified: translator/trunk/src/ExceptDlg.pas
===================================================================
--- translator/trunk/src/ExceptDlg.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/ExceptDlg.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -521,12 +521,12 @@
class procedure TExceptionDialog.ExceptionThreadHandler(Thread: TJclDebugThread);
begin
if ExceptionShowing then
- Application.ShowException(Thread.SyncException)
+ Application.ShowException(Thread.SyncException as Exception)
else
begin
ExceptionShowing := True;
try
- ShowException(Thread.SyncException, Thread);
+ ShowException(Thread.SyncException as Exception, Thread);
finally
ExceptionShowing := False;
end;
Modified: translator/trunk/src/FoxitPlugin/FoxitParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/IBForumsPlugin/IBForumsParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/ImportExportFrm.pas
===================================================================
--- translator/trunk/src/ImportExportFrm.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/ImportExportFrm.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -210,6 +210,7 @@
Result := 0;
APath := WideIncludeTrailingPathDelimiter(PluginFolder);
{$WARN SYMBOL_PLATFORM OFF}
+{$WARN SYMBOL_DEPRECATED OFF}
if WideFindFirst(APath + '*.dll', faAnyFile and not (faDirectory or faVolumeID), F) = 0 then
try
repeat
@@ -234,6 +235,8 @@
finally
WideFindClose(F);
end;
+{$WARN SYMBOL_PLATFORM ON}
+{$WARN SYMBOL_DEPRECATED ON}
if lvItems.Items.Count = 0 then
begin
// lvItems.Enabled := false;
Modified: translator/trunk/src/KeePassPlugin/KeePassParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/KeePassPlugin/KeePassParserImpl.pas
===================================================================
--- translator/trunk/src/KeePassPlugin/KeePassParserImpl.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/KeePassPlugin/KeePassParserImpl.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -18,6 +18,7 @@
// $Id$
unit KeePassParserImpl;
+{$I ..\TRANSLATOR.INC}
interface
uses
@@ -48,8 +49,8 @@
implementation
uses
Windows, SysUtils, Forms,
- TntWideStrUtils, WideIniFiles,
- SingleImportFrm, PreviewExportFrm,
+ {$IFDEF COMPILER_9_UP}WideStrUtils{$ELSE}TntWideStrUtils{$ENDIF},
+ WideIniFiles, SingleImportFrm, PreviewExportFrm,
KeePassParserLang;
{ TKeePassParser }
Modified: translator/trunk/src/MainFrm.dfm
===================================================================
--- translator/trunk/src/MainFrm.dfm 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/MainFrm.dfm 2007-08-14 12:26:19 UTC (rev 246)
@@ -1,11 +1,11 @@
object frmMain: TfrmMain
Left = 379
Top = 181
- Width = 573
- Height = 455
Action = acAbout
ActiveControl = reTranslation
Caption = 'Ini Translator'
+ ClientHeight = 421
+ ClientWidth = 565
Color = clBtnFace
Constraints.MinHeight = 375
Constraints.MinWidth = 450
@@ -113,466 +113,466 @@
ProcessShortCuts = True
TabOrder = 0
object mnuFile: TSpTBXSubmenuItem
+ Caption = '&File'
OnSelect = mnuFileSelect
- CaptionW = '&File'
object OpenOriginal1: TSpTBXItem
+ Caption = 'Open Original...'
+ Hint = 'Open original and translation file'
Action = acOpenOrig
- CaptionW = 'Open Original...'
- HintW = 'Open original and translation file'
end
object TBXItem13: TSpTBXItem
+ Caption = 'Save Original'
+ Hint = 'Save current original file'
Action = acSaveOriginal
- CaptionW = 'Save Original'
- HintW = 'Save current original file'
end
object TBXItem1: TSpTBXItem
+ Caption = 'Save Original As...'
+ Hint = 'Save current original file with a new filename'
Action = acSaveOrigAs
- CaptionW = 'Save Original As...'
- HintW = 'Save current original file with a new filename'
end
object TBSeparatorItem3: TSpTBXSeparatorItem
end
object ClearTranslation1: TSpTBXItem
+ Caption = 'New Translation'
+ Hint = 'Create new translation'
Action = acNewTrans
- CaptionW = 'New Translation'
- HintW = 'Create new translation'
end
object OpenTranslation1: TSpTBXItem
+ Caption = 'Open Translation...'
+ Hint = 'Open existing translation file'
Action = acOpenTrans
- CaptionW = 'Open Translation...'
- HintW = 'Open existing translation file'
end
object SaveTranslation1: TSpTBXItem
+ Caption = 'Save Translation'
+ Hint = 'Save current translation file'
Action = acSaveTrans
- CaptionW = 'Save Translation'
- HintW = 'Save current translation file'
end
object SaveTranslationAs1: TSpTBXItem
+ Caption = 'Save Translation As...'
+ Hint = 'Save current translation with a new filename'
Action = acSaveTransAs
- CaptionW = 'Save Translation As...'
- HintW = 'Save current translation with a new filename'
end
object N1: TSpTBXSeparatorItem
end
object TBXItem4: TSpTBXItem
+ Caption = 'Import...'
+ Hint = 'Import from an external file or files'
Action = acImport
- CaptionW = 'Import...'
- HintW = 'Import from an external file or files'
end
object TBXItem3: TSpTBXItem
+ Caption = 'Export...'
+ Hint = 'Export to an external file or files'
Action = acExport
- CaptionW = 'Export...'
- HintW = 'Export to an external file or files'
end
object TBXSeparatorItem4: TSpTBXSeparatorItem
end
object SelectLanguage1: TSpTBXItem
+ Caption = 'Preferences...'
+ Hint = 'Display the settings dialog'
Action = acPreferences
- CaptionW = 'Preferences...'
- HintW = 'Display the settings dialog'
end
object TBSeparatorItem16: TSpTBXSeparatorItem
end
object miRecentlyUsed: TSpTBXSubmenuItem
+ Caption = 'Reopen'
DropdownCombo = True
- CaptionW = 'Reopen'
object TBMRUListItem1: TTBXMRUListItem
MRUList = MRUFiles
end
object TBSeparatorItem15: TSpTBXSeparatorItem
end
object TBItem31: TSpTBXItem
+ Caption = 'Clear'
+ Hint = 'Clear the MRU list'
Action = acClearMRU
- CaptionW = 'Clear'
- HintW = 'Clear the MRU list'
end
object TBItem32: TSpTBXItem
+ Caption = 'Remove Invalid'
+ Hint = 'Remove invalid entries from the MRU list'
Action = acClearInvalidMRU
- CaptionW = 'Remove Invalid'
- HintW = 'Remove invalid entries from the MRU list'
end
end
object N11: TSpTBXSeparatorItem
end
object Exit1: TSpTBXItem
+ Caption = 'Exit'
+ Hint = 'Exit application'
Action = acExit
- CaptionW = 'Exit'
- HintW = 'Exit application'
end
end
object Edit1: TSpTBXSubmenuItem
+ Caption = '&Edit'
ShortCut = 16474
- CaptionW = '&Edit'
object TBItem14: TSpTBXItem
+ Caption = 'Undo'
+ Hint = 'Undo last action'
Action = acUndo
- CaptionW = 'Undo'
- HintW = 'Undo last action'
end
object TBSeparatorItem8: TSpTBXSeparatorItem
end
object TBItem5: TSpTBXItem
+ Caption = 'Cut'
+ Hint = 'Cut selected text'
Action = acCut
- CaptionW = 'Cut'
- HintW = 'Cut selected text'
end
object TBItem7: TSpTBXItem
+ Caption = 'Copy'
+ Hint = 'Copy selected text'
Action = acCopy
- CaptionW = 'Copy'
- HintW = 'Copy selected text'
end
object acCopyFromOriginal1: TSpTBXItem
+ Caption = 'Copy from Original'
+ Hint = 'Copy the value of Original to Translation'
Action = acCopyFromOriginal
- CaptionW = 'Copy from Original'
- HintW = 'Copy the value of Original to Translation'
end
object TBItem13: TSpTBXItem
+ Caption = 'Copy from Name'
+ Hint = 'Copy the value of Name to Translation'
Action = acCopyFromName
- CaptionW = 'Copy from Name'
- HintW = 'Copy the value of Name to Translation'
end
object TBItem6: TSpTBXItem
+ Caption = 'Paste'
+ Hint = 'Paste from clipboard'
Action = acPaste
- CaptionW = 'Paste'
- HintW = 'Paste from clipboard'
end
object TBSeparatorItem6: TSpTBXSeparatorItem
end
object Find1: TSpTBXItem
+ Caption = 'Find...'
+ Hint = 'Search for text'
Action = acFind
- CaptionW = 'Find...'
- HintW = 'Search for text'
end
object FindNext1: TSpTBXItem
+ Caption = 'Find Next'
+ Hint = 'Continue searching'
Action = acFindNext
- CaptionW = 'Find Next'
- HintW = 'Continue searching'
end
object Replace1: TSpTBXItem
+ Caption = 'Replace...'
+ Hint = 'Replace text'
Action = acReplace
- CaptionW = 'Replace...'
- HintW = 'Replace text'
end
object N8: TSpTBXSeparatorItem
end
object ToggleFocus1: TSpTBXItem
+ Caption = 'Toggle Focus'
+ Hint = 'Toggle focus between list and translation'
Action = acToggleFocus
- CaptionW = 'Toggle Focus'
- HintW = 'Toggle focus between list and translation'
end
end
object Navigation1: TSpTBXSubmenuItem
- CaptionW = '&Actions'
+ Caption = '&Actions'
object tbxSpellCheck: TSpTBXItem
+ Caption = 'Spelling...'
+ Hint = 'Spell check the translations'
Action = acSpellCheck
- CaptionW = 'Spelling...'
- HintW = 'Spell check the translations'
end
object Previous1: TSpTBXItem
+ Caption = 'Previous'
+ Hint = 'Go to previous item in list'
Action = acPrev
- CaptionW = 'Previous'
- HintW = 'Go to previous item in list'
end
object Next1: TSpTBXItem
+ Caption = 'Next'
+ Hint = 'Go to next item in list'
Action = acNext
- CaptionW = 'Next'
- HintW = 'Go to next item in list'
end
object About2: TSpTBXSeparatorItem
end
object Previousuntranslated1: TSpTBXItem
+ Caption = 'Prev untranslated'
+ Hint = 'Go to previous untranslated item'
Action = acPrevUntranslated
- CaptionW = 'Prev untranslated'
- HintW = 'Go to previous untranslated item'
end
object Nextuntranslated1: TSpTBXItem
+ Caption = 'Next untranslated'
+ Hint = 'Go to next untranslated item'
Action = acNextUntranslated
- CaptionW = 'Next untranslated'
- HintW = 'Go to next untranslated item'
end
object SpTBXSeparatorItem1: TSpTBXSeparatorItem
end
object SpTBXItem2: TSpTBXItem
+ Caption = 'Use this translation everywhere'
+ Hint = 'Use this translation everywhere'
Action = acReplaceEverywhere
- CaptionW = 'Use this translation everywhere'
- HintW = 'Use this translation everywhere'
end
object SpTBXItem1: TSpTBXItem
+ Caption = 'Make all translations consistent'
Action = acMakeConsistent
- CaptionW = 'Make all translations consistent'
end
object N4: TSpTBXSeparatorItem
end
object Unsort1: TSpTBXItem
+ Caption = 'Restore original sort'
+ Hint = 'Restore original sort'
Action = acRestoreSort
- CaptionW = 'Restore original sort'
- HintW = 'Restore original sort'
end
object TBSeparatorItem10: TSpTBXSeparatorItem
end
object TBSubmenuItem3: TSpTBXSubmenuItem
- CaptionW = 'Toggle Bookmark'
+ Caption = 'Toggle Bookmark'
object TBItem41: TSpTBXItem
+ Caption = 'Bookmark 0'
+ Hint = 'Toggle Bookmark 0 on/off'
Action = acToggleBookmark0
Images = ilBookmarks
- CaptionW = 'Bookmark 0'
- HintW = 'Toggle Bookmark 0 on/off'
end
object TBItem40: TSpTBXItem
+ Caption = 'Bookmark 1'
+ Hint = 'Toggle Bookmark 1 on/off'
Action = acToggleBookmark1
Images = ilBookmarks
- CaptionW = 'Bookmark 1'
- HintW = 'Toggle Bookmark 1 on/off'
end
object TBItem39: TSpTBXItem
+ Caption = 'Bookmark 2'
+ Hint = 'Toggle Bookmark 2 on/off'
Action = acToggleBookmark2
Images = ilBookmarks
- CaptionW = 'Bookmark 2'
- HintW = 'Toggle Bookmark 2 on/off'
end
object TBItem38: TSpTBXItem
+ Caption = 'Bookmark 3'
+ Hint = 'Toggle Bookmark 3 on/off'
Action = acToggleBookmark3
Images = ilBookmarks
- CaptionW = 'Bookmark 3'
- HintW = 'Toggle Bookmark 3 on/off'
end
object TBItem37: TSpTBXItem
+ Caption = 'Bookmark 4'
+ Hint = 'Toggle Bookmark 4 on/off'
Action = acToggleBookmark4
Images = ilBookmarks
- CaptionW = 'Bookmark 4'
- HintW = 'Toggle Bookmark 4 on/off'
end
object TBItem30: TSpTBXItem
+ Caption = 'Bookmark 5'
+ Hint = 'Toggle Bookmark 5 on/off'
Action = acToggleBookmark5
Images = ilBookmarks
- CaptionW = 'Bookmark 5'
- HintW = 'Toggle Bookmark 5 on/off'
end
object TBItem28: TSpTBXItem
+ Caption = 'Bookmark 6'
+ Hint = 'Toggle Bookmark 6 on/off'
Action = acToggleBookmark6
Images = ilBookmarks
- CaptionW = 'Bookmark 6'
- HintW = 'Toggle Bookmark 6 on/off'
end
object TBItem26: TSpTBXItem
+ Caption = 'Bookmark 7'
+ Hint = 'Toggle Bookmark 7 on/off'
Action = acToggleBookmark7
Images = ilBookmarks
- CaptionW = 'Bookmark 7'
- HintW = 'Toggle Bookmark 7 on/off'
end
object TBItem23: TSpTBXItem
+ Caption = 'Bookmark 8'
+ Hint = 'Toggle Bookmark 8 on/off'
Action = acToggleBookmark8
Images = ilBookmarks
- CaptionW = 'Bookmark 8'
- HintW = 'Toggle Bookmark 8 on/off'
end
object TBItem22: TSpTBXItem
+ Caption = 'Bookmark 9'
+ Hint = 'Toggle Bookmark 9 on/off'
Action = acToggleBookmark9
Images = ilBookmarks
- CaptionW = 'Bookmark 9'
- HintW = 'Toggle Bookmark 9 on/off'
end
end
object TBSubmenuItem4: TSpTBXSubmenuItem
- CaptionW = 'Goto Bookmark'
+ Caption = 'Goto Bookmark'
object TBItem51: TSpTBXItem
+ Caption = 'Bookmark 0'
+ Hint = 'Goto Bookmark 0'
Action = acGotoBookmark0
Images = ilBookmarks
- CaptionW = 'Bookmark 0'
- HintW = 'Goto Bookmark 0'
end
object TBItem50: TSpTBXItem
+ Caption = 'Bookmark 1'
+ Hint = 'Goto Bookmark 1'
Action = acGotoBookmark1
Images = ilBookmarks
- CaptionW = 'Bookmark 1'
- HintW = 'Goto Bookmark 1'
end
object TBItem49: TSpTBXItem
+ Caption = 'Bookmark 2'
+ Hint = 'Goto Bookmark 2'
Action = acGotoBookmark2
Images = ilBookmarks
- CaptionW = 'Bookmark 2'
- HintW = 'Goto Bookmark 2'
end
object TBItem48: TSpTBXItem
+ Caption = 'Bookmark 3'
+ Hint = 'Goto Bookmark 3'
Action = acGotoBookmark3
Images = ilBookmarks
- CaptionW = 'Bookmark 3'
- HintW = 'Goto Bookmark 3'
end
object TBItem47: TSpTBXItem
+ Caption = 'Bookmark 4'
+ Hint = 'Goto Bookmark 4'
Action = acGotoBookmark4
Images = ilBookmarks
- CaptionW = 'Bookmark 4'
- HintW = 'Goto Bookmark 4'
end
object TBItem46: TSpTBXItem
+ Caption = 'Bookmark 5'
+ Hint = 'Goto Bookmark 5'
Action = acGotoBookmark5
Images = ilBookmarks
- CaptionW = 'Bookmark 5'
- HintW = 'Goto Bookmark 5'
end
object TBItem45: TSpTBXItem
+ Caption = 'Bookmark 6'
+ Hint = 'Goto Bookmark 6'
Action = acGotoBookmark6
Images = ilBookmarks
- CaptionW = 'Bookmark 6'
- HintW = 'Goto Bookmark 6'
end
object TBItem44: TSpTBXItem
+ Caption = 'Bookmark 7'
+ Hint = 'Goto Bookmark 7'
Action = acGotoBookmark7
Images = ilBookmarks
- CaptionW = 'Bookmark 7'
- HintW = 'Goto Bookmark 7'
end
object TBItem43: TSpTBXItem
+ Caption = 'Bookmark 8'
+ Hint = 'Goto Bookmark 8'
Action = acGotoBookmark8
Images = ilBookmarks
- CaptionW = 'Bookmark 8'
- HintW = 'Goto Bookmark 8'
end
object TBItem42: TSpTBXItem
+ Caption = 'Bookmark 9'
+ Hint = 'Goto Bookmark 9'
Action = acGotoBookmark9
Images = ilBookmarks
- CaptionW = 'Bookmark 9'
- HintW = 'Goto Bookmark 9'
end
end
object TBXSeparatorItem2: TSpTBXSeparatorItem
end
object TBXItem2: TSpTBXItem
+ Caption = 'Configure Keyboard...'
+ Hint = 'Display the keyboard configuration window'
Action = acConfigureKeyboard
- CaptionW = 'Configure Keyboard...'
- HintW = 'Display the keyboard configuration window'
end
end
object TBSubmenuItem2: TSpTBXSubmenuItem
- CaptionW = '&View'
+ Caption = '&View'
object TBItem36: TSpTBXItem
- Action = acFindUnmatchedShortCut
- CaptionW = 'Next unmatched shortcut'
- HintW =
+ Caption = 'Next unmatched shortcut'
+ Hint =
'Find next translated item that is missing a shortcut key present' +
' in the original'
+ Action = acFindUnmatchedShortCut
end
object TBItem55: TSpTBXItem
- Action = acNextSuspicious
- CaptionW = 'Next suspicious translation'
- HintW =
+ Caption = 'Next suspicious translation'
+ Hint =
'Move to next item that is suspected not being translated correct' +
'ly'
+ Action = acNextSuspicious
end
object TBXItem15: TSpTBXItem
+ Caption = 'Configure suspicious translations...'
+ Hint = 'Configure the behavior of Next Suspicious Translation'
Action = acConfigSuspicious
- CaptionW = 'Configure suspicious translations...'
- HintW = 'Configure the behavior of Next Suspicious Translation'
end
object N9: TSpTBXSeparatorItem
end
object ShowQuotes1: TSpTBXItem
+ Caption = 'Show Quotes'
+ Hint = 'Show quotes in texts'
Action = acShowQuotes
- CaptionW = 'Show Quotes'
- HintW = 'Show quotes in texts'
end
object ShowDetails1: TSpTBXItem
+ Caption = 'Show Key Details'
+ Hint = 'Display the details pane'
Action = acViewDetails
- CaptionW = 'Show Key Details'
- HintW = 'Display the details pane'
end
object N10: TSpTBXSeparatorItem
end
object TBItem16: TSpTBXItem
+ Caption = 'View Comments'
+ Hint = 'Toggle the comments window'
Action = acViewComments
- CaptionW = 'View Comments'
- HintW = 'Toggle the comments window'
end
object TBItem56: TSpTBXItem
- Action = acViewOrphans
- CaptionW = 'View Orphaned Items'
- HintW =
+ Caption = 'View Orphaned Items'
+ Hint =
'Display orphans (items in translation that are not in the origin' +
'al)'
+ Action = acViewOrphans
end
object TBXSeparatorItem3: TSpTBXSeparatorItem
end
object TBXVisibilityToggleItem1: TSpTBXItem
+ Caption = 'Tools'
Control = tbTools
- CaptionW = 'Tools'
end
object TBXItem8: TSpTBXItem
+ Caption = 'Full Screen'
+ Hint = 'Toggle full screen mode'
Action = acFullScreen
- CaptionW = 'Full Screen'
- HintW = 'Toggle full screen mode'
end
end
object Dictionary1: TSpTBXSubmenuItem
- CaptionW = '&Dictionary'
+ Caption = '&Dictionary'
object CreateDictionary1: TSpTBXItem
+ Caption = 'New Dictionary...'
+ Hint = 'Create new dictionary'
Action = acDictCreate
- CaptionW = 'New Dictionary...'
- HintW = 'Create new dictionary'
end
object LoadDictionary1: TSpTBXItem
+ Caption = 'Load Dictionary...'
+ Hint = 'Load existing dictionary'
Action = acDictLoad
- CaptionW = 'Load Dictionary...'
- HintW = 'Load existing dictionary'
end
object SaveDictionary1: TSpTBXItem
+ Caption = 'Save Dictionary...'
+ Hint = 'Save current dictionary to file'
Action = acDictSave
- CaptionW = 'Save Dictionary...'
- HintW = 'Save current dictionary to file'
end
object N5: TSpTBXSeparatorItem
end
object Translatewithdictionary1: TSpTBXItem
+ Caption = 'Translate using Dictionary'
+ Hint = 'Translate using the dictionary'
Action = acDictTranslate
- CaptionW = 'Translate using Dictionary'
- HintW = 'Translate using the dictionary'
end
object TBXItem6: TSpTBXItem
+ Caption = 'Add to Dictionary'
+ Hint = 'Add current item to the dictionary'
Action = acDictAdd
- CaptionW = 'Add to Dictionary'
- HintW = 'Add current item to the dictionary'
end
object N6: TSpTBXSeparatorItem
end
object TBXItem16: TSpTBXItem
+ Caption = 'Edit Dictionary...'
+ Hint = 'Edit the currently loaded dictionary'
Action = acDictEdit
- CaptionW = 'Edit Dictionary...'
- HintW = 'Edit the currently loaded dictionary'
end
object TBXSeparatorItem8: TSpTBXSeparatorItem
end
object acDictInvert1: TSpTBXItem
+ Caption = 'Invert Dictionary'
+ Hint = 'Invert the dictionary'
Action = acDictInvert
- CaptionW = 'Invert Dictionary'
- HintW = 'Invert the dictionary'
end
end
object mnuPlugins: TSpTBXSubmenuItem
+ Caption = '&Plugins'
Visible = False
OnPopup = mnuPluginsPopup
- CaptionW = '&Plugins'
end
object mnuTools: TSpTBXSubmenuItem
+ Caption = 'T&ools'
OnPopup = mnuToolsPopup
- CaptionW = 'T&ools'
object TBXItem10: TSpTBXItem
+ Caption = 'Customize...'
+ Hint = 'Display the tools window'
Action = acToolsCustomize
- CaptionW = 'Customize...'
- HintW = 'Display the tools window'
end
end
object Help1: TSpTBXSubmenuItem
- CaptionW = '&Help'
+ Caption = '&Help'
object Help2: TSpTBXItem
+ Caption = 'Help'
+ Hint = 'Show help file'
Action = acHelp
- CaptionW = 'Help'
- HintW = 'Show help file'
end
object N7: TSpTBXSeparatorItem
end
object About1: TSpTBXItem
+ Caption = 'About...'
+ Hint = 'Show about box'
Action = acAbout
- CaptionW = 'About...'
- HintW = 'Show about box'
end
end
end
@@ -591,96 +591,96 @@
Options = [tboLongHintInMenuOnly, tboShowHint]
TabOrder = 1
object TBItem1: TSpTBXItem
+ Caption = 'Open Original...'
+ Hint = 'Open original and translation file'
Action = acOpenOrig
- CaptionW = 'Open Original...'
- HintW = 'Open original and translation file'
end
object TBSeparatorItem2: TSpTBXSeparatorItem
end
object TBItem2: TSpTBXItem
+ Caption = 'New Translation'
+ Hint = 'Create new translation'
Action = acNewTrans
- CaptionW = 'New Translation'
- HintW = 'Create new translation'
end
object TBItem3: TSpTBXItem
+ Caption = 'Open Translation...'
+ Hint = 'Open existing translation file'
Action = acOpenTrans
- CaptionW = 'Open Translation...'
- HintW = 'Open existing translation file'
end
object TBItem4: TSpTBXItem
+ Caption = 'Save Translation'
+ Hint = 'Save current translation file'
Action = acSaveTrans
- CaptionW = 'Save Translation'
- HintW = 'Save current translation file'
end
object TBSeparatorItem1: TSpTBXSeparatorItem
end
object SpTBXItem3: TSpTBXItem
+ Caption = 'Undo'
+ Hint = 'Undo last action'
Action = acUndo
- CaptionW = 'Undo'
- HintW = 'Undo last action'
end
object SpTBXSeparatorItem2: TSpTBXSeparatorItem
end
object TBItem12: TSpTBXItem
+ Caption = 'Cut'
+ Hint = 'Cut selected text'
Action = acCut
- CaptionW = 'Cut'
- HintW = 'Cut selected text'
end
object TBItem10: TSpTBXItem
+ Caption = 'Copy'
+ Hint = 'Copy selected text'
Action = acCopy
- CaptionW = 'Copy'
- HintW = 'Copy selected text'
end
object TBItem8: TSpTBXItem
+ Caption = 'Paste'
+ Hint = 'Paste from clipboard'
Action = acPaste
- CaptionW = 'Paste'
- HintW = 'Paste from clipboard'
end
object TBSeparatorItem7: TSpTBXSeparatorItem
end
object TBItem9: TSpTBXItem
+ Caption = 'Find...'
+ Hint = 'Search for text'
Action = acFind
- CaptionW = 'Find...'
- HintW = 'Search for text'
end
object TBItem11: TSpTBXItem
+ Caption = 'Replace...'
+ Hint = 'Replace text'
Action = acReplace
- CaptionW = 'Replace...'
- HintW = 'Replace text'
end
object TBSeparatorItem12: TSpTBXSeparatorItem
end
object TBItem18: TSpTBXItem
+ Caption = 'Prev untranslated'
+ Hint = 'Go to previous untranslated item'
Action = acPrevUntranslated
- CaptionW = 'Prev untranslated'
- HintW = 'Go to previous untranslated item'
end
object TBItem19: TSpTBXItem
+ Caption = 'Next untranslated'
+ Hint = 'Go to next untranslated item'
Action = acNextUntranslated
- CaptionW = 'Next untranslated'
- HintW = 'Go to next untranslated item'
end
object TBSeparatorItem4: TSpTBXSeparatorItem
end
object TBItem27: TSpTBXItem
+ Caption = 'Translate using Dictionary'
+ Hint = 'Translate using the dictionary'
Action = acDictTranslate
- CaptionW = 'Translate using Dictionary'
- HintW = 'Translate using the dictionary'
end
object TBSeparatorItem5: TSpTBXSeparatorItem
end
object TBItem29: TSpTBXItem
+ Caption = 'Help'
+ Hint = 'Show help file'
Action = acHelp
- CaptionW = 'Help'
- HintW = 'Show help file'
end
object TBXSeparatorItem1: TSpTBXSeparatorItem
end
object mnuThemes: TSpTBXSubmenuItem
+ Caption = 'Themes'
DisplayMode = nbdmImageAndText
MinWidth = 90
DropdownCombo = True
- CaptionW = 'Themes'
object mnuThemesGroup: TSpTBXThemeGroupItem
end
end
@@ -3833,50 +3833,50 @@
Left = 38
Top = 158
object Undo1: TSpTBXItem
+ Caption = 'Undo'
+ Hint = 'Undo last action'
Action = acUndo
- CaptionW = 'Undo'
- HintW = 'Undo last action'
end
object N13: TSpTBXSeparatorItem
end
object Cut1: TSpTBXItem
+ Caption = 'Cut'
+ Hint = 'Cut selected text'
Action = acCut
- CaptionW = 'Cut'
- HintW = 'Cut selected text'
end
object Copy1: TSpTBXItem
+ Caption = 'Copy'
+ Hint = 'Copy selected text'
Action = acCopy
- CaptionW = 'Copy'
- HintW = 'Copy selected text'
end
object Paste1: TSpTBXItem
+ Caption = 'Paste'
+ Hint = 'Paste from clipboard'
Action = acPaste
- CaptionW = 'Paste'
- HintW = 'Paste from clipboard'
end
object N14: TSpTBXSeparatorItem
end
object TBItem54: TSpTBXItem
+ Caption = 'Use this translation everywhere'
+ Hint = 'Use this translation everywhere'
Action = acReplaceEverywhere
- CaptionW = 'Use this translation everywhere'
- HintW = 'Use this translation everywhere'
end
object SelectAll1: TSpTBXItem
+ Caption = 'Select All'
+ Hint = 'Select all text'
Action = acSelectAll
- CaptionW = 'Select All'
- HintW = 'Select all text'
end
object TBSeparatorItem9: TSpTBXSeparatorItem
end
object TBItem17: TSpTBXItem
+ Caption = 'ASCII Value(s)...'
+ Hint = 'Show the ASCII values for the selected text'
Action = acAsciiValues
- CaptionW = 'ASCII Value(s)...'
- HintW = 'Show the ASCII values for the selected text'
end
object TBXSeparatorItem6: TSpTBXSeparatorItem
end
object smiDictionary: TSpTBXSubmenuItem
- CaptionW = 'Dictionary'
+ Caption = 'Dictionary'
end
end
object popList: TSpTBXPopupMenu
@@ -3884,67 +3884,67 @@
Left = 78
Top = 158
object TBItem20: TSpTBXItem
+ Caption = 'Copy from Original'
+ Hint = 'Copy the value of Original to Translation'
Action = acCopyFromOriginal
- CaptionW = 'Copy from Original'
- HintW = 'Copy the value of Original to Translation'
end
object TBItem21: TSpTBXItem
+ Caption = 'Copy from Name'
+ Hint = 'Copy the value of Name to Translation'
Action = acCopyFromName
- CaptionW = 'Copy from Name'
- HintW = 'Copy the value of Name to Translation'
end
object TBXItem7: TSpTBXItem
+ Caption = 'Add to Dictionary'
+ Hint = 'Add current item to the dictionary'
Action = acDictAdd
- CaptionW = 'Add to Dictionary'
- HintW = 'Add current item to the dictionary'
end
object TBSeparatorItem14: TSpTBXSeparatorItem
end
object TBItem24: TSpTBXItem
+ Caption = 'Next untranslated'
+ Hint = 'Go to next untranslated item'
Action = acNextUntranslated
- CaptionW = 'Next untranslated'
- HintW = 'Go to next untranslated item'
end
object TBItem25: TSpTBXItem
+ Caption = 'Prev untranslated'
+ Hint = 'Go to previous untranslated item'
Action = acPrevUntranslated
- CaptionW = 'Prev untranslated'
- HintW = 'Go to previous untranslated item'
end
object TBSeparatorItem11: TSpTBXSeparatorItem
end
object TBItem53: TSpTBXItem
+ Caption = 'Clear All Translations'
+ Hint = 'Clear the translated text'
Action = acClearAllTranslations
- CaptionW = 'Clear All Translations'
- HintW = 'Clear the translated text'
end
object TBItem52: TSpTBXItem
+ Caption = 'Use this translation everywhere'
+ Hint = 'Use this translation everywhere'
Action = acReplaceEverywhere
- CaptionW = 'Use this translation everywhere'
- HintW = 'Use this translation everywhere'
end
object TBXSeparatorItem5: TSpTBXSeparatorItem
end
object TBXItem5: TSpTBXItem
+ Caption = 'Translated'
+ Hint = 'Toggle the Translated status of the item'
Action = acToggleTranslated
- CaptionW = 'Translated'
- HintW = 'Toggle the Translated status of the item'
end
object TBXSeparatorItem7: TSpTBXSeparatorItem
end
object TBXItem12: TSpTBXItem
+ Caption = 'Add Item...'
+ Hint = 'Add new item to original and translation'
Action = acAddItem
- CaptionW = 'Add Item...'
- HintW = 'Add new item to original and translation'
end
object TBXItem11: TSpTBXItem
+ Caption = 'Edit Item...'
+ Hint = 'Edit all parts of the current item'
Action = acEditItem
- CaptionW = 'Edit Item...'
- HintW = 'Edit all parts of the current item'
end
object TBXItem9: TSpTBXItem
+ Caption = 'Delete Item...'
+ Hint = 'Delete the current item from both original and translation'
Action = acDeleteItem
- CaptionW = 'Delete Item...'
- HintW = 'Delete the current item from both original and translation'
end
end
object MRUFiles: TTBXMRUList
Modified: translator/trunk/src/MozillaPlugin/MozillaDTDParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/MozillaPlugin/MozillaPropsParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/MsDictBuild/MainFrm.pas
===================================================================
--- translator/trunk/src/MsDictBuild/MainFrm.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/MsDictBuild/MainFrm.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -18,6 +18,7 @@
// $Id$
unit MainFrm;
+{$I ..\TRANSLATOR.INC}
interface
@@ -66,7 +67,8 @@
implementation
uses
- IniFiles, ShellAPI, ShFolder, TntWideStrUtils;
+ IniFiles, ShellAPI, ShFolder,
+ {$IFDEF COMPILER_9_UP}WideStrUtils{$ELSE}TntWideStrUtils{$ENDIF};
{$R *.dfm}
Modified: translator/trunk/src/MsTermBuild/MainFrm.dfm
===================================================================
--- translator/trunk/src/MsTermBuild/MainFrm.dfm 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/MsTermBuild/MainFrm.dfm 2007-08-14 12:26:19 UTC (rev 246)
@@ -114,7 +114,7 @@
Width = 253
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 2
end
object cbTranslation: TTntComboBox
@@ -123,7 +123,7 @@
Width = 264
Height = 21
Style = csDropDownList
- ItemHeight = 13
+ ItemHeight = 0
TabOrder = 3
end
object btnCreate: TTntButton
Modified: translator/trunk/src/MsTermBuild/MainFrm.pas
===================================================================
--- translator/trunk/src/MsTermBuild/MainFrm.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/MsTermBuild/MainFrm.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -1,4 +1,5 @@
unit MainFrm;
+{$I ..\TRANSLATOR.INC}
interface
@@ -48,7 +49,7 @@
implementation
uses
- TntWideStrUtils, IniFiles, TntWindows;
+ {$IFDEF COMPILER_9_UP}WideStrUtils{$ELSE}TntWideStrUtils{$ENDIF}, IniFiles, TntWindows;
{$R *.dfm}
Modified: translator/trunk/src/OlegPlugin/OlegParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/OpenOfficeGSIPlugin/OOGSIParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/OrphansFrm.dfm
===================================================================
--- translator/trunk/src/OrphansFrm.dfm 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/OrphansFrm.dfm 2007-08-14 12:26:19 UTC (rev 246)
@@ -24,7 +24,7 @@
Left = 0
Top = 64
Width = 433
- Height = 219
+ Height = 223
Align = alClient
BevelInner = bvNone
BevelOuter = bvRaised
@@ -45,6 +45,7 @@
ReadOnly = True
RowSelect = True
ParentShowHint = False
+ PopupMenu = popList
ShowHint = True
TabOrder = 0
ViewStyle = vsReport
@@ -54,7 +55,7 @@
end
object StatusBar1: TTntStatusBar
Left = 0
- Top = 283
+ Top = 287
Width = 433
Height = 19
Panels = <>
@@ -129,6 +130,10 @@
end
object SpTBXSeparatorItem3: TSpTBXSeparatorItem
end
+ object SpTBXItem1: TSpTBXItem
+ Action = acAdd
+ CaptionW = 'Add to main list'
+ end
object SpTBXItem17: TSpTBXItem
Action = acCopy
CaptionW = 'Copy'
@@ -166,8 +171,12 @@
end
object alOrphans: TTntActionList
OnUpdate = alOrphansUpdate
- Left = 194
- Top = 148
+ Left = 42
+ Top = 100
+ object acAdd: TTntAction
+ Caption = 'Add to main list'
+ OnExecute = acAddExecute
+ end
object acCopy: TTntAction
Caption = 'Copy'
ShortCut = 16451
@@ -213,4 +222,36 @@
OnExecute = acFindNextExecute
end
end
+ object popList: TSpTBXPopupMenu
+ Left = 86
+ Top = 102
+ object SpTBXItem2: TSpTBXItem
+ Action = acAdd
+ CaptionW = 'Add to main list'
+ end
+ object SpTBXItem7: TSpTBXItem
+ Action = acCopy
+ CaptionW = 'Copy'
+ end
+ object SpTBXItem6: TSpTBXItem
+ Action = acRemove
+ CaptionW = 'Remove'
+ end
+ object SpTBXSeparatorItem1: TSpTBXSeparatorItem
+ end
+ object SpTBXItem5: TSpTBXItem
+ Action = acPaste
+ CaptionW = 'Paste into current item'
+ end
+ object SpTBXSeparatorItem2: TSpTBXSeparatorItem
+ end
+ object SpTBXItem3: TSpTBXItem
+ Action = acFindItem
+ CaptionW = 'Find Item'
+ end
+ object SpTBXItem8: TSpTBXItem
+ Action = acFindNext
+ CaptionW = 'Find Next'
+ end
+ end
end
Modified: translator/trunk/src/OrphansFrm.pas
===================================================================
--- translator/trunk/src/OrphansFrm.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/OrphansFrm.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -63,6 +63,17 @@
SpTBXSeparatorItem3: TSpTBXSeparatorItem;
SpTBXSeparatorItem4: TSpTBXSeparatorItem;
SpTBXSeparatorItem5: TSpTBXSeparatorItem;
+ popList: TSpTBXPopupMenu;
+ SpTBXItem3: TSpTBXItem;
+ SpTBXItem5: TSpTBXItem;
+ SpTBXItem6: TSpTBXItem;
+ SpTBXItem7: TSpTBXItem;
+ SpTBXItem8: TSpTBXItem;
+ SpTBXSeparatorItem1: TSpTBXSeparatorItem;
+ SpTBXSeparatorItem2: TSpTBXSeparatorItem;
+ acAdd: TTntAction;
+ SpTBXItem1: TSpTBXItem;
+ SpTBXItem2: TSpTBXItem;
procedure lvOrphanedResize(Sender: TObject);
procedure acCopyExecute(Sender: TObject);
procedure alOrphansUpdate(Action: TBasicAction; var Handled: Boolean);
@@ -78,13 +89,15 @@
procedure acPasteExecute(Sender: TObject);
procedure acFindItemExecute(Sender: TObject);
procedure acFindNextExecute(Sender: TObject);
+ procedure acAddExecute(Sender: TObject);
private
+ { Private declarations }
FAppServices: IApplicationServices;
FOnMerge: TNotifyEvent;
procedure SaveToFile(const FileName: WideString);
procedure ShowError(Count: integer);
function SelectedItem: ITranslationItem;
- { Private declarations }
+ function SelectedIndex: integer;
public
{ Public declarations }
class function Edit(const ApplicationServices: IApplicationServices; CanMerge: boolean; OnMerge: TNotifyEvent): boolean;
@@ -107,6 +120,7 @@
frmOrphans.lvOrphaned.Items.Count := ApplicationServices.Orphans.Count;
frmOrphans.acSave.Enabled := ApplicationServices.Orphans.Count > 0;
frmOrphans.acMerge.Enabled := Assigned(OnMerge) and CanMerge and (ApplicationServices.Orphans.Count > 0);
+ frmOrphans.acAdd.Enabled := frmOrphans.acMerge.Enabled;
Result := frmOrphans.ShowModal = mrOK;
finally
frmOrphans.Free;
@@ -256,6 +270,26 @@
FAppServices.SelectedItem.Translation := SelectedItem.Translation;
end;
+procedure TfrmOrphans.acAddExecute(Sender: TObject);
+var i:integer;
+begin
+ if (SelectedItem <> nil) then
+ begin
+ FAppServices.BeginUpdate;
+ lvOrphaned.Items.BeginUpdate;
+ try
+ i := SelectedIndex;
+ FAppServices.Items.Add(SelectedItem);
+ FAppServices.Orphans.Delete(i);
+ lvOrphaned.Items.Count := FAppServices.Orphans.Count;
+ lvOrphaned.Invalidate;
+ finally
+ FAppServices.EndUpdate;
+ lvOrphaned.Items.EndUpdate;
+ end;
+ end;
+end;
+
procedure TfrmOrphans.acFindItemExecute(Sender: TObject);
var
i: integer;
@@ -311,5 +345,16 @@
Result := nil;
end;
+function TfrmOrphans.SelectedIndex: integer;
+begin
+ if lvOrphaned.Selected <> nil then
+ Result := lvOrphaned.Selected.Index
+ else
+ Result := -1;
+end;
+
+
+
+
end.
Modified: translator/trunk/src/PHPNukePlugin/PHPNukeParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/PHPPlugin/PHPParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/POPlugin/POParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/PolyglotPlugin/PolyGlotParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/SciTEPlugin/SciTEParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/TMXPlugin/TMXParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/TRANSLATOR.INC
===================================================================
--- translator/trunk/src/TRANSLATOR.INC 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/TRANSLATOR.INC 2007-08-14 12:26:19 UTC (rev 246)
@@ -1,5 +1,3 @@
-// define this if you have Addict SpellCheck (http://www.addictivesoftware.com)
-{$DEFINE USEADDICTSPELLCHECKER}
// define this if you have the JCL exception handler
{$DEFINE USEJCLDEBUGHANDLER}
// define this to use TBX pre 2.2 beta
@@ -9,10 +7,17 @@
// defines for various Delphi/Kylix versions
{$IFDEF WIN32}
+
{$IFDEF VER180}
{$DEFINE COMPILER_10}
{$DEFINE DELPHI}
- {$DEFINE DELPHI_10}
+
+ {$IFDEF VER185}
+ {$UNDEF COMPILER_10}
+ {$UNDEF DELPHI_10}
+ {$DEFINE COMPILER_11}
+ {$DEFINE DELPHI_11}
+ {$ENDIF}
{$ENDIF}
{$IFDEF VER170}
@@ -21,6 +26,13 @@
{$DEFINE DELPHI_9}
{$ENDIF}
+ {$IFDEF VER160}
+ {$DEFINE COMPILER_8}
+ {$DEFINE DELPHI}
+ {$DEFINE DELPHI_8}
+ {$ENDIF}
+
+
{$IFDEF VER150}
{$DEFINE COMPILER_7}
{$DEFINE DELPHI}
@@ -130,6 +142,39 @@
{$DEFINE DELPHI_7_UP}
{$ENDIF}
+ {$IFDEF DELPHI_9}
+ {$DEFINE DELPHI_2_UP}
+ {$DEFINE DELPHI_3_UP}
+ {$DEFINE DELPHI_4_UP}
+ {$DEFINE DELPHI_5_UP}
+ {$DEFINE DELPHI_6_UP}
+ {$DEFINE DELPHI_7_UP}
+ {$DEFINE DELPHI_9_UP}
+ {$ENDIF}
+
+ {$IFDEF DELPHI_10}
+ {$DEFINE DELPHI_2_UP}
+ {$DEFINE DELPHI_3_UP}
+ {$DEFINE DELPHI_4_UP}
+ {$DEFINE DELPHI_5_UP}
+ {$DEFINE DELPHI_6_UP}
+ {$DEFINE DELPHI_7_UP}
+ {$DEFINE DELPHI_9_UP}
+ {$DEFINE DELPHI_10_UP}
+ {$ENDIF}
+
+ {$IFDEF DELPHI_11}
+ {$DEFINE DELPHI_2_UP}
+ {$DEFINE DELPHI_3_UP}
+ {$DEFINE DELPHI_4_UP}
+ {$DEFINE DELPHI_5_UP}
+ {$DEFINE DELPHI_6_UP}
+ {$DEFINE DELPHI_7_UP}
+ {$DEFINE DELPHI_9_UP}
+ {$DEFINE DELPHI_10_UP}
+ {$DEFINE DELPHI_11_UP}
+ {$ENDIF}
+
{$IFDEF CPPB_3}
{$DEFINE CPPB_3_UP}
{$ENDIF}
@@ -165,6 +210,12 @@
{$DEFINE KYLIX_1}
{$DEFINE KYLIX_1_UP}
+
+ {$IFDEF VER160}
+ {$DEFINE COMPILER_8}
+ {$DEFINE KYLIX_3}
+ {$ENDIF}
+
{$IFDEF VER150}
{$DEFINE COMPILER_7}
{$DEFINE KYLIX_3}
@@ -236,6 +287,17 @@
{$DEFINE COMPILER_7_UP}
{$ENDIF}
+{$IFDEF COMPILER_8}
+ {$DEFINE COMPILER_1_UP}
+ {$DEFINE COMPILER_2_UP}
+ {$DEFINE COMPILER_3_UP}
+ {$DEFINE COMPILER_4_UP}
+ {$DEFINE COMPILER_5_UP}
+ {$DEFINE COMPILER_6_UP}
+ {$DEFINE COMPILER_7_UP}
+ {$DEFINE COMPILER_8_UP}
+{$ENDIF}
+
{$IFDEF COMPILER_9}
{$DEFINE COMPILER_1_UP}
{$DEFINE COMPILER_2_UP}
@@ -244,6 +306,7 @@
{$DEFINE COMPILER_5_UP}
{$DEFINE COMPILER_6_UP}
{$DEFINE COMPILER_7_UP}
+ {$DEFINE COMPILER_8_UP}
{$DEFINE COMPILER_9_UP}
{$ENDIF}
@@ -255,16 +318,35 @@
{$DEFINE COMPILER_5_UP}
{$DEFINE COMPILER_6_UP}
{$DEFINE COMPILER_7_UP}
+ {$DEFINE COMPILER_8_UP}
{$DEFINE COMPILER_9_UP}
{$DEFINE COMPILER_10_UP}
{$ENDIF}
-{$DEFINE TURBO_DELPHI}
+{$IFDEF COMPILER_11}
+ {$DEFINE COMPILER_1_UP}
+ {$DEFINE COMPILER_2_UP}
+ {$DEFINE COMPILER_3_UP}
+ {$DEFINE COMPILER_4_UP}
+ {$DEFINE COMPILER_5_UP}
+ {$DEFINE COMPILER_6_UP}
+ {$DEFINE COMPILER_7_UP}
+ {$DEFINE COMPILER_8_UP}
+ {$DEFINE COMPILER_9_UP}
+ {$DEFINE COMPILER_10_UP}
+ {$DEFINE COMPILER_11_UP}
+{$ENDIF}
+
+{.$DEFINE TURBO_DELPHI}
{$IFDEF TURBO_DELPHI}
+ {$UNDEF COMPILER_8}
+ {$UNDEF COMPILER_8_UP}
{$UNDEF COMPILER_9}
{$UNDEF COMPILER_9_UP}
{$UNDEF COMPILER_10}
{$UNDEF COMPILER_10_UP}
+ {$UNDEF COMPILER_11}
+ {$UNDEF COMPILER_11_UP}
{$ENDIF}
//----------------------------------------------------------------------------------------------------------------------
@@ -280,3 +362,7 @@
{$WARN UNSAFE_CODE OFF}
{$WARN UNSAFE_CAST OFF}
{$ENDIF}
+
+// define this if you have Addict SpellCheck (http://www.addictivesoftware.com)
+{$DEFINE USEADDICTSPELLCHECKER}
+
Modified: translator/trunk/src/ToolConsistency/ToolConsistency.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/ToolItems.pas
===================================================================
--- translator/trunk/src/ToolItems.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/ToolItems.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -190,6 +190,7 @@
// load all the matching plugin DLL's into a helper class
APath := WideIncludeTrailingPathDelimiter(PluginFolder);
{$WARN SYMBOL_PLATFORM OFF}
+{$WARN SYMBOL_DEPRECATED OFF}
if SysUtils.FindFirst(APath + '*.dll', faAnyFile and not (faDirectory or faVolumeID), F) = 0 then
try
repeat
@@ -217,6 +218,8 @@
finally
SysUtils.FindClose(F);
end;
+{$WARN SYMBOL_PLATFORM ON}
+{$WARN SYMBOL_DEPRECATED ON}
end;
procedure TExternalToolItems.ReleasePlugins;
Modified: translator/trunk/src/ToolKeyCheck/ToolKeyCheck.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/ToolListEdit/ToolListEdit.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/ToolPropertiesView/ToolPropertiesView.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/ToolTreeView/ToolTreeView.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/ToolTrim/ToolTrim.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/TranslateFile.pas
===================================================================
--- translator/trunk/src/TranslateFile.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/TranslateFile.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -82,7 +82,7 @@
destructor Destroy; override;
function TransQuote: WideChar;
function OrigQuote: WideChar;
- published
+ public
property Owner: ITranslationItems read GetOwner write SetOwner;
property Index: integer read GetIndex write SetIndex;
@@ -164,7 +164,7 @@
implementation
uses
- Windows, TntSystem;
+ Windows, TntSystem, CommonUtils;
function trimQuotes(const S: WideString; Quote: WideChar): WideString;
begin
@@ -536,7 +536,7 @@
function TTranslateFiles.LoadOriginal(const Filename: WideString; Encoding: TEncoding): TEncoding;
var
S, FComments: TTntStringlist;
- ASection: WideString;
+ ASection, tmpString, tmpTrimString: WideString;
i, j: integer;
begin
FItems.Clear;
@@ -544,6 +544,7 @@
FItems.Sort := stNone;
S := TTntStringlist.Create;
+
FComments := TTntStringlist.Create;
try
if AppUtils.AutoDetectCharacterSet(Filename) = feAnsi then // only use the requested encoding if the file has no BOM
@@ -568,27 +569,29 @@
end;
for i := 0 to S.Count - 1 do
begin
- if InStringList(CommentChars, S[i]) then
- FComments.Add(S[i])
- else if (WideTextPos(StartSection, S[i]) = 1) and (WideTextPos(EndSection, S[i]) = Length(S[i])) then
- ASection := Copy(S[i], 2, Length(S[i]) - 2)
- else if (WideTextPos(SeparatorChar, S[i]) > 1) then
+ tmpString := S[i];
+ tmpTrimString := trim(tmpString);
+ if InStringList(CommentChars, tmpString) then
+ FComments.Add(tmpString)
+ else if WideStartsText(StartSection, tmpTrimString) and WideEndsText(EndSection, tmpTrimString) then
+ ASection := Copy(tmpTrimString, 2, Length(tmpTrimString) - 2)
+ else if (WideTextPos(SeparatorChar, tmpString) > 1) then
begin
- j := WideTextPos(SeparatorChar, S[i]);
+ j := WideTextPos(SeparatorChar, tmpString);
if j > 1 then
begin
with FItems.Add do
begin
Section := ASection;
- Name := Copy(S[i], 1, j - 1);
- Original := Copy(S[i], j + 1, MaxInt);
+ Name := Copy(tmpString, 1, j - 1);
+ Original := Copy(tmpString, j + 1, MaxInt);
OrigComments := FComments.Text;
FComments.Clear;
end;
end;
end
else
- FComments.Add(S[i]);
+ FComments.Add(tmpString);
end;
finally
S.Free;
@@ -599,7 +602,7 @@
function TTranslateFiles.LoadTranslation(const Filename: WideString; Encoding: TEncoding): TEncoding;
var
S, FComments: TTNTStringlist;
- ASection: WideString;
+ ASection, tmpString, tmpTrimString: WideString;
i, j, k: integer;
FOldSort: TTranslateSortType;
FItem: ITranslationItem;
@@ -633,20 +636,21 @@
end;
for i := 0 to S.Count - 1 do
begin
- if InStringList(CommentChars, S[i]) then
- FComments.Add(S[i])
- else if (WideTextPos(StartSection, S[i]) = 1) and (WideTextPos(EndSection, S[i]) = Length(S[i]))
- and (WideTextPos(SeparatorChar, S[i]) = 0) then
- ASection := Copy(S[i], 2, Length(S[i]) - 2)
+ tmpString := S[i];
+ tmpTrimString := trim(tmpString);
+ if InStringList(CommentChars, tmpString) then
+ FComments.Add(tmpString)
+ else if WideStartsText(StartSection, tmpTrimString) and WideEndsText(EndSection, tmpTrimString) then
+ ASection := Copy(tmpTrimString, 2, Length(tmpTrimString) - 2)
else
begin
- j := WideTextPos(SeparatorChar, S[i]);
+ j := WideTextPos(SeparatorChar, tmpString);
if j > 1 then
begin
- k := FItems.IndexOf(ASection, Copy(S[i], 1, j - 1));
+ k := FItems.IndexOf(ASection, Copy(tmpString, 1, j - 1));
if k >= 0 then
begin
- FItems[k].Translation := Copy(S[i], j + 1, MaxInt);
+ FItems[k].Translation := Copy(tmpString, j + 1, MaxInt);
// normal behavior is to regard empty translations as untranslated
FItems[k].Translated := FItems[k].Translation <> '';
FItems[k].TransComments := FComments.Text;
@@ -656,15 +660,17 @@
begin
FItem := FOrphans.Add;
FItem.Section := ASection;
- FItem.Name := Copy(S[i], 1, j - 1);
- FItem.Original := Copy(S[i], 1, j - 1); // have to store something...
- FItem.Translation := Copy(S[i], j + 1, MaxInt);
+ FItem.Name := Copy(tmpString, 1, j - 1);
+ FItem.Original := Copy(tmpString, 1, j - 1); // have to store something...
+ FItem.Translation := Copy(tmpString, j + 1, MaxInt);
// normal behavior is to regard empty translations as untranslated
// FItem.Translated := FItem.Translation <> '';
FItem.TransComments := FComments.Text;
FComments.Clear;
end;
- end;
+ end
+ else
+ FComments.Add(tmpString);
end;
end;
finally
Modified: translator/trunk/src/WideIniFiles.pas
===================================================================
--- translator/trunk/src/WideIniFiles.pas 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/WideIniFiles.pas 2007-08-14 12:26:19 UTC (rev 246)
@@ -145,7 +145,7 @@
implementation
uses
- TntSysUtils, TntWideStrUtils, RTLConsts;
+ TntSysUtils, {$IFDEF COMPILER_9_UP}WideStrUtils{$ELSE}TntWideStrUtils{$ENDIF}, RTLConsts;
function PChar2(const S: WideString): PChar;
begin
Modified: translator/trunk/src/WixPlugin/WixParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/XLIFFPlugin/XLIFFParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/XilisoftPlugin/XilisoftParser.res
===================================================================
(Binary files differ)
Modified: translator/trunk/src/translator.dpr
===================================================================
--- translator/trunk/src/translator.dpr 2007-01-11 22:59:59 UTC (rev 245)
+++ translator/trunk/src/translator.dpr 2007-08-14 12:26:19 UTC (rev 246)
@@ -55,7 +55,8 @@
ToolItems in 'ToolItems.pas',
ColorsFrm in 'ColorsFrm.pas' {frmColors: TTntForm},
ApplicationServices in 'ApplicationServices.pas',
- UndoList in 'UndoList.pas';
+ UndoList in 'UndoList.pas',
+ AutoUpdate in 'AutoUpdate.pas';
{$R *.res}
{$R 'manifest.res' 'manifest.rc'}
Modified: translator/trunk/src/translator.res
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
