merged some common strings in resource dictionary.

This commit is contained in:
morkt 2015-06-02 15:45:19 +04:00
parent 26c738d6d0
commit 60f853835e
9 changed files with 39 additions and 84 deletions

View File

@ -77,7 +77,7 @@ namespace GameRes.Formats.Dac
public static readonly DpkScheme[] KnownSchemes = new DpkScheme[] public static readonly DpkScheme[] KnownSchemes = new DpkScheme[]
{ {
new DpkScheme { Key1 = 0x0FF98, Name = "Default", new DpkScheme { Key1 = 0x0FF98, Name = arcStrings.ArcDefault,
Key2 = 0x43E78A5C }, Key2 = 0x43E78A5C },
new DpkScheme { Key1 = 0x0C3BD, Name = "Inbou no Wakusei", new DpkScheme { Key1 = 0x0C3BD, Name = "Inbou no Wakusei",
Key2 = 0x577D4861, OriginalTitle = "淫暴の惑星~破壊と欲望の衝動~" }, Key2 = 0x577D4861, OriginalTitle = "淫暴の惑星~破壊と欲望の衝動~" },

View File

@ -30,7 +30,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="0,0,0,5" Grid.Row="0"> <StackPanel Orientation="Vertical" Margin="0,0,0,5" Grid.Row="0">
<Label Content="{x:Static s:arcStrings.NPALabelScheme}" Target="{Binding ElementName=EncryptionWidget}" Padding="4,0,0,5" HorizontalAlignment="Left"/> <Label Content="{x:Static s:arcStrings.LabelEncScheme}" Target="{Binding ElementName=EncryptionWidget}" Padding="4,0,0,5" HorizontalAlignment="Left"/>
<gui:WidgetNPA x:Name="EncryptionWidget" HorizontalAlignment="Left"/> <gui:WidgetNPA x:Name="EncryptionWidget" HorizontalAlignment="Left"/>
</StackPanel> </StackPanel>
<Button Content="{x:Static s:arcStrings.ArcReset}" Width="70" Height="25" VerticalAlignment="Top" Margin="20,0,0,5" Click="Reset_Click"/> <Button Content="{x:Static s:arcStrings.ArcReset}" Width="70" Height="25" VerticalAlignment="Top" Margin="20,0,0,5" Click="Reset_Click"/>

View File

@ -20,7 +20,7 @@
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Vertical" Margin="0,0,0,5"> <StackPanel Orientation="Vertical" Margin="0,0,0,5">
<Label Content="{x:Static s:arcStrings.XP3LabelScheme}" Target="{Binding ElementName=EncryptionWidget}" Padding="4,0,0,5"/> <Label Content="{x:Static s:arcStrings.LabelEncScheme}" Target="{Binding ElementName=EncryptionWidget}" Padding="4,0,0,5"/>
<local:WidgetXP3 x:Name="EncryptionWidget"/> <local:WidgetXP3 x:Name="EncryptionWidget"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.0.5.58")] [assembly: AssemblyVersion ("1.0.5.59")]
[assembly: AssemblyFileVersion ("1.0.5.58")] [assembly: AssemblyFileVersion ("1.0.5.59")]

View File

@ -105,6 +105,15 @@ namespace GameRes.Formats.Strings {
} }
} }
/// <summary>
/// Looks up a localized string similar to Default.
/// </summary>
public static string ArcDefault {
get {
return ResourceManager.GetString("ArcDefault", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Archive content is encrypted. /// Looks up a localized string similar to Archive content is encrypted.
///Choose appropriate encryption scheme.. ///Choose appropriate encryption scheme..
@ -133,15 +142,6 @@ namespace GameRes.Formats.Strings {
} }
} }
/// <summary>
/// Looks up a localized string similar to Encryption scheme.
/// </summary>
public static string ArcScheme {
get {
return ResourceManager.GetString("ArcScheme", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Encryption keys. /// Looks up a localized string similar to Encryption keys.
/// </summary> /// </summary>
@ -205,24 +205,6 @@ namespace GameRes.Formats.Strings {
} }
} }
/// <summary>
/// Looks up a localized string similar to Passphrase.
/// </summary>
public static string INTLabelPassphrase {
get {
return ResourceManager.GetString("INTLabelPassphrase", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Scheme.
/// </summary>
public static string INTLabelScheme {
get {
return ResourceManager.GetString("INTLabelScheme", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Archive directory is encrypted. /// Looks up a localized string similar to Archive directory is encrypted.
///Enter archive encryption key or choose ///Enter archive encryption key or choose
@ -252,6 +234,15 @@ namespace GameRes.Formats.Strings {
} }
} }
/// <summary>
/// Looks up a localized string similar to Encryption scheme.
/// </summary>
public static string LabelEncScheme {
get {
return ResourceManager.GetString("LabelEncScheme", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Passphrase. /// Looks up a localized string similar to Passphrase.
/// </summary> /// </summary>
@ -442,15 +433,6 @@ namespace GameRes.Formats.Strings {
} }
} }
/// <summary>
/// Looks up a localized string similar to Encryption scheme.
/// </summary>
public static string NPALabelScheme {
get {
return ResourceManager.GetString("NPALabelScheme", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Nitro+ Steins;Gate resource archive. /// Looks up a localized string similar to Nitro+ Steins;Gate resource archive.
/// </summary> /// </summary>
@ -605,15 +587,6 @@ namespace GameRes.Formats.Strings {
} }
} }
/// <summary>
/// Looks up a localized string similar to Encryption scheme.
/// </summary>
public static string XP3LabelScheme {
get {
return ResourceManager.GetString("XP3LabelScheme", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Version. /// Looks up a localized string similar to Version.
/// </summary> /// </summary>

View File

@ -160,20 +160,11 @@ Choose appropriate encryption scheme.</value>
<data name="INTLabelNumericKey" xml:space="preserve"> <data name="INTLabelNumericKey" xml:space="preserve">
<value>Numeric key</value> <value>Numeric key</value>
</data> </data>
<data name="INTLabelPassphrase" xml:space="preserve">
<value>Passphrase</value>
</data>
<data name="INTLabelScheme" xml:space="preserve">
<value>Scheme</value>
</data>
<data name="INTNotice" xml:space="preserve"> <data name="INTNotice" xml:space="preserve">
<value>Archive directory is encrypted. <value>Archive directory is encrypted.
Enter archive encryption key or choose Enter archive encryption key or choose
predefined encryption scheme.</value> predefined encryption scheme.</value>
</data> </data>
<data name="KCAPDefault" xml:space="preserve">
<value>Default</value>
</data>
<data name="KogadoDescription" xml:space="preserve"> <data name="KogadoDescription" xml:space="preserve">
<value>Kogado game engine resource archive</value> <value>Kogado game engine resource archive</value>
</data> </data>
@ -238,9 +229,6 @@ predefined encryption scheme.</value>
<value>Encryption keys <value>Encryption keys
(required even if contents is not encrypted)</value> (required even if contents is not encrypted)</value>
</data> </data>
<data name="NPALabelScheme" xml:space="preserve">
<value>Encryption scheme</value>
</data>
<data name="NPASteinsGateDescription" xml:space="preserve"> <data name="NPASteinsGateDescription" xml:space="preserve">
<value>Nitro+ Steins;Gate resource archive</value> <value>Nitro+ Steins;Gate resource archive</value>
</data> </data>
@ -293,9 +281,6 @@ predefined encryption scheme.</value>
<data name="XP3Description" xml:space="preserve"> <data name="XP3Description" xml:space="preserve">
<value>KiriKiri game engine resource archive</value> <value>KiriKiri game engine resource archive</value>
</data> </data>
<data name="XP3LabelScheme" xml:space="preserve">
<value>Encryption scheme</value>
</data>
<data name="XP3LabelVersion" xml:space="preserve"> <data name="XP3LabelVersion" xml:space="preserve">
<value>Version</value> <value>Version</value>
</data> </data>
@ -318,10 +303,16 @@ Enter archive encryption key.</value>
<data name="NOAIgnoreEncryption" xml:space="preserve"> <data name="NOAIgnoreEncryption" xml:space="preserve">
<value>Ignore encryption</value> <value>Ignore encryption</value>
</data> </data>
<data name="ArcScheme" xml:space="preserve"> <data name="LabelEncScheme" xml:space="preserve">
<value>Encryption scheme</value> <value>Encryption scheme</value>
</data> </data>
<data name="DPKKeys" xml:space="preserve"> <data name="DPKKeys" xml:space="preserve">
<value>Encryption keys</value> <value>Encryption keys</value>
</data> </data>
<data name="ArcDefault" xml:space="preserve">
<value>Default</value>
</data>
<data name="KCAPDefault" xml:space="preserve">
<value>Default</value>
</data>
</root> </root>

View File

@ -129,6 +129,9 @@
<data name="AMINoFiles" xml:space="preserve"> <data name="AMINoFiles" xml:space="preserve">
<value>Не найдено файлов, подходящих для архива AMI.</value> <value>Не найдено файлов, подходящих для архива AMI.</value>
</data> </data>
<data name="ArcDefault" xml:space="preserve">
<value>По умолчанию</value>
</data>
<data name="ArcEncryptedNotice" xml:space="preserve"> <data name="ArcEncryptedNotice" xml:space="preserve">
<value>Содержимое архива зашифровано. <value>Содержимое архива зашифровано.
Выберите алгоритм шифрования.</value> Выберите алгоритм шифрования.</value>
@ -139,9 +142,6 @@
<data name="ArcReset" xml:space="preserve"> <data name="ArcReset" xml:space="preserve">
<value>Сбросить</value> <value>Сбросить</value>
</data> </data>
<data name="ArcScheme" xml:space="preserve">
<value>Способ шифрования</value>
</data>
<data name="DPKKeys" xml:space="preserve"> <data name="DPKKeys" xml:space="preserve">
<value>Ключи шифрования</value> <value>Ключи шифрования</value>
</data> </data>
@ -154,12 +154,6 @@
<data name="INTLabelNumericKey" xml:space="preserve"> <data name="INTLabelNumericKey" xml:space="preserve">
<value>Цифровой ключ</value> <value>Цифровой ключ</value>
</data> </data>
<data name="INTLabelPassphrase" xml:space="preserve">
<value>Пароль</value>
</data>
<data name="INTLabelScheme" xml:space="preserve">
<value>Вариант</value>
</data>
<data name="INTNotice" xml:space="preserve"> <data name="INTNotice" xml:space="preserve">
<value>Заголовок архива зашифрован. <value>Заголовок архива зашифрован.
Введите ключ шифрования или выберите Введите ключ шифрования или выберите
@ -168,6 +162,9 @@
<data name="KCAPDefault" xml:space="preserve"> <data name="KCAPDefault" xml:space="preserve">
<value>Неизвестно</value> <value>Неизвестно</value>
</data> </data>
<data name="LabelEncScheme" xml:space="preserve">
<value>Способ шифрования</value>
</data>
<data name="LabelPassphrase" xml:space="preserve"> <data name="LabelPassphrase" xml:space="preserve">
<value>Пароль</value> <value>Пароль</value>
</data> </data>
@ -226,9 +223,6 @@
<value>Ключи шифрования <value>Ключи шифрования
(требуются даже если содержимое не шифруется)</value> (требуются даже если содержимое не шифруется)</value>
</data> </data>
<data name="NPALabelScheme" xml:space="preserve">
<value>Способ шифрования</value>
</data>
<data name="ONSArchiveType" xml:space="preserve"> <data name="ONSArchiveType" xml:space="preserve">
<value>Тип архива</value> <value>Тип архива</value>
</data> </data>
@ -260,9 +254,6 @@
<data name="XP3CompressHeader" xml:space="preserve"> <data name="XP3CompressHeader" xml:space="preserve">
<value>Сжать оглавление</value> <value>Сжать оглавление</value>
</data> </data>
<data name="XP3LabelScheme" xml:space="preserve">
<value>Способ шифрования</value>
</data>
<data name="XP3LabelVersion" xml:space="preserve"> <data name="XP3LabelVersion" xml:space="preserve">
<value>Версия</value> <value>Версия</value>
</data> </data>

View File

@ -26,7 +26,7 @@
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label Content="{x:Static s:arcStrings.ArcScheme}" Target="{Binding ElementName=EncScheme}" <Label Content="{x:Static s:arcStrings.LabelEncScheme}" Target="{Binding ElementName=EncScheme}"
Grid.Column="0" Grid.Row="0" HorizontalAlignment="Right"/> Grid.Column="0" Grid.Row="0" HorizontalAlignment="Right"/>
<ComboBox Name="EncScheme" Grid.Column="1" Grid.Row="0" Margin="0,3,0,0" Width="200" <ComboBox Name="EncScheme" Grid.Column="1" Grid.Row="0" Margin="0,3,0,0" Width="200"
ItemsSource="{Binding Source={x:Static dac:DpkOpener.KnownSchemes}, Mode=OneWay}" ItemsSource="{Binding Source={x:Static dac:DpkOpener.KnownSchemes}, Mode=OneWay}"

View File

@ -46,11 +46,11 @@
</ControlTemplate> </ControlTemplate>
</Validation.ErrorTemplate> </Validation.ErrorTemplate>
</TextBox> </TextBox>
<Label Content="{x:Static s:arcStrings.INTLabelPassphrase}" Target="{Binding ElementName=Passphrase}" <Label Content="{x:Static s:arcStrings.LabelPassphrase}" Target="{Binding ElementName=Passphrase}"
Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right"/> Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right"/>
<TextBox Name="Passphrase" Grid.Column="1" Grid.Row="1" Margin="0,3,0,3" <TextBox Name="Passphrase" Grid.Column="1" Grid.Row="1" Margin="0,3,0,3"
Text="{Binding Path=Password}"/> Text="{Binding Path=Password}"/>
<Label Content="{x:Static s:arcStrings.INTLabelScheme}" Target="{Binding ElementName=EncScheme}" <Label Content="{x:Static s:arcStrings.LabelScheme}" Target="{Binding ElementName=EncScheme}"
Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right"/> Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right"/>
<ComboBox Name="EncScheme" Grid.Column="1" Grid.Row="2" Margin="0,3,0,0" <ComboBox Name="EncScheme" Grid.Column="1" Grid.Row="2" Margin="0,3,0,0"
ItemsSource="{Binding Source={x:Static fmt:IntOpener.KnownSchemes}, Path=Keys, Mode=OneWay}" ItemsSource="{Binding Source={x:Static fmt:IntOpener.KnownSchemes}, Path=Keys, Mode=OneWay}"