diff --git a/ArcFormats/ArcDPK.cs b/ArcFormats/ArcDPK.cs
index 43f27ca7..15731310 100644
--- a/ArcFormats/ArcDPK.cs
+++ b/ArcFormats/ArcDPK.cs
@@ -77,7 +77,7 @@ namespace GameRes.Formats.Dac
public static readonly DpkScheme[] KnownSchemes = new DpkScheme[]
{
- new DpkScheme { Key1 = 0x0FF98, Name = "Default",
+ new DpkScheme { Key1 = 0x0FF98, Name = arcStrings.ArcDefault,
Key2 = 0x43E78A5C },
new DpkScheme { Key1 = 0x0C3BD, Name = "Inbou no Wakusei",
Key2 = 0x577D4861, OriginalTitle = "淫暴の惑星~破壊と欲望の衝動~" },
diff --git a/ArcFormats/CreateNPAWidget.xaml b/ArcFormats/CreateNPAWidget.xaml
index ee0ef456..10a27ae0 100644
--- a/ArcFormats/CreateNPAWidget.xaml
+++ b/ArcFormats/CreateNPAWidget.xaml
@@ -30,7 +30,7 @@
-
+
diff --git a/ArcFormats/CreateXP3Widget.xaml b/ArcFormats/CreateXP3Widget.xaml
index 93fae22d..a4c09fb0 100644
--- a/ArcFormats/CreateXP3Widget.xaml
+++ b/ArcFormats/CreateXP3Widget.xaml
@@ -20,7 +20,7 @@
-
+
diff --git a/ArcFormats/Properties/AssemblyInfo.cs b/ArcFormats/Properties/AssemblyInfo.cs
index 4040c23f..412d857f 100644
--- a/ArcFormats/Properties/AssemblyInfo.cs
+++ b/ArcFormats/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.0.5.58")]
-[assembly: AssemblyFileVersion ("1.0.5.58")]
+[assembly: AssemblyVersion ("1.0.5.59")]
+[assembly: AssemblyFileVersion ("1.0.5.59")]
diff --git a/ArcFormats/Strings/arcStrings.Designer.cs b/ArcFormats/Strings/arcStrings.Designer.cs
index e3f46f8a..8ebef624 100644
--- a/ArcFormats/Strings/arcStrings.Designer.cs
+++ b/ArcFormats/Strings/arcStrings.Designer.cs
@@ -105,6 +105,15 @@ namespace GameRes.Formats.Strings {
}
}
+ ///
+ /// Looks up a localized string similar to Default.
+ ///
+ public static string ArcDefault {
+ get {
+ return ResourceManager.GetString("ArcDefault", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Archive content is encrypted.
///Choose appropriate encryption scheme..
@@ -133,15 +142,6 @@ namespace GameRes.Formats.Strings {
}
}
- ///
- /// Looks up a localized string similar to Encryption scheme.
- ///
- public static string ArcScheme {
- get {
- return ResourceManager.GetString("ArcScheme", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Encryption keys.
///
@@ -205,24 +205,6 @@ namespace GameRes.Formats.Strings {
}
}
- ///
- /// Looks up a localized string similar to Passphrase.
- ///
- public static string INTLabelPassphrase {
- get {
- return ResourceManager.GetString("INTLabelPassphrase", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Scheme.
- ///
- public static string INTLabelScheme {
- get {
- return ResourceManager.GetString("INTLabelScheme", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Archive directory is encrypted.
///Enter archive encryption key or choose
@@ -252,6 +234,15 @@ namespace GameRes.Formats.Strings {
}
}
+ ///
+ /// Looks up a localized string similar to Encryption scheme.
+ ///
+ public static string LabelEncScheme {
+ get {
+ return ResourceManager.GetString("LabelEncScheme", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Passphrase.
///
@@ -442,15 +433,6 @@ namespace GameRes.Formats.Strings {
}
}
- ///
- /// Looks up a localized string similar to Encryption scheme.
- ///
- public static string NPALabelScheme {
- get {
- return ResourceManager.GetString("NPALabelScheme", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Nitro+ Steins;Gate resource archive.
///
@@ -605,15 +587,6 @@ namespace GameRes.Formats.Strings {
}
}
- ///
- /// Looks up a localized string similar to Encryption scheme.
- ///
- public static string XP3LabelScheme {
- get {
- return ResourceManager.GetString("XP3LabelScheme", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Version.
///
diff --git a/ArcFormats/Strings/arcStrings.resx b/ArcFormats/Strings/arcStrings.resx
index adcd859c..2327ad49 100644
--- a/ArcFormats/Strings/arcStrings.resx
+++ b/ArcFormats/Strings/arcStrings.resx
@@ -160,20 +160,11 @@ Choose appropriate encryption scheme.
Numeric key
-
- Passphrase
-
-
- Scheme
-
Archive directory is encrypted.
Enter archive encryption key or choose
predefined encryption scheme.
-
- Default
-
Kogado game engine resource archive
@@ -238,9 +229,6 @@ predefined encryption scheme.
Encryption keys
(required even if contents is not encrypted)
-
- Encryption scheme
-
Nitro+ Steins;Gate resource archive
@@ -293,9 +281,6 @@ predefined encryption scheme.
KiriKiri game engine resource archive
-
- Encryption scheme
-
Version
@@ -318,10 +303,16 @@ Enter archive encryption key.
Ignore encryption
-
+
Encryption scheme
Encryption keys
+
+ Default
+
+
+ Default
+
\ No newline at end of file
diff --git a/ArcFormats/Strings/arcStrings.ru-RU.resx b/ArcFormats/Strings/arcStrings.ru-RU.resx
index 631cc860..4c95c452 100644
--- a/ArcFormats/Strings/arcStrings.ru-RU.resx
+++ b/ArcFormats/Strings/arcStrings.ru-RU.resx
@@ -129,6 +129,9 @@
Не найдено файлов, подходящих для архива AMI.
+
+ По умолчанию
+
Содержимое архива зашифровано.
Выберите алгоритм шифрования.
@@ -139,9 +142,6 @@
Сбросить
-
- Способ шифрования
-
Ключи шифрования
@@ -154,12 +154,6 @@
Цифровой ключ
-
- Пароль
-
-
- Вариант
-
Заголовок архива зашифрован.
Введите ключ шифрования или выберите
@@ -168,6 +162,9 @@
Неизвестно
+
+ Способ шифрования
+
Пароль
@@ -226,9 +223,6 @@
Ключи шифрования
(требуются даже если содержимое не шифруется)
-
- Способ шифрования
-
Тип архива
@@ -260,9 +254,6 @@
Сжать оглавление
-
- Способ шифрования
-
Версия
diff --git a/ArcFormats/WidgetDPK.xaml b/ArcFormats/WidgetDPK.xaml
index 27efc131..234e0fa7 100644
--- a/ArcFormats/WidgetDPK.xaml
+++ b/ArcFormats/WidgetDPK.xaml
@@ -26,7 +26,7 @@
-
-
-