Skip to content

Commit 574954c

Browse files
winston-dewinston-de
committed
Merge with upstream/main
2 parents bc30262 + de8e956 commit 574954c

File tree

7 files changed

+463
-428
lines changed

7 files changed

+463
-428
lines changed

Diff for: ‎Files/Files.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -1005,28 +1005,28 @@
10051005
<Version>6.2.12</Version>
10061006
</PackageReference>
10071007
<PackageReference Include="Microsoft.Toolkit.Mvvm">
1008-
<Version>7.0.0</Version>
1008+
<Version>7.0.1</Version>
10091009
</PackageReference>
10101010
<PackageReference Include="Microsoft.Toolkit.Uwp">
1011-
<Version>7.0.0</Version>
1011+
<Version>7.0.1</Version>
10121012
</PackageReference>
10131013
<PackageReference Include="Microsoft.Toolkit.Uwp.DeveloperTools">
1014-
<Version>7.0.0</Version>
1014+
<Version>7.0.1</Version>
10151015
</PackageReference>
10161016
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
1017-
<Version>7.0.0</Version>
1017+
<Version>7.0.1</Version>
10181018
</PackageReference>
10191019
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
1020-
<Version>7.0.0</Version>
1020+
<Version>7.0.1</Version>
10211021
</PackageReference>
10221022
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
1023-
<Version>7.0.0</Version>
1023+
<Version>7.0.1</Version>
10241024
</PackageReference>
10251025
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
1026-
<Version>7.0.0</Version>
1026+
<Version>7.0.1</Version>
10271027
</PackageReference>
10281028
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid">
1029-
<Version>7.0.0</Version>
1029+
<Version>7.0.1</Version>
10301030
</PackageReference>
10311031
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie">
10321032
<Version>7.0.0</Version>

Diff for: ‎Files/MultilingualResources/Files.da-DK.xlf

+116-126
Large diffs are not rendered by default.

Diff for: ‎Files/MultilingualResources/Files.ko-KR.xlf

+68-82
Large diffs are not rendered by default.

Diff for: ‎Files/MultilingualResources/Files.nl-NL.xlf

+180-195
Large diffs are not rendered by default.

Diff for: ‎Files/Strings/ko-KR/Resources.resw

+86-14
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@
532532
<value>예</value>
533533
</data>
534534
<data name="ItemSizeBytes" xml:space="preserve">
535-
<value>bytes</value>
535+
<value>바이트</value>
536536
</data>
537537
<data name="KiloByteSymbol" xml:space="preserve">
538538
<value>KB</value>
@@ -631,7 +631,7 @@
631631
<value>페이지:</value>
632632
</data>
633633
<data name="SettingsOnStartupNewInstanceBehavior.Text" xml:space="preserve">
634-
<value>점프 목록에서 항목 실행 시</value>
634+
<value>Files 프로그램으로 폴더를 열 때</value>
635635
</data>
636636
<data name="SettingsOnStartupLaunchNewInstance.Content" xml:space="preserve">
637637
<value>항상 새 인스턴스 열기</value>
@@ -1677,38 +1677,77 @@
16771677
<data name="CloudDriveSyncStatus_Unknown" xml:space="preserve">
16781678
<value>알 수 없음</value>
16791679
</data>
1680+
<data name="SidebarNetworkDrives" xml:space="preserve">
1681+
<value>네트워크 드라이브</value>
1682+
</data>
16801683
<data name="Network" xml:space="preserve">
16811684
<value>네트워크</value>
16821685
</data>
16831686
<data name="StatusBarControlMultiselect.Text" xml:space="preserve">
16841687
<value>다중 선택</value>
16851688
</data>
1689+
<data name="SettingsShowMultiselectOption.Header" xml:space="preserve">
1690+
<value>다중 선택 옵션 활성화 (현재는 타일, 격자 레이아웃에서만 사용할 수 있습니다)</value>
1691+
</data>
1692+
<data name="RenameFileDialog.Text" xml:space="preserve">
1693+
<value>파일 확장명을 변경하면 파일을 사용할 수 없게 될 수도 있습니다. 변경하시겠습니까?</value>
1694+
</data>
16861695
<data name="DriveTypeCDRom" xml:space="preserve">
1687-
<value>CD-ROM 드라이브</value>
1696+
<value>CD ROM 드라이브</value>
1697+
</data>
1698+
<data name="DriveTypeCloudDrive" xml:space="preserve">
1699+
<value>클라우드 드라이브</value>
1700+
</data>
1701+
<data name="DriveTypeFixed" xml:space="preserve">
1702+
<value>고정 디스크 드라이브</value>
16881703
</data>
16891704
<data name="DriveTypeFloppyDisk" xml:space="preserve">
16901705
<value>플로피 디스크 드라이브</value>
16911706
</data>
16921707
<data name="DriveTypeNetwork" xml:space="preserve">
16931708
<value>네트워크 드라이브</value>
16941709
</data>
1710+
<data name="DriveTypeNoRootDirectory" xml:space="preserve">
1711+
<value>마운트 해제된 드라이브</value>
1712+
</data>
1713+
<data name="DriveTypeRam" xml:space="preserve">
1714+
<value>램 디스크 드라이브</value>
1715+
</data>
1716+
<data name="DriveTypeRemovable" xml:space="preserve">
1717+
<value>이동식 저장 장치</value>
1718+
</data>
16951719
<data name="DriveTypeUnknown" xml:space="preserve">
16961720
<value>알 수 없음</value>
16971721
</data>
1722+
<data name="DriveTypeVirtualDrive" xml:space="preserve">
1723+
<value>가상 드라이브</value>
1724+
</data>
16981725
<data name="BaseLayoutContextFlyoutSortByDateCreated2" xml:space="preserve">
16991726
<value>만든 날짜</value>
17001727
</data>
17011728
<data name="DateCreatedColumn.Header" xml:space="preserve">
17021729
<value>만든 날짜</value>
17031730
</data>
17041731
<data name="DrivesWidgetMoreOptionsButton.ToolTipService.ToolTip" xml:space="preserve">
1705-
<value>옵션 더 보기...</value>
1732+
<value>추가 옵션...</value>
17061733
</data>
17071734
<data name="DrivesWidgetOptionsFlyoutMapNetDriveMenuItem.Text" xml:space="preserve">
1708-
<value>네트워크\n드라이브 연결</value>
1735+
<value>네트워크 드라이브 연결</value>
17091736
</data>
17101737
<data name="SideBarDisconnectNetworkDrive.Text" xml:space="preserve">
1711-
<value>연결 해제</value>
1738+
<value>연결 끊기</value>
1739+
</data>
1740+
<data name="PreemptiveCacheParallelLimit.Header" xml:space="preserve">
1741+
<value>선점적 캐시 병렬 실행 제한 (하드 드라이브에는 숫자가 적을수록 좋습니다)</value>
1742+
</data>
1743+
<data name="SettingsUsePreemptiveCache.Header" xml:space="preserve">
1744+
<value>선점적 캐시 사용 (탐색 시 하위 폴더 내 항목을 미리 로딩합니다)</value>
1745+
</data>
1746+
<data name="BundlesWidgetMoreOptionsButton.AutomationProperties.Name" xml:space="preserve">
1747+
<value>추가 보관함 옵션</value>
1748+
</data>
1749+
<data name="DrivesWidgetMoreOptionsButton.AutomationProperties.Name" xml:space="preserve">
1750+
<value>추가 드라이브 옵션</value>
17121751
</data>
17131752
<data name="SidebarFavorites" xml:space="preserve">
17141753
<value>즐겨찾기</value>
@@ -1720,10 +1759,10 @@
17201759
<value>최근 위치</value>
17211760
</data>
17221761
<data name="DetailsPanePreviewNotAvaliableText" xml:space="preserve">
1723-
<value>미리 볼 수 없습니다.</value>
1762+
<value>미리보기를 사용할 수 없습니다</value>
17241763
</data>
17251764
<data name="PreviewPaneDetailsNotAvailableText" xml:space="preserve">
1726-
<value>세부 정보 없음</value>
1765+
<value>자세한 정보를 볼 수 없습니다</value>
17271766
</data>
17281767
<data name="NoItemSelected" xml:space="preserve">
17291768
<value>선택한 항목 없음</value>
@@ -1732,39 +1771,72 @@
17321771
<value>대상</value>
17331772
</data>
17341773
<data name="PropertyItemArguments" xml:space="preserve">
1735-
<value>ARGUMENTS</value>
1774+
<value>전달인자</value>
1775+
</data>
1776+
<data name="SettingsPreferencesShowLibrarySection.Header" xml:space="preserve">
1777+
<value>사이드바에 라이브러리 표시</value>
17361778
</data>
17371779
<data name="SidebarLibraries" xml:space="preserve">
17381780
<value>라이브러리</value>
17391781
</data>
1782+
<data name="BundlesOpenInNewPane" xml:space="preserve">
1783+
<value>새 패널에서 열기</value>
1784+
</data>
17401785
<data name="DefaultScheme" xml:space="preserve">
17411786
<value>기본값</value>
17421787
</data>
17431788
<data name="SettingsAppearanceColorScheme.Header" xml:space="preserve">
1744-
<value>색 구성표:</value>
1789+
<value>색상 테마</value>
17451790
</data>
17461791
<data name="PropertyItemCount" xml:space="preserve">
1747-
<value>항목 수:</value>
1792+
<value>항목 수</value>
17481793
</data>
17491794
<data name="StatusDeletionFailed" xml:space="preserve">
17501795
<value>삭제 실패</value>
17511796
</data>
17521797
<data name="StatusUnknownError" xml:space="preserve">
17531798
<value>알 수 없는 오류가 발생했습니다.</value>
17541799
</data>
1800+
<data name="StatusDeletionComplete" xml:space="preserve">
1801+
<value>삭제 완료</value>
1802+
</data>
1803+
<data name="StatusOperationCompleted" xml:space="preserve">
1804+
<value>작업이 완료되었습니다.</value>
1805+
</data>
1806+
<data name="StatusRecycleComplete" xml:space="preserve">
1807+
<value>휴지통 이동 완료</value>
1808+
</data>
1809+
<data name="StatusMoveComplete" xml:space="preserve">
1810+
<value>이동 완료</value>
1811+
</data>
17551812
<data name="StatusCopyComplete" xml:space="preserve">
17561813
<value>복사 완료</value>
17571814
</data>
17581815
<data name="ElevateConfirmDialog.CloseButtonText" xml:space="preserve">
1759-
<value>아니요</value>
1816+
<value>아니오</value>
17601817
</data>
17611818
<data name="ElevateConfirmDialog.PrimaryButtonText" xml:space="preserve">
17621819
<value>예</value>
17631820
</data>
1821+
<data name="ElevateConfirmDialog.Title" xml:space="preserve">
1822+
<value>이 작업은 관리자 권한이 필요합니다</value>
1823+
</data>
1824+
<data name="ElevateConfirmDialog.Content" xml:space="preserve">
1825+
<value>관리자 권한으로 계속하시겠습니까?</value>
1826+
</data>
17641827
<data name="HorizontalMultitaskingControlCloseTabsToTheRight.Text" xml:space="preserve">
1765-
<value>오른쪽의 탭 닫기</value>
1828+
<value>오른쪽 탭 닫기</value>
17661829
</data>
17671830
<data name="FullTrustStatusTeachingTip.Title" xml:space="preserve">
1768-
<value>관리자</value>
1831+
<value>관리자 권한</value>
1832+
</data>
1833+
<data name="FullTrustStatusTeachingTip.Subtitle" xml:space="preserve">
1834+
<value>Files가 관리자 권한으로 실행 중입니다</value>
1835+
</data>
1836+
<data name="PinItemToStart.Text" xml:space="preserve">
1837+
<value>시작 메뉴에 고정</value>
1838+
</data>
1839+
<data name="UnpinItemFromStart.Text" xml:space="preserve">
1840+
<value>시작 메뉴에서 고정 해제</value>
17691841
</data>
17701842
</root>

Diff for: ‎Files/ViewModels/PreviewPaneViewModel.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ public List<ListedItem> SelectedItems
3030
get => selectedItems;
3131
set
3232
{
33-
SetProperty(ref selectedItems, value);
34-
SelectedItem = SelectedItems?.FirstOrDefault();
33+
if (SetProperty(ref selectedItems, value))
34+
{
35+
SelectedItem = SelectedItems?.FirstOrDefault();
36+
}
3537
}
3638
}
3739

Diff for: ‎Files/ViewModels/Previews/ShortcutPreviewViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public async override Task<List<FileProperty>> LoadPreviewAndDetails()
4040
},
4141
new FileProperty()
4242
{
43-
NameResource = "PropertyItemName",
43+
NameResource = "PropertyItemArguments",
4444
Value = item.Arguments,
4545
}
4646
};

0 commit comments

Comments
 (0)