updated translations and raised message window on error

git-svn-id: trunk@2568 -
This commit is contained in:
mattias 2002-08-17 23:41:29 +00:00
parent 0d4c7a4741
commit 600e5ef1b4
2 changed files with 15 additions and 9 deletions

View File

@ -3159,10 +3159,11 @@ begin
try try
Clipboard.GetFormat(SynEditClipboardFormat,MemStream); Clipboard.GetFormat(SynEditClipboardFormat,MemStream);
if MemStream.Size>=SizeOf(TSynSelectionMode)+1 then begin if MemStream.Size>=SizeOf(TSynSelectionMode)+1 then begin
GetMem(Buf,MemStream.Size); GetMem(Buf,MemStream.Size+1);
MemStream.Position:=0; MemStream.Position:=0;
MemStream.Read(Buf^,MemStream.Size); MemStream.Read(Buf^,MemStream.Size);
P:=PChar(Buf); P:=PChar(Buf);
P[MemStream.Size]:=#0;
{$ELSE} {$ELSE}
Clipboard.Open; Clipboard.Open;
try try
@ -3678,7 +3679,8 @@ var
Start := PChar(Value); Start := PChar(Value);
P := GetEOL(Start); P := GetEOL(Start);
if P^ <> #0 then begin if P^ <> #0 then begin
TrimmedSetLine(CaretY - 1, sLeftSide + Copy(Value, 1, P - Start)); SetString(Str, Value, P - Start);
TrimmedSetLine(CaretY - 1, sLeftSide + Str);
TSynEditStringList(Lines).InsertLines(CaretY, CountLines(P)); // djlp 2000-09-07 TSynEditStringList(Lines).InsertLines(CaretY, CountLines(P)); // djlp 2000-09-07
end else end else
TrimmedSetLine(CaretY - 1, sLeftSide + Value + sRightSide); TrimmedSetLine(CaretY - 1, sLeftSide + Value + sRightSide);

View File

@ -1,13 +1,13 @@
#: lclstrconsts:rsmbyes #: lclstrconsts:rsmbyes
msgid "Yes" msgid "&Yes"
msgstr "" msgstr ""
#: lclstrconsts:rsmbno #: lclstrconsts:rsmbno
msgid "No" msgid "&No"
msgstr "" msgstr ""
#: lclstrconsts:rsmbok #: lclstrconsts:rsmbok
msgid "OK" msgid "&OK"
msgstr "" msgstr ""
#: lclstrconsts:rsmbcancel #: lclstrconsts:rsmbcancel
@ -19,15 +19,15 @@ msgid "Abort"
msgstr "" msgstr ""
#: lclstrconsts:rsmbretry #: lclstrconsts:rsmbretry
msgid "Retry" msgid "&Retry"
msgstr "" msgstr ""
#: lclstrconsts:rsmbignore #: lclstrconsts:rsmbignore
msgid "Ignore" msgid "&Ignore"
msgstr "" msgstr ""
#: lclstrconsts:rsmball #: lclstrconsts:rsmball
msgid "All?" msgid "&All"
msgstr "" msgstr ""
#: lclstrconsts:rsmbnotoall #: lclstrconsts:rsmbnotoall
@ -39,7 +39,11 @@ msgid "Yes to all"
msgstr "" msgstr ""
#: lclstrconsts:rsmbhelp #: lclstrconsts:rsmbhelp
msgid "Help" msgid "&Help"
msgstr ""
#: lclstrconsts:rsmbclose
msgid "&Close"
msgstr "" msgstr ""
#: lclstrconsts:rsmtwarning #: lclstrconsts:rsmtwarning