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

Update new localized fields #160

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update new localized fields #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ba19b8
Optimize and add some localization fields
TheBug233 Jul 29, 2023
7abbb87
Update Simplified Chinese localized .resw
TheBug233 Jul 29, 2023
1e1faf5
Merge branch 'benaclejames:master' into master
TheBug233 Jul 30, 2023
92e19d2
Undo changes to log localization
TheBug233 Jul 30, 2023
7965992
There seems to be a problem with the text encoding, resubmit..
TheBug233 Jul 30, 2023
42e00de
Merge branch 'master' into master
TheBug233 Aug 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
105 changes: 105 additions & 0 deletions VRCFaceTracking/Strings/en/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,4 +320,109 @@
<data name="AutoStartSettings.Description" xml:space="preserve">
<value>Auto Start when SteamVR is launched</value>
</data>
<data name="Calibrate.Description" xml:space="preserve">
<value>Heighten the influence your expressions make on calibration temporarily</value>
</data>
<data name="Calibrate.Header" xml:space="preserve">
<value>Calibrate</value>
</data>
<data name="CalibrateButton.Content" xml:space="preserve">
<value>Calibrate</value>
</data>
<data name="Calibration_Enabled.Description" xml:space="preserve">
<value>Toggles whether or not calibration is enabled</value>
</data>
<data name="Calibration_Enabled.Header" xml:space="preserve">
<value>Calibration Enabled</value>
</data>
<data name="Calibration_Influence.Description" xml:space="preserve">
<value>Controls how much of an influence your facial expressions have on overall calibration over time</value>
</data>
<data name="Calibration_Influence.Header" xml:space="preserve">
<value>Calibration Influence</value>
</data>
<data name="Continuous_Calibration.Description" xml:space="preserve">
<value>Slowly calibrates to your facial expressions over time</value>
</data>
<data name="Continuous_Calibration.Header" xml:space="preserve">
<value>Continuous Calibration</value>
</data>
<data name="Contributions.Text" xml:space="preserve">
<value>Contributions</value>
</data>
<data name="Credits.Header" xml:space="preserve">
<value>Credits</value>
</data>
<data name="Dismiss.Content" xml:space="preserve">
<value>Dismiss</value>
</data>
<data name="Force_Re-Initialize.Description" xml:space="preserve">
<value>Force VRCFT to unload and reinitialize all modules</value>
</data>
<data name="Force_Re-Initialize.Header" xml:space="preserve">
<value>Force Re-Initialize</value>
</data>
<data name="Force_Relevancy.Description" xml:space="preserve">
<value>Forces sending of all parameters every frame by forcing relevancy</value>
</data>
<data name="Force_Relevancy.Header" xml:space="preserve">
<value>Force Relevancy</value>
</data>
<data name="Gremlin_Mode.OnContent" xml:space="preserve">
<value>Gremlin Mode</value>
</data>
<data name="install" xml:space="preserve">
<value>Install</value>
</data>
<data name="Install_Module_from_zip.Text" xml:space="preserve">
<value>Install Module from *.zip</value>
</data>
<data name="IP_Address.Description" xml:space="preserve">
<value>No changes required to run VRChat localhost</value>
</data>
Comment on lines +380 to +382
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't need descriptions for these values

<data name="IP_Address.Header" xml:space="preserve">
<value>IP Address</value>
</data>
<data name="PleaseRestartVRCFT" xml:space="preserve">
<value>Please Restart VRCFT</value>
</data>
<data name="Re-Initialize.Content" xml:space="preserve">
<value>Re-Initialize</value>
</data>
<data name="Receive_Port.Description" xml:space="preserve">
<value>This port is used to receive OSC data from VRChat</value>
Comment on lines +392 to +393
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't need descriptions for these values

</data>
<data name="Receive_Port.Header" xml:space="preserve">
<value>Receive Port</value>
</data>
<data name="Reset.Content" xml:space="preserve">
<value>Reset</value>
</data>
<data name="Reset_VRCFT.Description" xml:space="preserve">
<value>Reset all data stored by VRCFT in your AppData folder</value>
</data>
<data name="Reset_VRCFT.Header" xml:space="preserve">
<value>Reset VRCFT</value>
</data>
<data name="Reset_VRChat_Configs.Description" xml:space="preserve">
<value>Reset all VRChat OSC config data (will be regenerated when avatar is reloaded)</value>
</data>
<data name="Reset_VRChat_Configs.Header" xml:space="preserve">
<value>Reset VRChat Configs</value>
</data>
<data name="Send_Port.Description" xml:space="preserve">
<value>⚠no other program occupying the port</value>
</data>
Comment on lines +413 to +415
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't need descriptions for these values

<data name="Send_Port.Header" xml:space="preserve">
<value>Send Port</value>
</data>
<data name="Uninstall" xml:space="preserve">
<value>Uninstall</value>
</data>
<data name="Update" xml:space="preserve">
<value>Update</value>
</data>
<data name="YourRating" xml:space="preserve">
<value>Your Rating</value>
</data>
</root>
156 changes: 153 additions & 3 deletions VRCFaceTracking/Strings/zh-cn/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<value>作者</value>
</data>
<data name="AvatarStatus.Text" xml:space="preserve">
<value>模型状态</value>
<value>Avatar状态</value>
</data>
<data name="copyright.Description" xml:space="preserve">
<value>© 2023 VRCFaceTracking。版权所有。</value>
Expand Down Expand Up @@ -239,7 +239,7 @@
<data name="msOutgoing.Text" xml:space="preserve">
<value>m/s 传出</value>
</data>
<data name="NoModulesInstalled.Text" xml:space="preserve">
<data name="no_modules_installed_warning.Title" xml:space="preserve">
<value>没有安装模块</value>
</data>
<data name="OSCStatus.Text" xml:space="preserve">
Expand Down Expand Up @@ -272,7 +272,157 @@
<data name="OscSettings.Description" xml:space="preserve">
<value>OSC 数据应该发送到哪里？</value>
</data>
<data name="You_appear_to_have_no_modules_installed.Text" xml:space="preserve">
<data name="AutoStartSettings.Description" xml:space="preserve">
<value>当SteamVR启动时自动启动</value>
</data>
<data name="AutoStartSettings.Header" xml:space="preserve">
<value>自动启动</value>
</data>
<data name="Calibrate.Description" xml:space="preserve">
<value>一键提高你的表情对表达式的强度</value>
</data>
<data name="Calibrate.Header" xml:space="preserve">
<value>校准</value>
</data>
<data name="CalibrateButton.Content" xml:space="preserve">
<value>提升！</value>
</data>
<data name="CalibrationSettings.Description" xml:space="preserve">
<value>微调追踪数据</value>
</data>
<data name="CalibrationSettings.Header" xml:space="preserve">
<value>校准设置</value>
</data>
<data name="Calibration_Enabled.Description" xml:space="preserve">
<value>用于切换是否启用校准</value>
</data>
<data name="Calibration_Enabled.Header" xml:space="preserve">
<value>开启校准</value>
</data>
<data name="Calibration_Influence.Description" xml:space="preserve">
<value>调整至合适你的强度</value>
</data>
<data name="Calibration_Influence.Header" xml:space="preserve">
<value>校准影响强度</value>
</data>
<data name="Continuous_Calibration.Description" xml:space="preserve">
<value>随着时间的推移，它会慢慢适应你的面部表情</value>
</data>
<data name="Continuous_Calibration.Header" xml:space="preserve">
<value>连续校准</value>
</data>
<data name="Contributions.Text" xml:space="preserve">
<value>次贡献</value>
</data>
<data name="Credits.Description" xml:space="preserve">
<value>是他们让这一切变成可能😘</value>
</data>
<data name="Credits.Header" xml:space="preserve">
<value>贡献者</value>
</data>
<data name="Dismiss.Content" xml:space="preserve">
<value>忽略</value>
</data>
<data name="Force_Re-Initialize.Description" xml:space="preserve">
<value>强制 VRCFT 卸载并重新初始化所有模块</value>
</data>
<data name="Force_Re-Initialize.Header" xml:space="preserve">
<value>强制重新初始化</value>
</data>
<data name="Force_Relevancy.Description" xml:space="preserve">
<value>通过强制相关性，强制每帧发送所有参数</value>
</data>
<data name="Force_Relevancy.Header" xml:space="preserve">
<value>强制关联</value>
</data>
<data name="Gremlin_Mode.OnContent" xml:space="preserve">
<value>高危模式</value>
</data>
<data name="install" xml:space="preserve">
<value>安装</value>
</data>
<data name="Install_Module_from_zip.Text" xml:space="preserve">
<value>从*.zip压缩包安装模块</value>
</data>
<data name="IP_Address.Description" xml:space="preserve">
<value>在本地运行VRChat无需更改</value>
</data>
<data name="IP_Address.Header" xml:space="preserve">
<value>IP地址</value>
</data>
<data name="LocalTestAvatar.Text" xml:space="preserve">
<value>已检测到本地测试Avatar</value>
</data>
<data name="LocalTestAvatarTooltip.Content" xml:space="preserve">
<value>OSC并不支持本地测试Avatar，可能会出大问题...</value>
</data>
<data name="no_modules_installed_warning.ButtonText" xml:space="preserve">
<value>在这里安装一些模块！</value>
</data>
<data name="no_modules_installed_warning.Description" xml:space="preserve">
<value>您似乎没有安装任何模块。</value>
</data>
<data name="OpenLocalStorageCard.Header" xml:space="preserve">
<value>打开本地模块位置</value>
</data>
<data name="OscSettings.Header" xml:space="preserve">
<value>OSC地址</value>
</data>
<data name="osc_was_disabled_warning.Description" xml:space="preserve">
<value>我们注意到您在VRChat中的OSC设置是关闭状态，我们已帮你打开啦。如果此时游戏处于打开状态，您可能需要在菜单中手动启用它。如果没有打开游戏，那么您应该可以正常使用了！</value>
</data>
<data name="osc_was_disabled_warning.Title" xml:space="preserve">
<value>自定义OSC设置</value>
</data>
<data name="PleaseRestartVRCFT" xml:space="preserve">
<value>请重启VRCFT</value>
</data>
<data name="Re-Initialize.Content" xml:space="preserve">
<value>重新初始化</value>
</data>
<data name="Receive_Port.Description" xml:space="preserve">
<value>该端口用于接收VRChat发送的OSC数据</value>
</data>
<data name="Receive_Port.Header" xml:space="preserve">
<value>接收端口</value>
</data>
<data name="Reset.Content" xml:space="preserve">
<value>重置</value>
</data>
<data name="Reset_VRCFT.Description" xml:space="preserve">
<value>重置 VRCFT 在 %AppData% 文件夹中存储的所有文件</value>
</data>
<data name="Reset_VRCFT.Header" xml:space="preserve">
<value>重置 VRCFT 的所有配置</value>
</data>
<data name="Reset_VRChat_Configs.Description" xml:space="preserve">
<value>重置所有 VRChat Avatar 的 OSC 配置文件（重新加载Avatar时将自动生成新的，不删除不会更新）</value>
</data>
<data name="Reset_VRChat_Configs.Header" xml:space="preserve">
<value>删除 VRChat 的OSC配置文件</value>
</data>
<data name="RiskySettings.Description" xml:space="preserve">
<value>这是一堆非常危险的设置，不到万不得已不建议动它...</value>
</data>
<data name="RiskySettings.Header" xml:space="preserve">
<value>高危设置</value>
</data>
<data name="Send_Port.Description" xml:space="preserve">
<value>请确保没有其他程序占用该端口</value>
</data>
<data name="Send_Port.Header" xml:space="preserve">
<value>发送端口</value>
</data>
<data name="ThemeSettings.Header" xml:space="preserve">
<value>主题设置</value>
</data>
<data name="Uninstall" xml:space="preserve">
<value>卸载</value>
</data>
<data name="Update" xml:space="preserve">
<value>更新</value>
</data>
<data name="YourRating" xml:space="preserve">
<value>你给予的星星</value>
</data>
</root>
18 changes: 10 additions & 8 deletions VRCFaceTracking/Views/ModuleRegistryDetailControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using VRCFaceTracking.Core.Models;
using VRCFaceTracking.Core.Services;
using VRCFaceTracking.ViewModels;
using Windows.ApplicationModel.Resources;

namespace VRCFaceTracking.Views;

Expand All @@ -19,6 +20,7 @@ public InstallableTrackingModule? ListDetailsMenuItem
private readonly ModuleInstaller _moduleInstaller;
private readonly ILibManager _libManager;
private readonly MainViewModel _mainViewModel;
private static readonly ResourceLoader _loader = ResourceLoader.GetForViewIndependentUse("Resources");

public static readonly DependencyProperty ListDetailsMenuItemProperty = DependencyProperty.Register("ListDetailsMenuItem", typeof(TrackingModuleMetadata), typeof(ModuleRegistryDetailControl), new PropertyMetadata(null, OnListDetailsMenuItemPropertyChanged));

Expand All @@ -44,16 +46,16 @@ private static async void OnListDetailsMenuItemPropertyChanged(DependencyObject
switch (control.ListDetailsMenuItem!.InstallationState)
{
case InstallState.NotInstalled:
control.InstallButton.Content = "Install";
control.InstallButton.Content = _loader.GetString("install");
break;
case InstallState.Installed:
control.InstallButton.Content = "Uninstall";
control.InstallButton.Content = _loader.GetString("Uninstall");
break;
case InstallState.Outdated:
control.InstallButton.Content = "Update";
control.InstallButton.Content = _loader.GetString("Update");
break;
case InstallState.AwaitingRestart:
control.InstallButton.Content = "Please Restart VRCFT";
control.InstallButton.Content = _loader.GetString("PleaseRestartVRCFT");
control.InstallButton.IsEnabled = false;
break;
}
Expand All @@ -64,7 +66,7 @@ private static async void OnListDetailsMenuItemPropertyChanged(DependencyObject
{
control.RatingControl.PlaceholderValue = rating;
control.RatingControl.Value = rating;
control.RatingControl.Caption = "Your Rating";
control.RatingControl.Caption = _loader.GetString("YourRating");
}
else // Otherwise, set the rating control to the average rating.
{
Expand Down Expand Up @@ -92,15 +94,15 @@ private async void Install_Click(object sender, RoutedEventArgs e)
await _moduleDataService.IncrementDownloadsAsync(ListDetailsMenuItem!);
ListDetailsMenuItem!.Downloads++;
_libManager.Initialize();
InstallButton.Content = "Uninstall";
InstallButton.Content = _loader.GetString("Uninstall");
InstallButton.IsEnabled = true;
_mainViewModel.NoModulesInstalled = false;
}
break;
}
case InstallState.Installed:
{
InstallButton.Content = "Please Restart VRCFT";
InstallButton.Content = _loader.GetString("PleaseRestartVRCFT");
InstallButton.IsEnabled = false;
_libManager.TeardownAllAndResetAsync();
_moduleInstaller.MarkModuleForDeletion(ListDetailsMenuItem!);
Expand All @@ -113,7 +115,7 @@ private async void Install_Click(object sender, RoutedEventArgs e)

private async void RatingControl_OnValueChanged(RatingControl sender, object args)
{
RatingControl.Caption = "Your Rating";
RatingControl.Caption = _loader.GetString("YourRating");

await _moduleDataService.SetMyRatingAsync(ListDetailsMenuItem!, (int)RatingControl.Value);
}
Expand Down
2 changes: 1 addition & 1 deletion VRCFaceTracking/Views/ModuleRegistryPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<FontIcon FontSize="20" Glyph="&#xF8AA;" />
</Button.Content>
</Button>
<TextBlock x:Name="CustomInstallStatus" TextWrapping="Wrap" VerticalAlignment="Center" Style="{ThemeResource DetailBodyBaseMediumStyle}" Padding="20, 0, 0, 0" Text="Install Module from .zip"/>
<TextBlock x:Name="CustomInstallStatus" TextWrapping="Wrap" VerticalAlignment="Center" Style="{ThemeResource DetailBodyBaseMediumStyle}" Padding="20, 0, 0, 0" x:Uid="Install_Module_from_zip"/>
</StackPanel>
</Grid>
</Border>
Expand Down
Loading