From 60f853835e15b49858f7468ff6d9aba579171ad9 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Tue, 2 Jun 2015 15:45:19 +0400
Subject: [PATCH] merged some common strings in resource dictionary.

---
 ArcFormats/ArcDPK.cs                      |  2 +-
 ArcFormats/CreateNPAWidget.xaml           |  2 +-
 ArcFormats/CreateXP3Widget.xaml           |  2 +-
 ArcFormats/Properties/AssemblyInfo.cs     |  4 +-
 ArcFormats/Strings/arcStrings.Designer.cs | 63 +++++++----------------
 ArcFormats/Strings/arcStrings.resx        | 23 +++------
 ArcFormats/Strings/arcStrings.ru-RU.resx  | 21 +++-----
 ArcFormats/WidgetDPK.xaml                 |  2 +-
 ArcFormats/WidgetINT.xaml                 |  4 +-
 9 files changed, 39 insertions(+), 84 deletions(-)

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 @@
     </Grid.RowDefinitions>
     <StackPanel Orientation="Horizontal">
         <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"/>
         </StackPanel>
         <Button Content="{x:Static s:arcStrings.ArcReset}" Width="70" Height="25" VerticalAlignment="Top" Margin="20,0,0,5" Click="Reset_Click"/>
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 @@
             </ComboBox>
         </StackPanel>
         <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"/>
         </StackPanel>
     </StackPanel>
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 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Default.
+        /// </summary>
+        public static string ArcDefault {
+            get {
+                return ResourceManager.GetString("ArcDefault", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Archive content is encrypted.
         ///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>
         ///   Looks up a localized string similar to Encryption keys.
         /// </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>
         ///   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 {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Encryption scheme.
+        /// </summary>
+        public static string LabelEncScheme {
+            get {
+                return ResourceManager.GetString("LabelEncScheme", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Passphrase.
         /// </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>
         ///   Looks up a localized string similar to Nitro+ Steins;Gate resource archive.
         /// </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>
         ///   Looks up a localized string similar to Version.
         /// </summary>
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.</value>
   <data name="INTLabelNumericKey" xml:space="preserve">
     <value>Numeric key</value>
   </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">
     <value>Archive directory is encrypted.
 Enter archive encryption key or choose
 predefined encryption scheme.</value>
   </data>
-  <data name="KCAPDefault" xml:space="preserve">
-    <value>Default</value>
-  </data>
   <data name="KogadoDescription" xml:space="preserve">
     <value>Kogado game engine resource archive</value>
   </data>
@@ -238,9 +229,6 @@ predefined encryption scheme.</value>
     <value>Encryption keys
 (required even if contents is not encrypted)</value>
   </data>
-  <data name="NPALabelScheme" xml:space="preserve">
-    <value>Encryption scheme</value>
-  </data>
   <data name="NPASteinsGateDescription" xml:space="preserve">
     <value>Nitro+ Steins;Gate resource archive</value>
   </data>
@@ -293,9 +281,6 @@ predefined encryption scheme.</value>
   <data name="XP3Description" xml:space="preserve">
     <value>KiriKiri game engine resource archive</value>
   </data>
-  <data name="XP3LabelScheme" xml:space="preserve">
-    <value>Encryption scheme</value>
-  </data>
   <data name="XP3LabelVersion" xml:space="preserve">
     <value>Version</value>
   </data>
@@ -318,10 +303,16 @@ Enter archive encryption key.</value>
   <data name="NOAIgnoreEncryption" xml:space="preserve">
     <value>Ignore encryption</value>
   </data>
-  <data name="ArcScheme" xml:space="preserve">
+  <data name="LabelEncScheme" xml:space="preserve">
     <value>Encryption scheme</value>
   </data>
   <data name="DPKKeys" xml:space="preserve">
     <value>Encryption keys</value>
   </data>
+  <data name="ArcDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
+  <data name="KCAPDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
 </root>
\ 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 @@
   <data name="AMINoFiles" xml:space="preserve">
     <value>Не найдено файлов, подходящих для архива AMI.</value>
   </data>
+  <data name="ArcDefault" xml:space="preserve">
+    <value>По умолчанию</value>
+  </data>
   <data name="ArcEncryptedNotice" xml:space="preserve">
     <value>Содержимое архива зашифровано.
 Выберите алгоритм шифрования.</value>
@@ -139,9 +142,6 @@
   <data name="ArcReset" xml:space="preserve">
     <value>Сбросить</value>
   </data>
-  <data name="ArcScheme" xml:space="preserve">
-    <value>Способ шифрования</value>
-  </data>
   <data name="DPKKeys" xml:space="preserve">
     <value>Ключи шифрования</value>
   </data>
@@ -154,12 +154,6 @@
   <data name="INTLabelNumericKey" xml:space="preserve">
     <value>Цифровой ключ</value>
   </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">
     <value>Заголовок архива зашифрован.
 Введите ключ шифрования или выберите
@@ -168,6 +162,9 @@
   <data name="KCAPDefault" xml:space="preserve">
     <value>Неизвестно</value>
   </data>
+  <data name="LabelEncScheme" xml:space="preserve">
+    <value>Способ шифрования</value>
+  </data>
   <data name="LabelPassphrase" xml:space="preserve">
     <value>Пароль</value>
   </data>
@@ -226,9 +223,6 @@
     <value>Ключи шифрования
 (требуются даже если содержимое не шифруется)</value>
   </data>
-  <data name="NPALabelScheme" xml:space="preserve">
-    <value>Способ шифрования</value>
-  </data>
   <data name="ONSArchiveType" xml:space="preserve">
     <value>Тип архива</value>
   </data>
@@ -260,9 +254,6 @@
   <data name="XP3CompressHeader" xml:space="preserve">
     <value>Сжать оглавление</value>
   </data>
-  <data name="XP3LabelScheme" xml:space="preserve">
-    <value>Способ шифрования</value>
-  </data>
   <data name="XP3LabelVersion" xml:space="preserve">
     <value>Версия</value>
   </data>
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 @@
         <RowDefinition/>
         <RowDefinition/>
     </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"/>
     <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}"
diff --git a/ArcFormats/WidgetINT.xaml b/ArcFormats/WidgetINT.xaml
index a4d87351..7554f257 100644
--- a/ArcFormats/WidgetINT.xaml
+++ b/ArcFormats/WidgetINT.xaml
@@ -46,11 +46,11 @@
             </ControlTemplate>
         </Validation.ErrorTemplate>
     </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"/>
     <TextBox Name="Passphrase" Grid.Column="1" Grid.Row="1" Margin="0,3,0,3"
              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"/>
     <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}"