From c3f434355899038d8f771cf6f9a2b9969f10fb3c Mon Sep 17 00:00:00 2001 From: morkt Date: Fri, 12 Jan 2018 19:56:25 +0400 Subject: [PATCH] added localization strings for settings. --- ArcFormats/Majiro/ImageRCT.cs | 11 ++----- ArcFormats/ResourceSettings.cs | 9 ++++++ ArcFormats/Strings/arcStrings.Designer.cs | 18 +++++++++++ ArcFormats/Strings/arcStrings.ko-KR.resx | 8 +++++ ArcFormats/Strings/arcStrings.resx | 6 ++++ ArcFormats/Strings/arcStrings.ru-RU.resx | 6 ++++ ArcFormats/Strings/arcStrings.zh-Hans.resx | 8 +++++ GUI/MainWindow.xaml | 2 +- GUI/SettingsWindow.xaml | 6 ++-- GUI/SettingsWindow.xaml.cs | 5 +-- GUI/Strings/guiStrings.Designer.cs | 36 ++++++++++++++++++++++ GUI/Strings/guiStrings.ko-KR.resx | 34 +++++++++++++++++++- GUI/Strings/guiStrings.resx | 12 ++++++++ GUI/Strings/guiStrings.ru-RU.resx | 12 ++++++++ GUI/Strings/guiStrings.zh-Hans.resx | 32 +++++++++++++++++++ GameRes/ImageBMP.cs | 13 ++++---- GameRes/Strings/garStrings.Designer.cs | 18 +++++++++++ GameRes/Strings/garStrings.ko-KR.resx | 8 +++++ GameRes/Strings/garStrings.resx | 6 ++++ GameRes/Strings/garStrings.ru-RU.resx | 6 ++++ GameRes/Strings/garStrings.zh-Hans.resx | 8 +++++ 21 files changed, 243 insertions(+), 21 deletions(-) diff --git a/ArcFormats/Majiro/ImageRCT.cs b/ArcFormats/Majiro/ImageRCT.cs index 0794a429..f05a778d 100644 --- a/ArcFormats/Majiro/ImageRCT.cs +++ b/ArcFormats/Majiro/ImageRCT.cs @@ -72,14 +72,9 @@ namespace GameRes.Formats.Majiro Settings = new[] { OverlayFrames, ApplyMask }; } - LocalResourceSetting OverlayFrames = new LocalResourceSetting { - Name = "RCTOverlayFrames", - Text = "Automatically combine incremental frames", - }; - LocalResourceSetting ApplyMask = new LocalResourceSetting { - Name = "RCTApplyMask", - Text = "Load transparency data from RC8 bitmap", - }; + LocalResourceSetting OverlayFrames = new LocalResourceSetting ("RCTOverlayFrames"); + LocalResourceSetting ApplyMask = new LocalResourceSetting ("RCTApplyMask"); + public const int BaseRecursionLimit = 8; public static Dictionary KnownKeys = new Dictionary(); diff --git a/ArcFormats/ResourceSettings.cs b/ArcFormats/ResourceSettings.cs index c1652dff..ce3780c5 100644 --- a/ArcFormats/ResourceSettings.cs +++ b/ArcFormats/ResourceSettings.cs @@ -4,6 +4,7 @@ // using System.ComponentModel.Composition; +using GameRes.Formats.Strings; namespace GameRes.Formats { @@ -13,6 +14,14 @@ namespace GameRes.Formats get { return Properties.Settings.Default[Name]; } set { Properties.Settings.Default[Name] = value; } } + + public LocalResourceSetting () { } + + public LocalResourceSetting (string name) + { + Name = name; + Text = arcStrings.ResourceManager.GetString (name, arcStrings.Culture); + } } [Export(typeof(ISettingsManager))] diff --git a/ArcFormats/Strings/arcStrings.Designer.cs b/ArcFormats/Strings/arcStrings.Designer.cs index 9472da7c..ea92a018 100644 --- a/ArcFormats/Strings/arcStrings.Designer.cs +++ b/ArcFormats/Strings/arcStrings.Designer.cs @@ -660,6 +660,15 @@ namespace GameRes.Formats.Strings { } } + /// + /// Looks up a localized string similar to Load transparency data from RC8 bitmap. + /// + public static string RCTApplyMask { + get { + return ResourceManager.GetString("RCTApplyMask", resourceCulture); + } + } + /// /// Looks up a localized string similar to Choose title or enter a password. /// @@ -669,6 +678,15 @@ namespace GameRes.Formats.Strings { } } + /// + /// Looks up a localized string similar to Automatically combine incremental frames. + /// + public static string RCTOverlayFrames { + get { + return ResourceManager.GetString("RCTOverlayFrames", resourceCulture); + } + } + /// /// Looks up a localized string similar to Ren'Py game engine archive. /// diff --git a/ArcFormats/Strings/arcStrings.ko-KR.resx b/ArcFormats/Strings/arcStrings.ko-KR.resx index 9794af23..9ac02a44 100644 --- a/ArcFormats/Strings/arcStrings.ko-KR.resx +++ b/ArcFormats/Strings/arcStrings.ko-KR.resx @@ -383,4 +383,12 @@ 아카이브가 암호화된 스크립트를 포함함. 암호체계를 고르거나 암호를 입력하세요. + + Load transparency data from RC8 bitmap + translation pending + + + Automatically combine incremental frames + translation pending + \ No newline at end of file diff --git a/ArcFormats/Strings/arcStrings.resx b/ArcFormats/Strings/arcStrings.resx index 8ca8d83d..e39275bd 100644 --- a/ArcFormats/Strings/arcStrings.resx +++ b/ArcFormats/Strings/arcStrings.resx @@ -386,4 +386,10 @@ Choose appropriate encryption scheme. Archive contains encrypted scripts. Choose encryption scheme or enter a passphrase. + + Load transparency data from RC8 bitmap + + + Automatically combine incremental frames + \ No newline at end of file diff --git a/ArcFormats/Strings/arcStrings.ru-RU.resx b/ArcFormats/Strings/arcStrings.ru-RU.resx index e6cd3457..98dab381 100644 --- a/ArcFormats/Strings/arcStrings.ru-RU.resx +++ b/ArcFormats/Strings/arcStrings.ru-RU.resx @@ -291,9 +291,15 @@ "Старый" метод шифрования + + Подгружать прозрачность из одноимённого RC8 файла + Выберите наименование или введите пароль + + Автоматически объединять мозаичные изображения + 32-битный ключ diff --git a/ArcFormats/Strings/arcStrings.zh-Hans.resx b/ArcFormats/Strings/arcStrings.zh-Hans.resx index b3174e4b..89063eb8 100644 --- a/ArcFormats/Strings/arcStrings.zh-Hans.resx +++ b/ArcFormats/Strings/arcStrings.zh-Hans.resx @@ -384,4 +384,12 @@ 压缩文件包含已加密的脚本。 请选择加密方式或输入密码。 + + Load transparency data from RC8 bitmap + translation pending + + + Automatically combine incremental frames + translation pending + \ No newline at end of file diff --git a/GUI/MainWindow.xaml b/GUI/MainWindow.xaml index b0aa0954..2eb645b5 100644 --- a/GUI/MainWindow.xaml +++ b/GUI/MainWindow.xaml @@ -135,7 +135,7 @@ - + Height="400" Width="500" WindowStartupLocation="CenterOwner"> @@ -155,7 +155,7 @@ IN THE SOFTWARE.