From d4165aa0507561af4930a037d21df0faa849bcbb Mon Sep 17 00:00:00 2001 From: mark-sil <83427558+mark-sil@users.noreply.github.com> Date: Tue, 7 Oct 2025 09:10:59 -0400 Subject: [PATCH] Update libPalaso dependencies from version 15 to 17 --- CHANGELOG.md | 5 +++++ src/Chorus/Chorus.csproj | 2 +- src/Chorus/ChorusSystem.cs | 3 ++- .../UI/Clone/DuplicateProjectWarningDialog.Designer.cs | 4 ++-- .../UI/Clone/GetCloneFromChorusHubDialog.Designer.cs | 6 +++--- .../UI/Clone/GetCloneFromInternetDialog.Designer.cs | 4 ++-- src/Chorus/UI/Clone/GetCloneFromUsbDialog.Designer.cs | 6 +++--- src/Chorus/UI/Clone/GetSharedProjectDlg.Designer.cs | 6 +++--- src/Chorus/UI/Clone/TargetFolderControl.Designer.cs | 6 +++--- src/Chorus/UI/Misc/ServerSettingsControl.Designer.cs | 4 ++-- src/Chorus/UI/Misc/ServerSettingsDialog.Designer.cs | 6 +++--- src/Chorus/UI/Misc/TroubleshootingView.Designer.cs | 6 +++--- src/Chorus/UI/Notes/AnnotationEditorView.Designer.cs | 4 ++-- src/Chorus/UI/Notes/AnnotationInspector.Designer.cs | 6 +++--- src/Chorus/UI/Notes/Bar/NoteDetailDialog.Designer.cs | 6 +++--- src/Chorus/UI/Notes/Browser/NotesBrowserPage.Designer.cs | 6 +++--- .../UI/Notes/Browser/NotesInProjectView.Designer.cs | 6 +++--- src/Chorus/UI/Notes/ConflictDetailsForm.Designer.cs | 6 +++--- .../UI/Review/ChangedReport/ChangeReportView.Designer.cs | 6 +++--- .../ChangesInRevision/ChangesInRevisionView.Designer.cs | 6 +++--- .../RevisionsInRepositoryView.Designer.cs | 6 +++--- src/Chorus/UI/Settings/SendReceiveSettings.Designer.cs | 4 ++-- src/Chorus/UI/Sync/SyncControl.Designer.cs | 6 +++--- src/Chorus/UI/Sync/SyncDialog.Designer.cs | 6 +++--- src/Chorus/UI/Sync/SyncPanel.Designer.cs | 4 ++-- src/Chorus/UI/Sync/SyncStartControl.Designer.cs | 6 +++--- src/ChorusHubApp/ChorusHubApp.csproj | 2 +- src/ChorusMerge.Tests/ChorusMerge.Tests.csproj | 4 ++-- .../LibChorus.TestUtilities.csproj | 4 ++-- src/LibChorus/LibChorus.csproj | 9 +++++---- src/LibChorusTests/LibChorus.Tests.csproj | 8 ++++---- 31 files changed, 85 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc99598ff..e77d5a500 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [SIL.Chorus.LibChorus] Add webm as additional audio file type - [SIL.Chorus] Add ability to clone project without direct user interaction +- Add L10NSharp.Windows.Forms dependency for version 9.0.0-* ### Changed @@ -27,6 +28,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [SIL.Chorus.LibChorus] Add ChorusStorage (the bundle cache) as an Excluded folder - [SIL.Chorus.LibChorus] Changed HgResumeTransport LastKnownCommonBases to use Json serialization instead of BinaryFormatter - Update SIL.Chorus.Mercurial dependency to version 6.5.1 which uses Python 3 +- Update libPalaso dependency from version 15.0.0-* to 17.0.0-* +- Update Newtonsoft.Json dependency from version 13.0.2 to 13.0.3 +- Update icu.net dependency from version 3.0.0-* to 3.0.1 +- Update L10NSharp dependency from version 8.0.0-beta0005 to 9.0.0-* ### Fixed diff --git a/src/Chorus/Chorus.csproj b/src/Chorus/Chorus.csproj index 9109fbf87..9fe1a007c 100644 --- a/src/Chorus/Chorus.csproj +++ b/src/Chorus/Chorus.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Chorus/ChorusSystem.cs b/src/Chorus/ChorusSystem.cs index 9df704e3b..47823f180 100644 --- a/src/Chorus/ChorusSystem.cs +++ b/src/Chorus/ChorusSystem.cs @@ -15,6 +15,7 @@ using Chorus.UI.Sync; using Chorus.VcsDrivers.Mercurial; using L10NSharp; +using L10NSharp.Windows.Forms; using SIL.Code; using SIL.Extensions; using SIL.Progress; @@ -123,7 +124,7 @@ public static void SetUpLocalization(string desiredUiLangId, var versionObj = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; // We don't need to reload strings for every "revision" (that might be every time we build). var version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build; - LocalizationManager.Create(desiredUiLangId, "Chorus", + LocalizationManagerWinforms.Create(desiredUiLangId, "Chorus", Application.ProductName, version, directoryOfInstalledXlfFiles, directoryOfUserModifiedXlfFiles, Icon.FromHandle(Properties.Resources.chorus32x32.GetHicon()), // should call DestroyIcon, but when? diff --git a/src/Chorus/UI/Clone/DuplicateProjectWarningDialog.Designer.cs b/src/Chorus/UI/Clone/DuplicateProjectWarningDialog.Designer.cs index 3c4c6b75b..88d077218 100644 --- a/src/Chorus/UI/Clone/DuplicateProjectWarningDialog.Designer.cs +++ b/src/Chorus/UI/Clone/DuplicateProjectWarningDialog.Designer.cs @@ -32,7 +32,7 @@ private void InitializeComponent() this._mainLabel = new System.Windows.Forms.Label(); this.buttonOK = new System.Windows.Forms.Button(); this.buttonHelp = new System.Windows.Forms.Button(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -103,6 +103,6 @@ private void InitializeComponent() private System.Windows.Forms.Label _mainLabel; private System.Windows.Forms.Button buttonOK; private System.Windows.Forms.Button buttonHelp; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Clone/GetCloneFromChorusHubDialog.Designer.cs b/src/Chorus/UI/Clone/GetCloneFromChorusHubDialog.Designer.cs index a6e63ac73..102a1cdc7 100644 --- a/src/Chorus/UI/Clone/GetCloneFromChorusHubDialog.Designer.cs +++ b/src/Chorus/UI/Clone/GetCloneFromChorusHubDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Clone +namespace Chorus.UI.Clone { partial class GetCloneFromChorusHubDialog { @@ -39,7 +39,7 @@ private void InitializeComponent() this.progressBar = new System.Windows.Forms.ProgressBar(); this._getChorusHubInfoBackgroundWorker = new System.ComponentModel.BackgroundWorker(); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this.panel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); @@ -171,6 +171,6 @@ private void InitializeComponent() private System.Windows.Forms.ProgressBar progressBar; private System.ComponentModel.BackgroundWorker _getChorusHubInfoBackgroundWorker; private Vulcan.Uczniowie.HelpProvider.HelpComponent _helpProvider; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Clone/GetCloneFromInternetDialog.Designer.cs b/src/Chorus/UI/Clone/GetCloneFromInternetDialog.Designer.cs index 8d577d3ba..1ad7c2c25 100644 --- a/src/Chorus/UI/Clone/GetCloneFromInternetDialog.Designer.cs +++ b/src/Chorus/UI/Clone/GetCloneFromInternetDialog.Designer.cs @@ -44,7 +44,7 @@ private void InitializeComponent() this._logBox = new SIL.Windows.Forms.Progress.LogBox(); this._statusProgress = new SIL.Windows.Forms.Progress.SimpleStatusProgress(); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this._helpButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); @@ -284,7 +284,7 @@ private void InitializeComponent() private System.Windows.Forms.Button _fixSettingsButton; private SimpleStatusProgress _statusProgress; private Vulcan.Uczniowie.HelpProvider.HelpComponent _helpProvider; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; private System.Windows.Forms.Button _helpButton; } } \ No newline at end of file diff --git a/src/Chorus/UI/Clone/GetCloneFromUsbDialog.Designer.cs b/src/Chorus/UI/Clone/GetCloneFromUsbDialog.Designer.cs index fa9b5d8d6..542535d71 100644 --- a/src/Chorus/UI/Clone/GetCloneFromUsbDialog.Designer.cs +++ b/src/Chorus/UI/Clone/GetCloneFromUsbDialog.Designer.cs @@ -1,4 +1,4 @@ -using System; +using System; using SIL.Progress; using SIL.Windows.Forms.Progress; @@ -48,7 +48,7 @@ private void InitializeComponent() this._statusLabel = new System.Windows.Forms.TextBox(); this._logBox = new SIL.Windows.Forms.Progress.LogBox(); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -260,7 +260,7 @@ private void InitializeComponent() private System.Windows.Forms.TextBox _statusLabel; private LogBox _logBox; private Vulcan.Uczniowie.HelpProvider.HelpComponent _helpProvider; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Clone/GetSharedProjectDlg.Designer.cs b/src/Chorus/UI/Clone/GetSharedProjectDlg.Designer.cs index 3e5a619f9..54c0260b5 100644 --- a/src/Chorus/UI/Clone/GetSharedProjectDlg.Designer.cs +++ b/src/Chorus/UI/Clone/GetSharedProjectDlg.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Clone +namespace Chorus.UI.Clone { partial class GetSharedProjectDlg { @@ -33,7 +33,7 @@ private void InitializeComponent() this._useUSBButton = new System.Windows.Forms.Button(); this._useInternetButton = new System.Windows.Forms.Button(); this._useChorusHubButton = new System.Windows.Forms.Button(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -122,6 +122,6 @@ private void InitializeComponent() private System.Windows.Forms.Button _useUSBButton; private System.Windows.Forms.Button _useInternetButton; private System.Windows.Forms.Button _useChorusHubButton; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Clone/TargetFolderControl.Designer.cs b/src/Chorus/UI/Clone/TargetFolderControl.Designer.cs index c15e50179..941a3db97 100644 --- a/src/Chorus/UI/Clone/TargetFolderControl.Designer.cs +++ b/src/Chorus/UI/Clone/TargetFolderControl.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Clone +namespace Chorus.UI.Clone { partial class TargetFolderControl { @@ -35,7 +35,7 @@ private void InitializeComponent() this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this._downloadButton = new System.Windows.Forms.Button(); this._targetInfoLabel = new Chorus.UI.BetterLabel(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this._targetWarningImage)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); @@ -146,6 +146,6 @@ private void InitializeComponent() private System.Windows.Forms.Label _localFolderLabel; private System.Windows.Forms.ToolTip toolTip1; public System.Windows.Forms.Button _downloadButton; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } diff --git a/src/Chorus/UI/Misc/ServerSettingsControl.Designer.cs b/src/Chorus/UI/Misc/ServerSettingsControl.Designer.cs index e34b900d2..4cc860500 100644 --- a/src/Chorus/UI/Misc/ServerSettingsControl.Designer.cs +++ b/src/Chorus/UI/Misc/ServerSettingsControl.Designer.cs @@ -51,7 +51,7 @@ private void InitializeComponent() this._tlpPassword = new System.Windows.Forms.TableLayoutPanel(); this._checkRememberPassword = new System.Windows.Forms.CheckBox(); this._tlpUsername = new System.Windows.Forms.TableLayoutPanel(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this.tableLayoutPanel1.SuspendLayout(); this._tlpCustomUrl.SuspendLayout(); this._tlpLogIn.SuspendLayout(); @@ -388,7 +388,7 @@ private void InitializeComponent() private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Label _bandwidthLabel; private System.Windows.Forms.TextBox _customUrl; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; private System.Windows.Forms.TableLayoutPanel _tlpCustomUrl; private System.Windows.Forms.CheckBox _checkCustomUrl; private System.Windows.Forms.Button _buttonLogIn; diff --git a/src/Chorus/UI/Misc/ServerSettingsDialog.Designer.cs b/src/Chorus/UI/Misc/ServerSettingsDialog.Designer.cs index 886b35eb3..0b32f6e10 100644 --- a/src/Chorus/UI/Misc/ServerSettingsDialog.Designer.cs +++ b/src/Chorus/UI/Misc/ServerSettingsDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Misc +namespace Chorus.UI.Misc { partial class ServerSettingsDialog { @@ -32,7 +32,7 @@ private void InitializeComponent() this._cancelButton = new System.Windows.Forms.Button(); this._okButton = new System.Windows.Forms.Button(); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -97,6 +97,6 @@ private void InitializeComponent() private System.Windows.Forms.Button _cancelButton; private System.Windows.Forms.Button _okButton; private Vulcan.Uczniowie.HelpProvider.HelpComponent _helpProvider; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Misc/TroubleshootingView.Designer.cs b/src/Chorus/UI/Misc/TroubleshootingView.Designer.cs index bbbfb1887..d65c1ff1e 100644 --- a/src/Chorus/UI/Misc/TroubleshootingView.Designer.cs +++ b/src/Chorus/UI/Misc/TroubleshootingView.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Misc +namespace Chorus.UI.Misc { partial class TroubleshootingView { @@ -33,7 +33,7 @@ private void InitializeComponent() this._copyLink = new System.Windows.Forms.LinkLabel(); this._outputBox = new System.Windows.Forms.RichTextBox(); this._statusLabel = new System.Windows.Forms.Label(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -122,6 +122,6 @@ private void InitializeComponent() private System.Windows.Forms.LinkLabel _copyLink; private System.Windows.Forms.RichTextBox _outputBox; private System.Windows.Forms.Label _statusLabel; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } diff --git a/src/Chorus/UI/Notes/AnnotationEditorView.Designer.cs b/src/Chorus/UI/Notes/AnnotationEditorView.Designer.cs index ed4b06c8f..b0e61e8c6 100644 --- a/src/Chorus/UI/Notes/AnnotationEditorView.Designer.cs +++ b/src/Chorus/UI/Notes/AnnotationEditorView.Designer.cs @@ -46,7 +46,7 @@ private void InitializeComponent() this._existingMessagesDisplay = new XWebBrowser(); this._annotationLabel = new System.Windows.Forms.LinkLabel(); this._addNewMessageLabel = new Chorus.UI.BetterLabel(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this._annotationLogo)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); @@ -219,6 +219,6 @@ private void InitializeComponent() private System.Windows.Forms.TextBox _newMessage; private SIL.Windows.Forms.HtmlBrowser.XWebBrowser _existingMessagesDisplay; private System.Windows.Forms.LinkLabel _annotationLabel; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } diff --git a/src/Chorus/UI/Notes/AnnotationInspector.Designer.cs b/src/Chorus/UI/Notes/AnnotationInspector.Designer.cs index 2c3aea025..a36b6d800 100644 --- a/src/Chorus/UI/Notes/AnnotationInspector.Designer.cs +++ b/src/Chorus/UI/Notes/AnnotationInspector.Designer.cs @@ -1,4 +1,4 @@ -using SIL.Windows.Forms.HtmlBrowser; +using SIL.Windows.Forms.HtmlBrowser; namespace Chorus.UI.Notes { @@ -38,7 +38,7 @@ private void InitializeComponent() this.webBrowser1 = new XWebBrowser(); this._pathLabel = new System.Windows.Forms.Label(); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -99,6 +99,6 @@ private void InitializeComponent() private XWebBrowser webBrowser1; private System.Windows.Forms.Label _pathLabel; private Vulcan.Uczniowie.HelpProvider.HelpComponent _helpProvider; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } diff --git a/src/Chorus/UI/Notes/Bar/NoteDetailDialog.Designer.cs b/src/Chorus/UI/Notes/Bar/NoteDetailDialog.Designer.cs index 1468c68b5..8b8bd66a6 100644 --- a/src/Chorus/UI/Notes/Bar/NoteDetailDialog.Designer.cs +++ b/src/Chorus/UI/Notes/Bar/NoteDetailDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Notes.Bar +namespace Chorus.UI.Notes.Bar { partial class NoteDetailDialog { @@ -31,7 +31,7 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NoteDetailDialog)); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -61,7 +61,7 @@ private void InitializeComponent() #endregion private Vulcan.Uczniowie.HelpProvider.HelpComponent _helpProvider; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Notes/Browser/NotesBrowserPage.Designer.cs b/src/Chorus/UI/Notes/Browser/NotesBrowserPage.Designer.cs index 655e36643..c070a3d3e 100644 --- a/src/Chorus/UI/Notes/Browser/NotesBrowserPage.Designer.cs +++ b/src/Chorus/UI/Notes/Browser/NotesBrowserPage.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Notes.Browser +namespace Chorus.UI.Notes.Browser { partial class NotesBrowserPage { @@ -31,7 +31,7 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.label3 = new System.Windows.Forms.Label(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); @@ -95,6 +95,6 @@ private void InitializeComponent() private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label label3; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Notes/Browser/NotesInProjectView.Designer.cs b/src/Chorus/UI/Notes/Browser/NotesInProjectView.Designer.cs index 549be5e36..5090fb680 100644 --- a/src/Chorus/UI/Notes/Browser/NotesInProjectView.Designer.cs +++ b/src/Chorus/UI/Notes/Browser/NotesInProjectView.Designer.cs @@ -1,4 +1,4 @@ -using Chorus.UI.Review.RevisionsInRepository; +using Chorus.UI.Review.RevisionsInRepository; using L10NSharp; namespace Chorus.UI.Notes.Browser @@ -33,7 +33,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NotesInProjectView)); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this._messageListView = new System.Windows.Forms.ListView(); this.label = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -285,6 +285,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem showMergeNotifcationsMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.Label filterStateLabel; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Notes/ConflictDetailsForm.Designer.cs b/src/Chorus/UI/Notes/ConflictDetailsForm.Designer.cs index 016740399..5b1def69c 100644 --- a/src/Chorus/UI/Notes/ConflictDetailsForm.Designer.cs +++ b/src/Chorus/UI/Notes/ConflictDetailsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.notes +namespace Chorus.notes { partial class ConflictDetailsForm { @@ -42,7 +42,7 @@ private void InitializeComponent() this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this.technicalDetailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); @@ -163,7 +163,7 @@ private void InitializeComponent() private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; private System.Windows.Forms.ToolStripMenuItem technicalDetailsToolStripMenuItem; } } diff --git a/src/Chorus/UI/Review/ChangedReport/ChangeReportView.Designer.cs b/src/Chorus/UI/Review/ChangedReport/ChangeReportView.Designer.cs index d8223962c..f8103e89d 100644 --- a/src/Chorus/UI/Review/ChangedReport/ChangeReportView.Designer.cs +++ b/src/Chorus/UI/Review/ChangedReport/ChangeReportView.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Review.ChangedReport +namespace Chorus.UI.Review.ChangedReport { partial class ChangeReportView { @@ -41,7 +41,7 @@ private void InitializeComponent() this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPageRaw = new System.Windows.Forms.TabPage(); this._rawChangeDescriptionRenderer = new SIL.Windows.Forms.HtmlBrowser.XWebBrowser(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPageRaw.SuspendLayout(); @@ -145,7 +145,7 @@ private void InitializeComponent() private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPageRaw; private SIL.Windows.Forms.HtmlBrowser.XWebBrowser _rawChangeDescriptionRenderer; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } diff --git a/src/Chorus/UI/Review/ChangesInRevision/ChangesInRevisionView.Designer.cs b/src/Chorus/UI/Review/ChangesInRevision/ChangesInRevisionView.Designer.cs index 5c66061f6..327d140bb 100644 --- a/src/Chorus/UI/Review/ChangesInRevision/ChangesInRevisionView.Designer.cs +++ b/src/Chorus/UI/Review/ChangesInRevision/ChangesInRevisionView.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Review.ChangesInRevision +namespace Chorus.UI.Review.ChangesInRevision { partial class ChangesInRevisionView { @@ -35,7 +35,7 @@ private void InitializeComponent() this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.imageList1 = new System.Windows.Forms.ImageList(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -124,7 +124,7 @@ private void InitializeComponent() private System.Windows.Forms.ColumnHeader columnHeader2; private System.Windows.Forms.ColumnHeader columnHeader3; private System.Windows.Forms.ImageList imageList1; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Review/RevisionsInRepository/RevisionsInRepositoryView.Designer.cs b/src/Chorus/UI/Review/RevisionsInRepository/RevisionsInRepositoryView.Designer.cs index bd4a8408a..c1f357251 100644 --- a/src/Chorus/UI/Review/RevisionsInRepository/RevisionsInRepositoryView.Designer.cs +++ b/src/Chorus/UI/Review/RevisionsInRepository/RevisionsInRepositoryView.Designer.cs @@ -1,4 +1,4 @@ -namespace Chorus.UI.Review.RevisionsInRepository +namespace Chorus.UI.Review.RevisionsInRepository { partial class RevisionsInRepositoryView { @@ -43,7 +43,7 @@ private void InitializeComponent() this.ColumnAction = new System.Windows.Forms.DataGridViewTextBoxColumn(); this._rowAddingTimer = new System.Windows.Forms.Timer(this.components); this._showAdvanced = new System.Windows.Forms.CheckBox(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this._historyGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); @@ -214,7 +214,7 @@ private void InitializeComponent() private System.Windows.Forms.DataGridViewTextBoxColumn ColumnAction; private System.Windows.Forms.Timer _rowAddingTimer; private System.Windows.Forms.CheckBox _showAdvanced; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Settings/SendReceiveSettings.Designer.cs b/src/Chorus/UI/Settings/SendReceiveSettings.Designer.cs index f3e678fec..4e2f5e227 100644 --- a/src/Chorus/UI/Settings/SendReceiveSettings.Designer.cs +++ b/src/Chorus/UI/Settings/SendReceiveSettings.Designer.cs @@ -51,7 +51,7 @@ private void InitializeComponent() this.settingsProtectionButton = new SIL.Windows.Forms.SettingProtection.SettingsProtectionLauncherButton(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this.settingsTabs.SuspendLayout(); this.internetTab.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -370,6 +370,6 @@ private void InitializeComponent() private SIL.Windows.Forms.HtmlBrowser.XWebBrowser chorusHubSetup; private System.Windows.Forms.PictureBox pictureBox4; private System.Windows.Forms.CheckBox _showChorusHubInSendReceive; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Sync/SyncControl.Designer.cs b/src/Chorus/UI/Sync/SyncControl.Designer.cs index cc2e3ad42..f62111fe8 100644 --- a/src/Chorus/UI/Sync/SyncControl.Designer.cs +++ b/src/Chorus/UI/Sync/SyncControl.Designer.cs @@ -1,4 +1,4 @@ -using SIL.Progress; +using SIL.Progress; using SIL.Windows.Forms.Progress; namespace Chorus.UI.Sync @@ -58,7 +58,7 @@ private void InitializeComponent() this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this._tabControl.SuspendLayout(); this._chooseTargetsTab.SuspendLayout(); this.tableLayoutPanel5.SuspendLayout(); @@ -479,6 +479,6 @@ private void InitializeComponent() private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Sync/SyncDialog.Designer.cs b/src/Chorus/UI/Sync/SyncDialog.Designer.cs index a3c5a6f5d..e2d84bf32 100644 --- a/src/Chorus/UI/Sync/SyncDialog.Designer.cs +++ b/src/Chorus/UI/Sync/SyncDialog.Designer.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace Chorus.UI.Sync { @@ -36,7 +36,7 @@ private void InitializeComponent() this._syncStartControl = new Chorus.UI.Sync.SyncStartControl(); this._syncControl = new Chorus.UI.Sync.SyncControl(); this._helpProvider = new Vulcan.Uczniowie.HelpProvider.HelpComponent(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this.SuspendLayout(); // // l10NSharpExtender1 @@ -101,7 +101,7 @@ private void InitializeComponent() #endregion - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; private SyncControl _syncControl; private System.Windows.Forms.Timer _closeWhenDoneTimer; private SyncStartControl _syncStartControl; diff --git a/src/Chorus/UI/Sync/SyncPanel.Designer.cs b/src/Chorus/UI/Sync/SyncPanel.Designer.cs index f77817ac3..350097a66 100644 --- a/src/Chorus/UI/Sync/SyncPanel.Designer.cs +++ b/src/Chorus/UI/Sync/SyncPanel.Designer.cs @@ -31,7 +31,7 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); this.label3 = new System.Windows.Forms.Label(); this.timer1 = new System.Windows.Forms.Timer(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this.l10NSharpExtender1)).BeginInit(); this.SuspendLayout(); // @@ -82,6 +82,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label3; private System.Windows.Forms.Timer timer1; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } \ No newline at end of file diff --git a/src/Chorus/UI/Sync/SyncStartControl.Designer.cs b/src/Chorus/UI/Sync/SyncStartControl.Designer.cs index 987288576..aecb5e438 100644 --- a/src/Chorus/UI/Sync/SyncStartControl.Designer.cs +++ b/src/Chorus/UI/Sync/SyncStartControl.Designer.cs @@ -1,4 +1,4 @@ -using System.Threading; +using System.Threading; using SIL.Windows.Forms.SettingProtection; namespace Chorus.UI.Sync @@ -48,7 +48,7 @@ private void InitializeComponent() this._sharedNetworkDiagnosticsLink = new System.Windows.Forms.LinkLabel(); this._settingsButton = new SIL.Windows.Forms.SettingProtection.SettingsLauncherButton(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); this.commitMessageLabel = new Chorus.UI.BetterLabel(); this._usbStatusLabel = new Chorus.UI.BetterLabel(); this.usbDriveLocator = new Chorus.UI.UsbDriveLocator(this.components); @@ -334,6 +334,6 @@ private void InitializeComponent() private System.Windows.Forms.LinkLabel _sharedNetworkDiagnosticsLink; private System.Windows.Forms.LinkLabel _internetDiagnosticsLink; private SettingsLauncherButton _settingsButton; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } } diff --git a/src/ChorusHubApp/ChorusHubApp.csproj b/src/ChorusHubApp/ChorusHubApp.csproj index 4b36fba56..1ab918bea 100644 --- a/src/ChorusHubApp/ChorusHubApp.csproj +++ b/src/ChorusHubApp/ChorusHubApp.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj b/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj index 6fcfc68c2..6c29b2039 100644 --- a/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj +++ b/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj @@ -13,10 +13,10 @@ - + - + diff --git a/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj b/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj index a74d65687..2ac376ffd 100644 --- a/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj +++ b/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj @@ -10,9 +10,9 @@ - + - + diff --git a/src/LibChorus/LibChorus.csproj b/src/LibChorus/LibChorus.csproj index b93c90a44..f885c416b 100644 --- a/src/LibChorus/LibChorus.csproj +++ b/src/LibChorus/LibChorus.csproj @@ -12,14 +12,15 @@ - + - + + - - + + diff --git a/src/LibChorusTests/LibChorus.Tests.csproj b/src/LibChorusTests/LibChorus.Tests.csproj index daac3380b..a1e61ca1e 100644 --- a/src/LibChorusTests/LibChorus.Tests.csproj +++ b/src/LibChorusTests/LibChorus.Tests.csproj @@ -13,13 +13,13 @@ - + - - - + + +