UPD: Some fixes for MultiArc

UPD: Ukrainian language file by Ma$terok
This commit is contained in:
Alexander Koblov 2010-02-20 10:38:55 +00:00
commit 4516b4ba57
8 changed files with 207 additions and 183 deletions

View file

@ -1274,7 +1274,7 @@ msgstr "Редагувати новий"
#: TFRMMAIN.ACTEDITPATH.CAPTION
msgid "Edit path field above file list"
msgstr ""
msgstr "Редагувати шлях в заголовку панелі"
#: TFRMMAIN.ACTEXCHANGE.CAPTION
msgid "Swap &Panels"
@ -2889,7 +2889,7 @@ msgstr "Головний"
#: TFRMOPTIONS.LBLMARKCOLOR.CAPTION
msgid "Mark Color:"
msgstr "&Виділення"
msgstr "Виділення"
#: TFRMOPTIONS.LBLMOUSEMODE.CAPTION
msgid "Mode:"
@ -2977,12 +2977,12 @@ msgstr "Al&t+Буква"
#, fuzzy
#| msgid "&Ctrl+Alt+Letters"
msgid "Ctrl+Alt+Letters"
msgstr "&Ctrl+Alt+Буква"
msgstr "Ctrl+Alt+Буква"
#: TFRMOPTIONS.RBICONSSHOWALL.CAPTION
msgctxt "TFRMOPTIONS.RBICONSSHOWALL.CAPTION"
msgid "&All"
msgstr "Усі"
msgstr "&Усі"
#: TFRMOPTIONS.RBICONSSHOWALLANDEXE.CAPTION
msgid "All associated + &EXE/LNK (slow)"
@ -3410,7 +3410,7 @@ msgstr "Видалити"
#: TFRMTWEAKPLUGIN.CAPTION
msgid "Tweak plugin"
msgstr "Параметри плагіна"
msgstr "Параметри плагіну"
#: TFRMTWEAKPLUGIN.CBPK_CAPS_BY_CONTENT.CAPTION
msgid "Detect archive type by content"
@ -4571,7 +4571,7 @@ msgstr "Не можу розрізати файл!"
#: ulng.rsspliterrtoomanyparts
msgid "Too many parts!"
msgstr ""
msgstr "Надто багато частин!"
#: ulng.rssplitmsgcreated
msgctxt "ulng.rssplitmsgcreated"
@ -4580,7 +4580,7 @@ msgstr "Створено:"
#: ulng.rssplitmsgmanyparts
msgid "The number of parts is more than 100! Continue?"
msgstr ""
msgstr "Кількість частин більше 100! Продовжити?"
#: ulng.rssplitmsgsize
msgid "size:"

File diff suppressed because it is too large Load diff

View file

@ -159,7 +159,9 @@ end;
procedure TMultiArchiveCopyInOperation.Finalize;
begin
FreeThenNil(FExProcess);
mbDeleteFile(FTempFile);
with FMultiArchiveFileSource.MultiArcItem do
if not FDebug then
mbDeleteFile(FTempFile);
end;
procedure TMultiArchiveCopyInOperation.ShowError(sMessage: String; logOptions: TLogOptions);

View file

@ -223,7 +223,9 @@ end;
procedure TMultiArchiveCopyOutOperation.Finalize;
begin
FreeThenNil(FExProcess);
mbDeleteFile(FTempFile);
with FMultiArchiveFileSource.MultiArcItem do
if not FDebug then
mbDeleteFile(FTempFile);
end;
procedure TMultiArchiveCopyOutOperation.CreateDirs(

View file

@ -142,7 +142,9 @@ end;
procedure TMultiArchiveDeleteOperation.Finalize;
begin
FreeThenNil(FExProcess);
mbDeleteFile(FTempFile);
with FMultiArchiveFileSource.MultiArcItem do
if not FDebug then
mbDeleteFile(FTempFile);
end;
procedure TMultiArchiveDeleteOperation.ShowError(sMessage: String; logOptions: TLogOptions);

View file

@ -143,7 +143,9 @@ end;
procedure TMultiArchiveTestArchiveOperation.Finalize;
begin
FreeThenNil(FExProcess);
mbDeleteFile(FTempFile);
with FMultiArchiveFileSource.MultiArcItem do
if not FDebug then
mbDeleteFile(FTempFile);
end;
procedure TMultiArchiveTestArchiveOperation.ShowError(sMessage: String; logOptions: TLogOptions);

View file

@ -228,6 +228,12 @@ function CharPos(C: Char; const S: string; StartPos: Integer = 1): Integer;
@param(e Extension)
}
procedure DivFileName(const sFileName:String; out n,e:String);
{en
Replace executable extension by system specific executable extension
@param(sFileName File name)
@returns(Executable name with system specific executable extension)
}
function FixExeExt(const sFileName: UTF8String): UTF8String;
{en
Get count of character in string
@param(Char Character)
@ -872,6 +878,16 @@ else
Result := Pos(C, S);
end;
function FixExeExt(const sFileName: UTF8String): UTF8String;
var
ExeExt: UTF8String;
begin
Result:= sFileName;
ExeExt:= GetExeExt;
if not SameText(ExeExt, ExtractFileExt(sFileName)) then
Result:= ChangeFileExt(sFileName, ExeExt);
end;
function NumCountChars(const Char: char; const S: String): Integer;
var
I : Integer;

View file

@ -146,7 +146,7 @@ begin
MultiArcItem:= TMultiArcItem.Create;
with MultiArcItem do
begin
FArchiver:= TrimQuotes(IniFile.ReadString(Section, 'Archiver', EmptyStr));
FArchiver:= FixExeExt(TrimQuotes(IniFile.ReadString(Section, 'Archiver', EmptyStr)));
FDescription:= TrimQuotes(IniFile.ReadString(Section, 'Description', EmptyStr));
FID:= TrimQuotes(IniFile.ReadString(Section, 'ID', EmptyStr));
FIDPos:= TrimQuotes(IniFile.ReadString(Section, 'IDPos', EmptyStr));