Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Rename the "Path:" text to "Location:" #12243

Merged
merged 14 commits into from
May 1, 2023
Merged

Feature: Rename the "Path:" text to "Location:" #12243

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0965bb5
Rename the 'Path:' text to 'Location:'
memory-hunter Apr 30, 2023
c8282e8
Merge branch 'files-community:main' into path-to-location
memory-hunter Apr 30, 2023
fd5bed6
Reverted back Path to Path:
memory-hunter May 1, 2023
cb12dee
Added in Location variable
memory-hunter May 1, 2023
f04c0f2
Replaced Path variable with Location variable
memory-hunter May 1, 2023
3d4be62
Merge branch 'path-to-location' of github.com:memory-hunter/Files int…
memory-hunter May 1, 2023
b20fd4d
Merge branch 'main' into path-to-location
memory-hunter May 1, 2023
f88c43c
Reverted us-GB back
memory-hunter May 1, 2023
615c52e
Merge branch 'files-community:main' into path-to-location
memory-hunter May 1, 2023
89e30bd
Pulled Resources.resw from main
memory-hunter May 1, 2023
c8209f3
Updated to ItemLocation, ItemLocationVisibility
memory-hunter May 1, 2023
418be01
Update src/Files.App/Views/Properties/GeneralPage.xaml
memory-hunter May 1, 2023
9282332
Updated to PropertiesCombinedItemLocation
memory-hunter May 1, 2023
bce68b7
Merge branch 'main' into path-to-location
memory-hunter May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/Files.App/Strings/en-GB/Resources.resw
View file
Open in desktop
memory-hunter marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -59,46 +59,46 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="type" type="xsd:string"/>
<xsd:attribute name="mimetype" type="xsd:string"/>
<xsd:attribute ref="xml:space"/>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string"/>
<xsd:attribute name="name" type="xsd:string"/>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
<xsd:attribute ref="xml:space"/>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
Expand Down Expand Up @@ -3205,4 +3205,4 @@
<data name="RedoDescription" xml:space="preserve">
<value>Redo the last file operation</value>
</data>
</root>
</root>
5 changes: 4 additions & 1 deletion src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3205,4 +3205,7 @@
<data name="RedoDescription" xml:space="preserve">
<value>Redo the last file operation</value>
</data>
</root>
<data name="Location" xml:space="preserve">
<value>Location:</value>
</data>
</root>
4 changes: 2 additions & 2 deletions src/Files.App/Views/Properties/GeneralPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<!-- Item Path -->
<!-- Item Location -->
<TextBlock
Grid.Row="0"
Grid.Column="0"
HorizontalAlignment="Left"
Style="{StaticResource PropertyName}"
Text="{helpers:ResourceString Name=Path}"
Text="{helpers:ResourceString Name=Location}"
Visibility="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}" />
memory-hunter marked this conversation as resolved.
Show resolved Hide resolved

<TextBlock
Expand Down