mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: conflicts

Browse source
This commit is contained in:
j2969719 2024-12-08 15:36:05 +03:00
commit f943c6931f
5 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language/doublecmd.ko.po
View file

@ -8367,25 +8367,21 @@ msgid "Use &content plugins, combine with:"
msgstr "콘텐츠 플러그인을 사용하여 다음과 결합(&C):"
#: tfrmsearchplugin.lblfield.caption
#, fuzzy
msgctxt "tfrmsearchplugin.lblfield.caption"
msgid "Field"
msgstr "필드"
#: tfrmsearchplugin.lbloperator.caption
#, fuzzy
msgctxt "tfrmsearchplugin.lbloperator.caption"
msgid "Operator"
msgstr "연산자"
#: tfrmsearchplugin.lblplugin.caption
#, fuzzy
msgctxt "tfrmsearchplugin.lblplugin.caption"
msgid "Plugin"
msgstr "플러그인"
#: tfrmsearchplugin.lblvalue.caption
#, fuzzy
msgctxt "tfrmsearchplugin.lblvalue.caption"
msgid "Value"
msgstr "값"

2
language/doublecmd.ru.po
View file

@ -8058,7 +8058,7 @@ msgstr "перед выбранным"
#: tfrmoptionstoolbarbase.rblinebreak.caption
msgid "Line break"
msgstr ""
msgstr "Перенос строки"
#: tfrmoptionstoolbarbase.rbseparator.caption
msgid "Separator"

1
src/feditsearch.pas
View file

@ -111,6 +111,7 @@ begin
cbSearchFromCursor.Enabled := ((eswoSearchFromCursorChecked in OptionAllowed) OR (eswoSearchFromCursorUnchecked in OptionAllowed));
cbSearchRegExp.Enabled := ((eswoRegularExpressChecked in OptionAllowed) OR (eswoRegularExpressUnchecked in OptionAllowed));
rgSearchDirection.Enabled := ((eswoDirectionEnabledForward in OptionAllowed) OR (eswoDirectionEnabledBackward in OptionAllowed));
cbMultiLine.Enabled := cbSearchRegExp.Enabled;
//2. Let's set the option to their default according to what host wants to offer
cbSearchCaseSensitive.Checked := (eswoCaseSensitiveChecked in OptionAllowed);

10
src/frames/foptionsdirectoryhotlist.pas
View file

@ -793,7 +793,7 @@ var
function ReplaceIfNecessary(sWorkingText: string): string;
begin
Result := StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
Result := UTF8StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
if Result <> sWorkingText then Inc(NbOfReplacement);
end;
@ -801,6 +801,7 @@ var
Index, ActionDispatcher: integer;
EditSearchOptionToOffer: TEditSearchDialogOption;
EditSearchOptionReturned: TEditSearchDialogOption = [];
CaseSensitive: array[Boolean] of TEditSearchDialogOption = ([eswoCaseSensitiveUnchecked], [eswoCaseSensitiveChecked]);
begin
with Sender as TComponent do ActionDispatcher := tag;
@ -809,12 +810,7 @@ begin
else sSearchText := '';
sReplaceText := sSearchText;
EditSearchOptionToOffer := [];
{$IFDEF MSWINDOWS}
EditSearchOptionToOffer := EditSearchOptionToOffer + [eswoCaseSensitiveUnchecked];
{$ELSE}
EditSearchOptionToOffer := EditSearchOptionToOffer + [eswoCaseSensitiveChecked];
{$ENDIF}
EditSearchOptionToOffer := CaseSensitive[FileNameCaseSensitive];
if GetSimpleSearchAndReplaceString(self, EditSearchOptionToOffer, sSearchText, sReplaceText, EditSearchOptionReturned, glsSearchPathHistory, glsReplacePathHistory) then
begin

9
src/frames/foptionstoolbarbase.pas
View file

@ -798,7 +798,7 @@ var
function ReplaceIfNecessary(sWorkingText:string):string;
begin
result := StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
result := UTF8StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
if result<>sWorkingText then inc(NbOfReplacement);
end;
@ -840,6 +840,7 @@ var
Toolbar: TKASToolbar;
EditSearchOptionToOffer: TEditSearchDialogOption = [];
EditSearchOptionReturned: TEditSearchDialogOption = [];
CaseSensitive: array[Boolean] of TEditSearchDialogOption = ([eswoCaseSensitiveUnchecked], [eswoCaseSensitiveChecked]);
begin
with Sender as TComponent do ActionDispatcher:=tag;
@ -854,11 +855,7 @@ begin
sSearchText:='';
sReplaceText:=sSearchText;
{$IFDEF MSWINDOWS}
EditSearchOptionToOffer:=EditSearchOptionToOffer+[eswoCaseSensitiveUnchecked];
{$ELSE}
EditSearchOptionToOffer:=EditSearchOptionToOffer+[eswoCaseSensitiveChecked];
{$ENDIF}
EditSearchOptionToOffer:= CaseSensitive[FileNameCaseSensitive];
if GetSimpleSearchAndReplaceString(self, EditSearchOptionToOffer, sSearchText, sReplaceText, EditSearchOptionReturned, glsSearchPathHistory, glsReplacePathHistory) then
begin