From d0307c616138ee4cf8e42e4cfd37e7b106353a0c Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 13 Jan 2017 23:47:12 +0100 Subject: [PATCH] Bring translations to ASF-GUI --- GUI/BotStatusForm.Designer.cs | 2 +- GUI/BotStatusForm.cs | 3 +- GUI/Events.cs | 3 - GUI/GUI.csproj | 109 ++++++++++++++++++++++++++- GUI/Logging.cs | 2 - GUI/MainForm.Designer.cs | 2 +- GUI/MainForm.cs | 3 +- GUI/Program.cs | 3 - GUI/Properties/Resources.Designer.cs | 4 +- GUI/Properties/Settings.Designer.cs | 30 ++++---- 10 files changed, 129 insertions(+), 32 deletions(-) diff --git a/GUI/BotStatusForm.Designer.cs b/GUI/BotStatusForm.Designer.cs index 707d05a69..014ebd439 100644 --- a/GUI/BotStatusForm.Designer.cs +++ b/GUI/BotStatusForm.Designer.cs @@ -1,4 +1,4 @@ -namespace GUI { +namespace ArchiSteamFarm { sealed partial class BotStatusForm { /// /// Required designer variable. diff --git a/GUI/BotStatusForm.cs b/GUI/BotStatusForm.cs index 3da807d4b..1266f2770 100644 --- a/GUI/BotStatusForm.cs +++ b/GUI/BotStatusForm.cs @@ -2,10 +2,9 @@ using System.Collections.Concurrent; using System.ComponentModel; using System.Windows.Forms; -using ArchiSteamFarm; using SteamKit2; -namespace GUI { +namespace ArchiSteamFarm { internal sealed partial class BotStatusForm : Form { internal static readonly ConcurrentDictionary BotForms = new ConcurrentDictionary(); diff --git a/GUI/Events.cs b/GUI/Events.cs index 9038e8271..c37654086 100644 --- a/GUI/Events.cs +++ b/GUI/Events.cs @@ -22,11 +22,8 @@ */ -using GUI; using SteamKit2; -// ReSharper disable once CheckNamespace - namespace ArchiSteamFarm { internal static class Events { internal static void OnBotShutdown() { } diff --git a/GUI/GUI.csproj b/GUI/GUI.csproj index 8915e08be..e0ace967c 100644 --- a/GUI/GUI.csproj +++ b/GUI/GUI.csproj @@ -7,7 +7,7 @@ {13949B41-787C-4558-90AE-A9F9E7F86B1F} WinExe Properties - GUI + ArchiSteamFarm GUI v4.6.1 512 @@ -141,6 +141,9 @@ Localization\Strings.Designer.cs + True + True + Strings.resx MobileAuthenticator.cs @@ -182,11 +185,115 @@ + + Localization\Strings.af-ZA.resx + + + Localization\Strings.ar-SA.resx + + + Localization\Strings.bg-BG.resx + + + Localization\Strings.ca-ES.resx + + + Localization\Strings.cs-CZ.resx + + + Localization\Strings.da-DK.resx + + + Localization\Strings.de-DE.resx + + + Localization\Strings.el-GR.resx + + + Localization\Strings.es-ES.resx + + + Localization\Strings.fi-FI.resx + + + Localization\Strings.fr-FR.resx + + + Localization\Strings.he-IL.resx + + + Localization\Strings.hi-IN.resx + + + Localization\Strings.hu-HU.resx + + + Localization\Strings.id-ID.resx + + + Localization\Strings.it-IT.resx + + + Localization\Strings.ja-JP.resx + + + Localization\Strings.ko-KR.resx + + + Localization\Strings.lt-LT.resx + + + Localization\Strings.mk-MK.resx + + + Localization\Strings.nl-NL.resx + + + Localization\Strings.no-NO.resx + Localization\Strings.pl-PL.resx + + Localization\Strings.pt-BR.resx + + + Localization\Strings.pt-PT.resx + Localization\Strings.resx + ResXFileCodeGenerator + Strings.Designer.cs + + + Localization\Strings.ro-RO.resx + + + Localization\Strings.ru-RU.resx + + + Localization\Strings.sr-CS.resx + + + Localization\Strings.sr-SP.resx + + + Localization\Strings.sv-SE.resx + + + Localization\Strings.tr-TR.resx + + + Localization\Strings.uk-UA.resx + + + Localization\Strings.vi-VN.resx + + + Localization\Strings.zh-CN.resx + + + Localization\Strings.zh-TW.resx BotStatusForm.cs diff --git a/GUI/Logging.cs b/GUI/Logging.cs index ea70438f3..46eabd8be 100644 --- a/GUI/Logging.cs +++ b/GUI/Logging.cs @@ -28,8 +28,6 @@ using NLog.Config; using NLog.Targets; using NLog.Windows.Forms; -// ReSharper disable once CheckNamespace - namespace ArchiSteamFarm { internal static class Logging { private const string GeneralLayout = @"${date:format=yyyy-MM-dd HH\:mm\:ss} | ${level:uppercase=true} | ${logger} | ${message}${onexception:inner= | ${exception:format=toString,Data}}"; diff --git a/GUI/MainForm.Designer.cs b/GUI/MainForm.Designer.cs index 90f9d5bda..1e2b1d1b2 100644 --- a/GUI/MainForm.Designer.cs +++ b/GUI/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace GUI { +namespace ArchiSteamFarm { internal sealed partial class MainForm { /// /// Required designer variable. diff --git a/GUI/MainForm.cs b/GUI/MainForm.cs index 107e7872c..0a063eb7b 100644 --- a/GUI/MainForm.cs +++ b/GUI/MainForm.cs @@ -7,9 +7,8 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; -using ArchiSteamFarm; -namespace GUI { +namespace ArchiSteamFarm { internal sealed partial class MainForm : Form { private static readonly ConcurrentDictionary BotIndexes = new ConcurrentDictionary(); diff --git a/GUI/Program.cs b/GUI/Program.cs index 75d920a32..14f9b2803 100644 --- a/GUI/Program.cs +++ b/GUI/Program.cs @@ -6,11 +6,8 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -using GUI; using SteamKit2; -// ReSharper disable once CheckNamespace - namespace ArchiSteamFarm { internal static class Program { internal static readonly ArchiLogger ArchiLogger = new ArchiLogger(SharedInfo.ASF); diff --git a/GUI/Properties/Resources.Designer.cs b/GUI/Properties/Resources.Designer.cs index 3c609bb35..fcc4da2b5 100644 --- a/GUI/Properties/Resources.Designer.cs +++ b/GUI/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace GUI.Properties { +namespace ArchiSteamFarm.Properties { using System; @@ -39,7 +39,7 @@ namespace GUI.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GUI.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ArchiSteamFarm.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/GUI/Properties/Settings.Designer.cs b/GUI/Properties/Settings.Designer.cs index e9d336887..b6d1ee24c 100644 --- a/GUI/Properties/Settings.Designer.cs +++ b/GUI/Properties/Settings.Designer.cs @@ -8,19 +8,19 @@ // //------------------------------------------------------------------------------ -namespace GUI.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings) (global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } +namespace ArchiSteamFarm.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } }