Skip to content

Commit a942faf

Browse files
deep-softdeep-soft
authored
Merge branch 'doublecmd:master' into master
2 parents 0034011 + fcba5ce commit a942faf

96 files changed

Lines changed: 3734 additions & 1400 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎components/KASToolBar/kastoolbar.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ procedure TKASToolBar.UpdateIcon(ToolButton: TKASToolButton);
769769
begin
770770
try
771771
if Assigned(FOnLoadButtonGlyph) then
772-
Bitmap := FOnLoadButtonGlyph(ToolButton.ToolItem, GlyphBitmapSize, clBtnFace);
772+
Bitmap := FOnLoadButtonGlyph(ToolButton.ToolItem, FGlyphSize, clBtnFace);
773773

774774
if not Assigned(Bitmap) and (ToolButton.ToolItem is TKASNormalItem) then
775775
Bitmap := LoadBtnIcon(TKASNormalItem(ToolButton.ToolItem).Icon);

‎components/doublecmd/dcosutils.pas‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ interface
5757
ERROR_NOT_SAME_DEVICE = Windows.ERROR_NOT_SAME_DEVICE;
5858
{$ENDIF}
5959

60+
FileNameNormalized = {$IFDEF DARWIN}True{$ELSE}False{$ENDIF};
61+
6062
type
6163
TFileMapRec = record
6264
FileHandle : System.THandle;

‎components/doublecmd/dcstringhashlistutf8.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ procedure TStringHashListUtf8.Insert(Index: Integer; Item: PStringHashItem);
369369

370370
constructor TStringHashListUtf8.Create(CaseSensitivity: boolean);
371371
begin
372-
fNormalize:= True;
372+
fNormalize:= FileNameNormalized;
373373
fCaseSensitive:= CaseSensitivity;
374374
inherited Create;
375375
end;

‎language/doublecmd.be.po‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10872,6 +10872,17 @@ msgstr "Спіс акон \"Пошук файлаў\""
1087210872
msgid "Assign tags to %d items"
1087310873
msgstr ""
1087410874

10875+
#: ulng.rsmacosconnectserverprompt
10876+
msgid ""
10877+
"URL:\n"
10878+
"(eg. smb://server/share; https://dav.server.com; nfs://server/path)\n"
10879+
" "
10880+
msgstr ""
10881+
10882+
#: ulng.rsmacosconnectservertitle
10883+
msgid "SMB / Samba / WebDAV / NFS ..."
10884+
msgstr ""
10885+
1087510886
#: ulng.rsmarkminus
1087610887
msgid "Unselect mask"
1087710888
msgstr "Скасаваць вылучэнне"
@@ -10992,6 +11003,26 @@ msgstr ""
1099211003
msgid "Finder"
1099311004
msgstr ""
1099411005

11006+
#: ulng.rsmfstbigobackwardtips
11007+
msgctxt "ulng.rsmfstbigobackwardtips"
11008+
msgid "Backward"
11009+
msgstr ""
11010+
11011+
#: ulng.rsmfstbigobackwardtitle
11012+
msgctxt "ulng.rsmfstbigobackwardtitle"
11013+
msgid "Backward"
11014+
msgstr ""
11015+
11016+
#: ulng.rsmfstbigoforwardtips
11017+
msgctxt "ulng.rsmfstbigoforwardtips"
11018+
msgid "Forward"
11019+
msgstr ""
11020+
11021+
#: ulng.rsmfstbigoforwardtitle
11022+
msgctxt "ulng.rsmfstbigoforwardtitle"
11023+
msgid "Forward"
11024+
msgstr ""
11025+
1099511026
#: ulng.rsmfstbigotips
1099611027
msgctxt "ulng.rsmfstbigotips"
1099711028
msgid "Go"

‎language/doublecmd.bg.po‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11344,6 +11344,17 @@ msgstr ""
1134411344
msgid "Assign tags to %d items"
1134511345
msgstr ""
1134611346

11347+
#: ulng.rsmacosconnectserverprompt
11348+
msgid ""
11349+
"URL:\n"
11350+
"(eg. smb://server/share; https://dav.server.com; nfs://server/path)\n"
11351+
" "
11352+
msgstr ""
11353+
11354+
#: ulng.rsmacosconnectservertitle
11355+
msgid "SMB / Samba / WebDAV / NFS ..."
11356+
msgstr ""
11357+
1134711358
#: ulng.rsmarkminus
1134811359
msgid "Unselect mask"
1134911360
msgstr "Признак за смяна на избора"
@@ -11464,6 +11475,26 @@ msgstr ""
1146411475
msgid "Finder"
1146511476
msgstr ""
1146611477

11478+
#: ulng.rsmfstbigobackwardtips
11479+
msgctxt "ulng.rsmfstbigobackwardtips"
11480+
msgid "Backward"
11481+
msgstr ""
11482+
11483+
#: ulng.rsmfstbigobackwardtitle
11484+
msgctxt "ulng.rsmfstbigobackwardtitle"
11485+
msgid "Backward"
11486+
msgstr ""
11487+
11488+
#: ulng.rsmfstbigoforwardtips
11489+
msgctxt "ulng.rsmfstbigoforwardtips"
11490+
msgid "Forward"
11491+
msgstr ""
11492+
11493+
#: ulng.rsmfstbigoforwardtitle
11494+
msgctxt "ulng.rsmfstbigoforwardtitle"
11495+
msgid "Forward"
11496+
msgstr ""
11497+
1146711498
#: ulng.rsmfstbigotips
1146811499
msgctxt "ulng.rsmfstbigotips"
1146911500
msgid "Go"

‎language/doublecmd.ca.po‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11821,6 +11821,17 @@ msgstr ""
1182111821
msgid "Assign tags to %d items"
1182211822
msgstr ""
1182311823

11824+
#: ulng.rsmacosconnectserverprompt
11825+
msgid ""
11826+
"URL:\n"
11827+
"(eg. smb://server/share; https://dav.server.com; nfs://server/path)\n"
11828+
" "
11829+
msgstr ""
11830+
11831+
#: ulng.rsmacosconnectservertitle
11832+
msgid "SMB / Samba / WebDAV / NFS ..."
11833+
msgstr ""
11834+
1182411835
#: ulng.rsmarkminus
1182511836
msgid "Unselect mask"
1182611837
msgstr "Màscara a deselecció"
@@ -11940,6 +11951,26 @@ msgstr ""
1194011951
msgid "Finder"
1194111952
msgstr ""
1194211953

11954+
#: ulng.rsmfstbigobackwardtips
11955+
msgctxt "ulng.rsmfstbigobackwardtips"
11956+
msgid "Backward"
11957+
msgstr ""
11958+
11959+
#: ulng.rsmfstbigobackwardtitle
11960+
msgctxt "ulng.rsmfstbigobackwardtitle"
11961+
msgid "Backward"
11962+
msgstr ""
11963+
11964+
#: ulng.rsmfstbigoforwardtips
11965+
msgctxt "ulng.rsmfstbigoforwardtips"
11966+
msgid "Forward"
11967+
msgstr ""
11968+
11969+
#: ulng.rsmfstbigoforwardtitle
11970+
msgctxt "ulng.rsmfstbigoforwardtitle"
11971+
msgid "Forward"
11972+
msgstr ""
11973+
1194311974
#: ulng.rsmfstbigotips
1194411975
msgctxt "ulng.rsmfstbigotips"
1194511976
msgid "Go"

‎language/doublecmd.cs.po‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10894,6 +10894,17 @@ msgstr "Seznam hledacích oken"
1089410894
msgid "Assign tags to %d items"
1089510895
msgstr ""
1089610896

10897+
#: ulng.rsmacosconnectserverprompt
10898+
msgid ""
10899+
"URL:\n"
10900+
"(eg. smb://server/share; https://dav.server.com; nfs://server/path)\n"
10901+
" "
10902+
msgstr ""
10903+
10904+
#: ulng.rsmacosconnectservertitle
10905+
msgid "SMB / Samba / WebDAV / NFS ..."
10906+
msgstr ""
10907+
1089710908
#: ulng.rsmarkminus
1089810909
msgid "Unselect mask"
1089910910
msgstr "Maska zrušení výběru"
@@ -11014,6 +11025,26 @@ msgstr ""
1101411025
msgid "Finder"
1101511026
msgstr ""
1101611027

11028+
#: ulng.rsmfstbigobackwardtips
11029+
msgctxt "ulng.rsmfstbigobackwardtips"
11030+
msgid "Backward"
11031+
msgstr ""
11032+
11033+
#: ulng.rsmfstbigobackwardtitle
11034+
msgctxt "ulng.rsmfstbigobackwardtitle"
11035+
msgid "Backward"
11036+
msgstr ""
11037+
11038+
#: ulng.rsmfstbigoforwardtips
11039+
msgctxt "ulng.rsmfstbigoforwardtips"
11040+
msgid "Forward"
11041+
msgstr ""
11042+
11043+
#: ulng.rsmfstbigoforwardtitle
11044+
msgctxt "ulng.rsmfstbigoforwardtitle"
11045+
msgid "Forward"
11046+
msgstr ""
11047+
1101711048
#: ulng.rsmfstbigotips
1101811049
msgctxt "ulng.rsmfstbigotips"
1101911050
msgid "Go"

‎language/doublecmd.da.po‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11939,6 +11939,17 @@ msgstr "Oversigt over \"Find filer\""
1193911939
msgid "Assign tags to %d items"
1194011940
msgstr ""
1194111941

11942+
#: ulng.rsmacosconnectserverprompt
11943+
msgid ""
11944+
"URL:\n"
11945+
"(eg. smb://server/share; https://dav.server.com; nfs://server/path)\n"
11946+
" "
11947+
msgstr ""
11948+
11949+
#: ulng.rsmacosconnectservertitle
11950+
msgid "SMB / Samba / WebDAV / NFS ..."
11951+
msgstr ""
11952+
1194211953
#: ulng.rsmarkminus
1194311954
msgid "Unselect mask"
1194411955
msgstr "Indskrænk valg"
@@ -12060,6 +12071,26 @@ msgstr ""
1206012071
msgid "Finder"
1206112072
msgstr ""
1206212073

12074+
#: ulng.rsmfstbigobackwardtips
12075+
msgctxt "ulng.rsmfstbigobackwardtips"
12076+
msgid "Backward"
12077+
msgstr ""
12078+
12079+
#: ulng.rsmfstbigobackwardtitle
12080+
msgctxt "ulng.rsmfstbigobackwardtitle"
12081+
msgid "Backward"
12082+
msgstr ""
12083+
12084+
#: ulng.rsmfstbigoforwardtips
12085+
msgctxt "ulng.rsmfstbigoforwardtips"
12086+
msgid "Forward"
12087+
msgstr ""
12088+
12089+
#: ulng.rsmfstbigoforwardtitle
12090+
msgctxt "ulng.rsmfstbigoforwardtitle"
12091+
msgid "Forward"
12092+
msgstr ""
12093+
1206312094
#: ulng.rsmfstbigotips
1206412095
msgctxt "ulng.rsmfstbigotips"
1206512096
msgid "Go"

‎language/doublecmd.de.po‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10849,6 +10849,17 @@ msgstr "Liste der 'Dateisuche'-Fenster"
1084910849
msgid "Assign tags to %d items"
1085010850
msgstr "Tags %d Elementen zuordnen"
1085110851

10852+
#: ulng.rsmacosconnectserverprompt
10853+
msgid ""
10854+
"URL:\n"
10855+
"(eg. smb://server/share; https://dav.server.com; nfs://server/path)\n"
10856+
" "
10857+
msgstr ""
10858+
10859+
#: ulng.rsmacosconnectservertitle
10860+
msgid "SMB / Samba / WebDAV / NFS ..."
10861+
msgstr ""
10862+
1085210863
#: ulng.rsmarkminus
1085310864
msgid "Unselect mask"
1085410865
msgstr "Maske abwählen"
@@ -10964,6 +10975,26 @@ msgstr "Im Finder aufzeigen"
1096410975
msgid "Finder"
1096510976
msgstr "Finder"
1096610977

10978+
#: ulng.rsmfstbigobackwardtips
10979+
msgctxt "ulng.rsmfstbigobackwardtips"
10980+
msgid "Backward"
10981+
msgstr ""
10982+
10983+
#: ulng.rsmfstbigobackwardtitle
10984+
msgctxt "ulng.rsmfstbigobackwardtitle"
10985+
msgid "Backward"
10986+
msgstr ""
10987+
10988+
#: ulng.rsmfstbigoforwardtips
10989+
msgctxt "ulng.rsmfstbigoforwardtips"
10990+
msgid "Forward"
10991+
msgstr ""
10992+
10993+
#: ulng.rsmfstbigoforwardtitle
10994+
msgctxt "ulng.rsmfstbigoforwardtitle"
10995+
msgid "Forward"
10996+
msgstr ""
10997+
1096710998
#: ulng.rsmfstbigotips
1096810999
msgctxt "ulng.rsmfstbigotips"
1096911000
msgid "Go"

0 commit comments

Comments
 (0)