Skip to content

Commit ef87bdc

Browse files
lukeblevinslukeblevins
committed
Merge branch 'develop' of https://github.com/duke7553/files-uwp into develop
2 parents d3aa04f + 97f1c49 commit ef87bdc

File tree

5 files changed

+275
-13
lines changed

5 files changed

+275
-13
lines changed

‎Files/Controls/RibbonArea.xaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,10 +1822,13 @@
18221822
</Button.KeyboardAccelerators>
18231823
</Button>
18241824
</StackPanel>
1825+
1826+
18251827
<Grid
18261828
Grid.Column="1"
1827-
Padding="5,0,5,0"
1829+
Padding="4,0,4,0" Height="34"
18281830
VerticalAlignment="Center">
1831+
18291832
<TextBox
18301833
x:Name="VisiblePath"
18311834
Padding="4"
@@ -1844,10 +1847,10 @@
18441847
ScrollViewer.VerticalScrollBarVisibility="Hidden"
18451848
Text="{x:Bind local:App.CurrentInstance.PathControlDisplayText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
18461849
Visibility="Collapsed" />
1850+
18471851
<Grid
18481852
x:Name="ClickablePath"
18491853
Height="32.5"
1850-
Padding="2.5,0,0,0"
18511854
HorizontalAlignment="Stretch"
18521855
VerticalAlignment="Center"
18531856
BorderBrush="{ThemeResource TextBoxBorderThemeBrush}"
@@ -1863,10 +1866,10 @@
18631866
Text="Edit address" />
18641867
</MenuFlyout>
18651868
</Grid.ContextFlyout>
1869+
18661870
<ListView
18671871
x:Name="PathViewInteract"
18681872
x:FieldModifier="public"
1869-
Margin="0"
18701873
VerticalAlignment="Stretch"
18711874
HorizontalContentAlignment="Stretch"
18721875
VerticalContentAlignment="Stretch"
@@ -1904,17 +1907,12 @@
19041907
<StackPanel Background="Transparent" Orientation="Horizontal" />
19051908
</ItemsPanelTemplate>
19061909
</ListView.ItemsPanel>
1907-
<!--<ListView.ItemContainerStyle>
1908-
<Style TargetType="ListViewItem">
1909-
<Setter Property="Padding" Value="5,0,0,0"/>
1910-
<Setter Property="MinHeight" Value="20"/>
1911-
<Setter Property="MinWidth" Value="8"/>
1912-
<Setter Property="BorderThickness" Value="0"/>
1913-
</Style>
1914-
</ListView.ItemContainerStyle>-->
19151910
</ListView>
1911+
19161912
</Grid>
1913+
19171914
</Grid>
1915+
19181916
<Custom:GridSplitter
19191917
x:Name="SearchBoxResizer"
19201918
Grid.Column="1"

‎Files/MultilingualResources/Files.de-DE.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@
242242
<source>Unpin from Sidebar</source>
243243
<target state="translated">Unpin from Sidebar</target>
244244
</trans-unit>
245+
<trans-unit id="SettingsFlagsTitle.Text" translate="yes" xml:space="preserve">
246+
<source>Flags</source>
247+
<target state="new">Flags</target>
248+
</trans-unit>
245249
</group>
246250
</body>
247251
</file>

‎Files/MultilingualResources/Files.es-ES.xlf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,11 @@
242242
<source>Unpin from Sidebar</source>
243243
<target state="translated">Desanclar de la barra lateral</target>
244244
</trans-unit>
245+
<trans-unit id="SettingsFlagsTitle.Text" translate="yes" xml:space="preserve">
246+
<source>Flags</source>
247+
<target state="new">Flags</target>
248+
</trans-unit>
245249
</group>
246250
</body>
247251
</file>
248-
</xliff>
252+
</xliff>

‎Files/MultilingualResources/Files.fr-FR.xlf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,11 @@
242242
<source>Unpin from Sidebar</source>
243243
<target state="translated">Détacher de la barre latérale</target>
244244
</trans-unit>
245+
<trans-unit id="SettingsFlagsTitle.Text" translate="yes" xml:space="preserve">
246+
<source>Flags</source>
247+
<target state="new">Flags</target>
248+
</trans-unit>
245249
</group>
246250
</body>
247251
</file>
248-
</xliff>
252+
</xliff>

‎Files/MultilingualResources/Files.zh-Hans.xlf

Lines changed: 252 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,252 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
3+
<file datatype="xml" source-language="en-US" target-language="zh-Hans" original="FILES/STRINGS/EN-US/RESOURCES.RESW" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
4+
<header>
5+
<tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.6915.0" tool-company="Microsoft" />
6+
</header>
7+
<body>
8+
<group id="FILES/STRINGS/EN-US/RESOURCES.RESW" datatype="resx">
9+
<trans-unit id="PropertiesCreated.Text" translate="yes" xml:space="preserve">
10+
<source>Created:</source>
11+
<target state="translated">新建:</target>
12+
</trans-unit>
13+
<trans-unit id="PropertiesItemFileName.PlaceholderText" translate="yes" xml:space="preserve">
14+
<source>Item Name</source>
15+
<target state="translated">文件名</target>
16+
</trans-unit>
17+
<trans-unit id="PropertiesItemPath.Text" translate="yes" xml:space="preserve">
18+
<source>Path:</source>
19+
<target state="translated">位置:</target>
20+
</trans-unit>
21+
<trans-unit id="PropertiesItemSize.Text" translate="yes" xml:space="preserve">
22+
<source>Size:</source>
23+
<target state="translated">大小:</target>
24+
</trans-unit>
25+
<trans-unit id="PropertiesItemType.Text" translate="yes" xml:space="preserve">
26+
<source>Item type:</source>
27+
<target state="translated">文件类型:</target>
28+
</trans-unit>
29+
<trans-unit id="PropertiesModified.Text" translate="yes" xml:space="preserve">
30+
<source>Modified:</source>
31+
<target state="translated">修改时间:</target>
32+
</trans-unit>
33+
<trans-unit id="RecentItemClearAll.Text" translate="yes" xml:space="preserve">
34+
<source>Clear all items</source>
35+
<target state="translated">清空所有文件</target>
36+
</trans-unit>
37+
<trans-unit id="RecentItemDescription.Text" translate="yes" xml:space="preserve">
38+
<source>Files and folders you've previously accessed will show up here</source>
39+
<target state="translated">您以前访问过的文件和文件夹将显示在此处</target>
40+
</trans-unit>
41+
<trans-unit id="RecentItemOpenFileLocation.Text" translate="yes" xml:space="preserve">
42+
<source>Open file location</source>
43+
<target state="translated">打开文件位置</target>
44+
</trans-unit>
45+
<trans-unit id="RecentItemRemove.Text" translate="yes" xml:space="preserve">
46+
<source>Remove this item</source>
47+
<target state="translated">删除</target>
48+
</trans-unit>
49+
<trans-unit id="RecentItems.Text" translate="yes" xml:space="preserve">
50+
<source>Recent items</source>
51+
<target state="translated">最近使用的文件</target>
52+
</trans-unit>
53+
<trans-unit id="SettingsAboutAppName.Text" translate="yes" xml:space="preserve">
54+
<source>Files UWP</source>
55+
<target state="new">Files UWP</target>
56+
</trans-unit>
57+
<trans-unit id="SettingsAboutLicense.Text" translate="yes" xml:space="preserve">
58+
<source>License: </source>
59+
<target state="translated">许可证: </target>
60+
</trans-unit>
61+
<trans-unit id="SettingsAboutSpecialThanks.Text" translate="yes" xml:space="preserve">
62+
<source>Special thanks to:</source>
63+
<target state="translated">特别感谢:</target>
64+
</trans-unit>
65+
<trans-unit id="SettingsAboutSubmitFeedback.Text" translate="yes" xml:space="preserve">
66+
<source>Submit Feedback</source>
67+
<target state="translated">提交反馈</target>
68+
</trans-unit>
69+
<trans-unit id="SettingsAboutSubmitFeedbackDescription.Text" translate="yes" xml:space="preserve">
70+
<source>Submit an issue report to provide the developers with information</source>
71+
<target state="translated">向开发人员提交问题报告</target>
72+
</trans-unit>
73+
<trans-unit id="SettingsAboutThirdPartyLicenses.Text" translate="yes" xml:space="preserve">
74+
<source>Third Party Licenses</source>
75+
<target state="translated">第三方许可证</target>
76+
</trans-unit>
77+
<trans-unit id="SettingsAboutTitle.Text" translate="yes" xml:space="preserve">
78+
<source>About</source>
79+
<target state="translated">关于</target>
80+
</trans-unit>
81+
<trans-unit id="SettingsAboutWebsite.Text" translate="yes" xml:space="preserve">
82+
<source>Website: </source>
83+
<target state="translated">网站: </target>
84+
</trans-unit>
85+
<trans-unit id="SettingsAppearanceAcrylicSidebar.Text" translate="yes" xml:space="preserve">
86+
<source>Acrylic sidebar</source>
87+
<target state="translated">侧边栏亚克力模糊</target>
88+
</trans-unit>
89+
<trans-unit id="SettingsAppearanceDateFormat.Text" translate="yes" xml:space="preserve">
90+
<source>Date format</source>
91+
<target state="translated">日期格式</target>
92+
</trans-unit>
93+
<trans-unit id="SettingsAppearanceTheme.Text" translate="yes" xml:space="preserve">
94+
<source>Theme</source>
95+
<target state="translated">主题</target>
96+
</trans-unit>
97+
<trans-unit id="SettingsAppearanceTitle.Text" translate="yes" xml:space="preserve">
98+
<source>Appearance</source>
99+
<target state="translated">外观</target>
100+
</trans-unit>
101+
<trans-unit id="SettingsFilesAndFoldersShowDriveLetters.Text" translate="yes" xml:space="preserve">
102+
<source>Show drive letters</source>
103+
<target state="translated">显示盘符</target>
104+
</trans-unit>
105+
<trans-unit id="SettingsFilesAndFoldersShowFileExtensions.Text" translate="yes" xml:space="preserve">
106+
<source>Show extensions for known file types</source>
107+
<target state="translated">显示已知文件类型的扩展名</target>
108+
</trans-unit>
109+
<trans-unit id="SettingsFilesAndFoldersShowHiddenFiles.Text" translate="yes" xml:space="preserve">
110+
<source>Show hidden files, folders, and drives</source>
111+
<target state="translated">显示隐藏的文件、文件夹和驱动器</target>
112+
</trans-unit>
113+
<trans-unit id="SettingsFilesAndFoldersTitle.Text" translate="yes" xml:space="preserve">
114+
<source>Files and Folders</source>
115+
<target state="translated">文件和文件夹</target>
116+
</trans-unit>
117+
<trans-unit id="SettingsFlagsTitle.Text" translate="yes" xml:space="preserve">
118+
<source>Flags</source>
119+
<target state="translated">标记</target>
120+
</trans-unit>
121+
<trans-unit id="SettingsNav.PaneTitle" translate="yes" xml:space="preserve">
122+
<source>Settings</source>
123+
<target state="translated">设置</target>
124+
</trans-unit>
125+
<trans-unit id="SettingsNavAbout.Content" translate="yes" xml:space="preserve">
126+
<source>About</source>
127+
<target state="translated">关于</target>
128+
</trans-unit>
129+
<trans-unit id="SettingsNavAppearance.Content" translate="yes" xml:space="preserve">
130+
<source>Appearance</source>
131+
<target state="translated">外观</target>
132+
</trans-unit>
133+
<trans-unit id="SettingsNavFilesAndFolders.Content" translate="yes" xml:space="preserve">
134+
<source>Files and Folders</source>
135+
<target state="translated">文件和文件夹</target>
136+
</trans-unit>
137+
<trans-unit id="SettingsNavOnStartup.Content" translate="yes" xml:space="preserve">
138+
<source>On Startup</source>
139+
<target state="translated">启动时</target>
140+
</trans-unit>
141+
<trans-unit id="SettingsNavPageLayouts.Content" translate="yes" xml:space="preserve">
142+
<source>Page Layouts</source>
143+
<target state="translated">查看</target>
144+
</trans-unit>
145+
<trans-unit id="SettingsNavPreferences.Content" translate="yes" xml:space="preserve">
146+
<source>Preferences</source>
147+
<target state="translated">个性化</target>
148+
</trans-unit>
149+
<trans-unit id="SettingsNavSearch.PlaceholderText" translate="yes" xml:space="preserve">
150+
<source>Search</source>
151+
<target state="translated">搜索</target>
152+
</trans-unit>
153+
<trans-unit id="SettingsOnStartupContinueWhereYouLeftOff.Content" translate="yes" xml:space="preserve">
154+
<source>Continue where you left off</source>
155+
<target state="translated">继续上次的操作</target>
156+
</trans-unit>
157+
<trans-unit id="SettingsOnStartupOpenANewTab.Content" translate="yes" xml:space="preserve">
158+
<source>Open a new tab</source>
159+
<target state="translated">新建标签页</target>
160+
</trans-unit>
161+
<trans-unit id="SettingsOnStartupOpenASpecificPage.Content" translate="yes" xml:space="preserve">
162+
<source>Open a specific page or pages</source>
163+
<target state="translated">打开特定页面</target>
164+
</trans-unit>
165+
<trans-unit id="SettingsOnStartupTitle.Text" translate="yes" xml:space="preserve">
166+
<source>On Startup</source>
167+
<target state="translated">启动时</target>
168+
</trans-unit>
169+
<trans-unit id="SettingsPreferencesDesktop.Text" translate="yes" xml:space="preserve">
170+
<source>Desktop</source>
171+
<target state="translated">桌面</target>
172+
</trans-unit>
173+
<trans-unit id="SettingsPreferencesDesktopLocation.PlaceholderText" translate="yes" xml:space="preserve">
174+
<source>Set custom desktop location</source>
175+
<target state="translated">自定义桌面位置</target>
176+
</trans-unit>
177+
<trans-unit id="SettingsPreferencesDocuments.Text" translate="yes" xml:space="preserve">
178+
<source>Documents</source>
179+
<target state="translated">文档</target>
180+
</trans-unit>
181+
<trans-unit id="SettingsPreferencesDocumentsLocation.PlaceholderText" translate="yes" xml:space="preserve">
182+
<source>Set custom documents location</source>
183+
<target state="translated">自定义文档位置</target>
184+
</trans-unit>
185+
<trans-unit id="SettingsPreferencesDownloads.Text" translate="yes" xml:space="preserve">
186+
<source>Downloads</source>
187+
<target state="translated">下载</target>
188+
</trans-unit>
189+
<trans-unit id="SettingsPreferencesDownloadsLocation.PlaceholderText" translate="yes" xml:space="preserve">
190+
<source>Set custom downloads location</source>
191+
<target state="translated">自定义下载位置</target>
192+
</trans-unit>
193+
<trans-unit id="SettingsPreferencesMusic.Text" translate="yes" xml:space="preserve">
194+
<source>Music</source>
195+
<target state="translated">音乐</target>
196+
</trans-unit>
197+
<trans-unit id="SettingsPreferencesMusicLocation.PlaceholderText" translate="yes" xml:space="preserve">
198+
<source>Set custom music location</source>
199+
<target state="translated">自定义音乐位置</target>
200+
</trans-unit>
201+
<trans-unit id="SettingsPreferencesOneDrive.Text" translate="yes" xml:space="preserve">
202+
<source>OneDrive</source>
203+
<target state="new">OneDrive</target>
204+
</trans-unit>
205+
<trans-unit id="SettingsPreferencesOneDriveLocation.PlaceholderText" translate="yes" xml:space="preserve">
206+
<source>Set custom OneDrive location</source>
207+
<target state="translated">自定义 OneDrive 本地文件位置</target>
208+
</trans-unit>
209+
<trans-unit id="SettingsPreferencesPictures.Text" translate="yes" xml:space="preserve">
210+
<source>Pictures</source>
211+
<target state="translated">图片</target>
212+
</trans-unit>
213+
<trans-unit id="SettingsPreferencesPicturesLocation.PlaceholderText" translate="yes" xml:space="preserve">
214+
<source>Set custom pictures location</source>
215+
<target state="translated">自定义图片位置</target>
216+
</trans-unit>
217+
<trans-unit id="SettingsPreferencesPinOneDrive.Text" translate="yes" xml:space="preserve">
218+
<source>Pin OneDrive to the sidebar</source>
219+
<target state="translated">固定 OneDrive 到侧边栏</target>
220+
</trans-unit>
221+
<trans-unit id="SettingsPreferencesReplaceCommonLocations.Text" translate="yes" xml:space="preserve">
222+
<source>Replace common locations</source>
223+
<target state="translated">自定义常用文件夹位置</target>
224+
</trans-unit>
225+
<trans-unit id="SettingsPreferencesSaveLocations.Content" translate="yes" xml:space="preserve">
226+
<source>Save Locations</source>
227+
<target state="translated">保存更改</target>
228+
</trans-unit>
229+
<trans-unit id="SettingsPreferencesTerminalApplications.Text" translate="yes" xml:space="preserve">
230+
<source>Terminal Applications</source>
231+
<target state="translated">终端</target>
232+
</trans-unit>
233+
<trans-unit id="SettingsPreferencesTitle.Text" translate="yes" xml:space="preserve">
234+
<source>Preferences</source>
235+
<target state="translated">个性化</target>
236+
</trans-unit>
237+
<trans-unit id="SettingsPreferencesVideo.Text" translate="yes" xml:space="preserve">
238+
<source>Video</source>
239+
<target state="translated">视频</target>
240+
</trans-unit>
241+
<trans-unit id="SettingsPreferencesVideoLocation.PlaceholderText" translate="yes" xml:space="preserve">
242+
<source>Set custom video location</source>
243+
<target state="translated">自定义视频位置</target>
244+
</trans-unit>
245+
<trans-unit id="SideBarUnpinFromSideBar.Text" translate="yes" xml:space="preserve">
246+
<source>Unpin from Sidebar</source>
247+
<target state="translated">从侧边栏取消固定</target>
248+
</trans-unit>
249+
</group>
250+
</body>
251+
</file>
252+
</xliff>

0 commit comments

Comments
 (0)