From 203172be7738e4e77bbd9efcfce1af612d7f7953 Mon Sep 17 00:00:00 2001 From: morkt Date: Mon, 23 Nov 2015 21:28:32 +0400 Subject: [PATCH] renamed some common string resources. --- ArcFormats/Entis/WidgetNOA.xaml.cs | 2 +- ArcFormats/Ikura/WidgetISF.xaml.cs | 2 +- ArcFormats/Majiro/ImageRCT.cs | 2 +- ArcFormats/Strings/arcStrings.Designer.cs | 63 +++++++++++++---------- ArcFormats/Strings/arcStrings.ko-KR.resx | 22 ++++---- ArcFormats/Strings/arcStrings.resx | 21 ++++---- ArcFormats/Strings/arcStrings.ru-RU.resx | 21 ++++---- 7 files changed, 76 insertions(+), 57 deletions(-) diff --git a/ArcFormats/Entis/WidgetNOA.xaml.cs b/ArcFormats/Entis/WidgetNOA.xaml.cs index 18759be2..d5419c93 100644 --- a/ArcFormats/Entis/WidgetNOA.xaml.cs +++ b/ArcFormats/Entis/WidgetNOA.xaml.cs @@ -13,7 +13,7 @@ namespace GameRes.Formats.GUI public WidgetNOA () { InitializeComponent (); - var keys = new string[] { arcStrings.NOAIgnoreEncryption }; + var keys = new string[] { arcStrings.ArcIgnoreEncryption }; Scheme.ItemsSource = keys.Concat (NoaOpener.KnownKeys.Keys.OrderBy (x => x)); // select first scheme as default if (-1 == Scheme.SelectedIndex) diff --git a/ArcFormats/Ikura/WidgetISF.xaml.cs b/ArcFormats/Ikura/WidgetISF.xaml.cs index 75286e30..301a0880 100644 --- a/ArcFormats/Ikura/WidgetISF.xaml.cs +++ b/ArcFormats/Ikura/WidgetISF.xaml.cs @@ -13,7 +13,7 @@ namespace GameRes.Formats.GUI public WidgetISF () { InitializeComponent (); - var keys = new string[] { arcStrings.ISFIgnoreEncryption}; + var keys = new string[] { arcStrings.ArcIgnoreEncryption}; Scheme.ItemsSource = keys.Concat (MpxOpener.KnownSecrets.Keys.OrderBy (x => x)); if (-1 == Scheme.SelectedIndex) Scheme.SelectedIndex = 0; diff --git a/ArcFormats/Majiro/ImageRCT.cs b/ArcFormats/Majiro/ImageRCT.cs index 55911dbe..3f36e8d3 100644 --- a/ArcFormats/Majiro/ImageRCT.cs +++ b/ArcFormats/Majiro/ImageRCT.cs @@ -241,7 +241,7 @@ namespace GameRes.Formats.Majiro private string QueryPassword () { - var options = Query (arcStrings.RCTNotice); + var options = Query (arcStrings.ArcImageEncrypted); return options.Password; } diff --git a/ArcFormats/Strings/arcStrings.Designer.cs b/ArcFormats/Strings/arcStrings.Designer.cs index 4644d1b9..14bd1274 100644 --- a/ArcFormats/Strings/arcStrings.Designer.cs +++ b/ArcFormats/Strings/arcStrings.Designer.cs @@ -133,6 +133,24 @@ namespace GameRes.Formats.Strings { } } + /// + /// Looks up a localized string similar to Ignore encryption. + /// + public static string ArcIgnoreEncryption { + get { + return ResourceManager.GetString("ArcIgnoreEncryption", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Image is encrypted.. + /// + public static string ArcImageEncrypted { + get { + return ResourceManager.GetString("ArcImageEncrypted", resourceCulture); + } + } + /// /// Looks up a localized string similar to no encryption. /// @@ -277,15 +295,6 @@ namespace GameRes.Formats.Strings { } } - /// - /// Looks up a localized string similar to Ignore encryption. - /// - public static string ISFIgnoreEncryption { - get { - return ResourceManager.GetString("ISFIgnoreEncryption", resourceCulture); - } - } - /// /// Looks up a localized string similar to Default. /// @@ -350,6 +359,24 @@ namespace GameRes.Formats.Strings { } } + /// + /// Looks up a localized string similar to Choose title or enter a key. + /// + public static string MCGChoose { + get { + return ResourceManager.GetString("MCGChoose", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 8-bit encryption key. + /// + public static string MCGLabelKey { + get { + return ResourceManager.GetString("MCGLabelKey", resourceCulture); + } + } + /// /// Looks up a localized string similar to Adding file. /// @@ -476,15 +503,6 @@ namespace GameRes.Formats.Strings { } } - /// - /// Looks up a localized string similar to Ignore encryption. - /// - public static string NOAIgnoreEncryption { - get { - return ResourceManager.GetString("NOAIgnoreEncryption", resourceCulture); - } - } - /// /// Looks up a localized string similar to Compress contents. /// @@ -603,15 +621,6 @@ namespace GameRes.Formats.Strings { } } - /// - /// Looks up a localized string similar to Image is encrypted.. - /// - public static string RCTNotice { - get { - return ResourceManager.GetString("RCTNotice", 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 8fff4710..b97e3406 100644 --- a/ArcFormats/Strings/arcStrings.ko-KR.resx +++ b/ArcFormats/Strings/arcStrings.ko-KR.resx @@ -298,9 +298,6 @@ 아카이브 폴더가 암호화됨. 아카이브 암호값을 입력하세요. - - 암호 무시 - 암호체계 @@ -320,12 +317,6 @@ 아카이브가 암호화된 스크립트를 포함함. 암호체계를 고르거나 암호를 입력하세요. - - 암호 무시 - - - 이미지가 암호화됨. - 제목을 선택하거나 암호를 입력하세요 @@ -361,4 +352,17 @@ Alternatively, enter archive encryption key or choose one of the predefined encryption schemes. translation pending + + 암호 무시 + + + 이미지가 암호화됨. + + + Choose title or enter a key + translation pending + + + 8-bit 암호값 + \ No newline at end of file diff --git a/ArcFormats/Strings/arcStrings.resx b/ArcFormats/Strings/arcStrings.resx index a88cd655..0083bafd 100644 --- a/ArcFormats/Strings/arcStrings.resx +++ b/ArcFormats/Strings/arcStrings.resx @@ -298,9 +298,6 @@ Choose appropriate encryption scheme. Archive directory is encrypted. Enter archive encryption key. - - Ignore encryption - Encryption scheme @@ -320,12 +317,6 @@ Enter archive encryption key. Archive contains encrypted scripts. Choose encryption scheme or enter a passphrase. - - Ignore encryption - - - Image is encrypted. - Choose title or enter a password @@ -358,4 +349,16 @@ Choose appropriate encryption scheme. Key not found within {0}. + + Ignore encryption + + + Image is encrypted. + + + Choose title or enter a key + + + 8-bit encryption key + \ No newline at end of file diff --git a/ArcFormats/Strings/arcStrings.ru-RU.resx b/ArcFormats/Strings/arcStrings.ru-RU.resx index 84859ef2..9a4a36bc 100644 --- a/ArcFormats/Strings/arcStrings.ru-RU.resx +++ b/ArcFormats/Strings/arcStrings.ru-RU.resx @@ -139,6 +139,12 @@ 32-битное шестнадцатеричное число + + Игнорировать шифрование + + + Изображение зашифровано. + без шифрования @@ -178,9 +184,6 @@ Оглавление архива зашифровано. - - Игнорировать шифрование - Неизвестно @@ -197,6 +200,12 @@ Архив содержит зашифрованные скрипты. Выберите способ шифрования или введите текстовый пароль. + + Выберите наименование или введите ключ + + + 8-битный ключ шифрования + Добавляется файл @@ -239,9 +248,6 @@ Записывается оглавление... - - Игнорировать шифрование - Сжать содержимое @@ -270,9 +276,6 @@ Выберите наименование или введите пароль - - Изображение зашифровано. - 32-битный ключ