Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

localization: move localizable strings to .resw for runner/bootstrapper

Browse Source
This commit is contained in:
yuyoyuppe
2020-09-10 16:57:16 +03:00
committed by Andrey Nekrasov
parent 85c0eaa598
commit d414d52156
19 changed files with 275 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
installer/PowerToysBootstrapper/bootstrapper/LocProject.json Normal file
View File

@@ -0,0 +1,14 @@
{
"Projects": [
{
"LanguageSet": "Azure_Languages",
"LocItems": [
{
"SourceFile": "installer\\PowerToysBootstrapper\\bootstrapper\\Resources.resx",
"CopyOption": "LangIDOnName",
"OutputPath": "installer\\PowerToysBootstrapper\\bootstrapper"
}
]
}
]
}

67
installer/PowerToysBootstrapper/bootstrapper/Resources.resx Normal file
View File

@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<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: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:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<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: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:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="DOTNET_CORE_DOWNLOAD_FAILURE" xml:space="preserve">
<value>Couldn't download .NET Core Desktop Runtime 3.1, please install it manually.</value>
</data>
<data name="DOTNET_CORE_DOWNLOAD_FAILURE_TITLE" xml:space="preserve">
<value>PowerToys installation error</value>
</data>
</root>

7
installer/PowerToysBootstrapper/bootstrapper/bootstrapper.rc → installer/PowerToysBootstrapper/bootstrapper/bootstrapper.base.rc
View File

@@ -5,13 +5,6 @@
MAINICON ICON "../../../src/runner/svgs/icon.ico" MAINICON ICON "../../../src/runner/svgs/icon.ico"
IDR_BIN_ICON BIN "../../../src/runner/svgs/icon.ico" IDR_BIN_ICON BIN "../../../src/runner/svgs/icon.ico"
STRINGTABLE
BEGIN
IDS_DOTNET_CORE_DOWNLOAD_FAILURE "Couldn't download .NET Core Desktop Runtime 3.1, please install it manually."
IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE "PowerToys installation error"
END
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION FILE_VERSION FILEVERSION FILE_VERSION
PRODUCTVERSION PRODUCT_VERSION PRODUCTVERSION PRODUCT_VERSION

2
installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
View File

@@ -1,4 +1,5 @@
#include "pch.h" #include "pch.h"
#include "Generated Files/resource.h"
#include <common/common.h> #include <common/common.h>
#include <common/notifications.h> #include <common/notifications.h>
@@ -9,7 +10,6 @@
#include <common/appMutex.h> #include <common/appMutex.h>
#include <common/processApi.h> #include <common/processApi.h>
#include "resource.h"
#include <runner/action_runner_utils.h> #include <runner/action_runner_utils.h>

9
installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
View File

@@ -17,6 +17,9 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
<Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)..\..\tools\build\convert-resx-to-rc.ps1 . resource.base.h resource.h bootstrapper.base.rc bootstrapper.rc 105" />
</Target>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion> <VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{D194E3AA-F824-4CA9-9A58-034DD6B7D022}</ProjectGuid> <ProjectGuid>{D194E3AA-F824-4CA9-9A58-034DD6B7D022}</ProjectGuid>
@@ -116,13 +119,13 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="..\runner\updating.h" /> <ClInclude Include="..\runner\updating.h" />
<ClInclude Include="pch.h" /> <ClInclude Include="pch.h" />
<ClInclude Include="resource.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="bootstrapper.rc" /> <None Include="bootstrapper.base.rc" />
<ResourceCompile Include="Generated Files/bootstrapper.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="..\runner\svgs\icon.ico" /> <Image Include="..\runner\svgs\icon.ico" />
@@ -145,4 +148,4 @@
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" /> <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
</Target> </Target>
</Project> </Project>

3
installer/PowerToysBootstrapper/bootstrapper/resource.h → installer/PowerToysBootstrapper/bootstrapper/resource.base.h
View File

@@ -12,8 +12,5 @@
// Non-localizable // Non-localizable
////////////////////////////// //////////////////////////////
#define IDS_DOTNET_CORE_DOWNLOAD_FAILURE 101
#define IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE 102
#define IDR_BIN_MSIINSTALLER 103 #define IDR_BIN_MSIINSTALLER 103
#define IDR_BIN_ICON 104 #define IDR_BIN_ICON 104

14
src/action_runner/LocProject.json Normal file
View File

@@ -0,0 +1,14 @@
{
"Projects": [
{
"LanguageSet": "Azure_Languages",
"LocItems": [
{
"SourceFile": "src\\runner\\Resources.resx",
"CopyOption": "LangIDOnName",
"OutputPath": "src\\runner"
}
]
}
]
}

67
src/action_runner/Resources.resx Normal file
View File

@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<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: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:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<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: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:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="DOTNET_CORE_DOWNLOAD_FAILURE" xml:space="preserve">
<value>Couldn't download .NET Core Desktop Runtime 3.1, please install it manually.</value>
</data>
<data name="DOTNET_CORE_DOWNLOAD_FAILURE_TITLE" xml:space="preserve">
<value>PowerToys installation error</value>
</data>
</root>

6
src/action_runner/action_runner.rc → src/action_runner/action_runner.base.rc
View File

@@ -2,12 +2,6 @@
#include "resource.h" #include "resource.h"
#include "../common/version.h" #include "../common/version.h"
STRINGTABLE
BEGIN
IDS_DOTNET_CORE_DOWNLOAD_FAILURE "Couldn't download .NET Core Desktop Runtime 3.1, please install it manually."
IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE "PowerToys installation error"
END
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION FILE_VERSION FILEVERSION FILE_VERSION
PRODUCTVERSION PRODUCT_VERSION PRODUCTVERSION PRODUCT_VERSION

2
src/action_runner/action_runner.cpp
View File

@@ -16,7 +16,7 @@
#include "../runner/tray_icon.h" #include "../runner/tray_icon.h"
#include "../runner/action_runner_utils.h" #include "../runner/action_runner_utils.h"
#include "resource.h" #include "Generated Files/resource.h"
extern "C" IMAGE_DOS_HEADER __ImageBase; extern "C" IMAGE_DOS_HEADER __ImageBase;

7
src/action_runner/action_runner.vcxproj
View File

@@ -19,6 +19,10 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
<Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 . resource.base.h resource.h action_runner.base.rc action_runner.rc" />
</Target>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion> <VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}</ProjectGuid> <ProjectGuid>{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}</ProjectGuid>
@@ -167,7 +171,8 @@
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="action_runner.rc" /> <None Include="action_runner.base.rc" />
<ResourceCompile Include="Generated Files/action_runner.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />

5
src/action_runner/resource.h → src/action_runner/resource.base.h
View File

@@ -9,8 +9,3 @@
#define INTERNAL_NAME "action_runner" #define INTERNAL_NAME "action_runner"
#define ORIGINAL_FILENAME "action_runner.exe" #define ORIGINAL_FILENAME "action_runner.exe"
// Non-localizable
//////////////////////////////
#define IDS_DOTNET_CORE_DOWNLOAD_FAILURE 101
#define IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE 102

14
src/runner/LocProject.json Normal file
View File

@@ -0,0 +1,14 @@
{
"Projects": [
{
"LanguageSet": "Azure_Languages",
"LocItems": [
{
"SourceFile": "src\\action_runner\\Resources.resx",
"CopyOption": "LangIDOnName",
"OutputPath": "src\\action_runner"
}
]
}
]
}

77
src/runner/Resources.resx Normal file
View File

@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<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: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:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<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: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:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ERROR" xml:space="preserve">
<value>PowerToys Error</value>
</data>
<data name="COULDNOT_RESTART_NONELEVATED" xml:space="preserve">
<value>Could not start PowerToys as a user!</value>
</data>
<data name="COULDNOT_RESTART_ELEVATED" xml:space="preserve">
<value>Could not start PowerToys as an administrator!</value>
</data>
<data name="ANOTHER_INSTANCE_RUNNING" xml:space="preserve">
<value>PowerToys is already running.</value>
</data>
<data name="AUTOUPDATE_SUCCESS" xml:space="preserve">
<value>PowerToys was successfully updated!</value>
</data>
</root>

2
src/runner/main.cpp
View File

@@ -7,7 +7,7 @@
#include "trace.h" #include "trace.h"
#include "general_settings.h" #include "general_settings.h"
#include "restart_elevated.h" #include "restart_elevated.h"
#include "resource.h" #include "Generated files/resource.h"
#include <common/common.h> #include <common/common.h>
#include <common/dpi_aware.h> #include <common/dpi_aware.h>

9
src/runner/resource.h → src/runner/resource.base.h
View File

@@ -15,13 +15,6 @@
#define APPICON 101 #define APPICON 101
#define ID_TRAY_MENU 102 #define ID_TRAY_MENU 102
#define IDS_POWERTOYS 103
#define IDS_ERROR 104
#define IDS_COULDNOT_RESTART_NONELEVATED 105
#define IDS_COULDNOT_RESTART_ELEVATED 106
#define IDS_ANOTHER_INSTANCE_RUNNING 107
#define IDS_AUTOUPDATE_SUCCESS 108
#define ID_EXIT_MENU_COMMAND 40001 #define ID_EXIT_MENU_COMMAND 40001
#define ID_SETTINGS_MENU_COMMAND 40002 #define ID_SETTINGS_MENU_COMMAND 40002
#define ID_ABOUT_MENU_COMMAND 40003 #define ID_ABOUT_MENU_COMMAND 40003

BIN
src/runner/runner.rc → src/runner/runner.base.rc
View File

Binary file not shown.

6
src/runner/runner.vcxproj
View File

@@ -11,6 +11,9 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
<Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 . resource.base.h resource.h runner.base.rc runner.rc" />
</Target>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion> <VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}</ProjectGuid> <ProjectGuid>{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}</ProjectGuid>
@@ -140,7 +143,8 @@
<ClInclude Include="unhandled_exception_handler.h" /> <ClInclude Include="unhandled_exception_handler.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="runner.rc" /> <None Include="runner.base.rc" />
<ResourceCompile Include="Generated Files/runner.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CopyFileToFolders Include="svgs\0.svg"> <CopyFileToFolders Include="svgs\0.svg">

2
src/runner/tray_icon.cpp
View File

@@ -1,5 +1,5 @@
#include "pch.h" #include "pch.h"
#include "resource.h" #include "Generated files/resource.h"
#include "settings_window.h" #include "settings_window.h"
#include "tray_icon.h" #include "tray_icon.h"
#include <Windows.h> #include <Windows.h>