Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -r46a0af591207211cdc9949098422b9ce9e87c0ac -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03) @@ -179,12 +179,12 @@ } /// - /// Looks up a localized string similar to {0} - {1} van {2}. + /// Looks up a localized string similar to Stap {0} van {1} | {2}. /// - internal static string FileImportActivity_ImportFromFile_ProgressText_0_CurrentProgress_1_of_TotalProgress_2 { + internal static string FileImportActivity_ImportFromFile_Step_CurrentProgress_0_of_TotalProgress_1_____ProgressText_2 { get { - return ResourceManager.GetString("FileImportActivity_ImportFromFile_ProgressText_0_CurrentProgress_1_of_TotalProgre" + - "ss_2", resourceCulture); + return ResourceManager.GetString("FileImportActivity_ImportFromFile_Step_CurrentProgress_0_of_TotalProgress_1__|__P" + + "rogressText_2", resourceCulture); } } Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -r46a0af591207211cdc9949098422b9ce9e87c0ac -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03) @@ -153,8 +153,8 @@ Opschonen van {0} is mislukt. - - {0} - {1} van {2} + + Stap {0} van {1} | {2} Uitvoeren activiteit {0}. Index: Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs =================================================================== diff -u -r46a0af591207211cdc9949098422b9ce9e87c0ac -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 --- Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac) +++ Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03) @@ -103,7 +103,7 @@ importer.ProgressChanged = (currentStepName, currentStep, totalSteps) => { - SetProgressText(string.Format(Resources.FileImportActivity_ImportFromFile_ProgressText_0_CurrentProgress_1_of_TotalProgress_2, currentStepName, currentStep, totalSteps)); + SetProgressText(string.Format(Resources.FileImportActivity_ImportFromFile_Step_CurrentProgress_0_of_TotalProgress_1_____ProgressText_2, currentStep, totalSteps, currentStepName)); }; var item = importer.ImportItem(fileName, target); Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.Designer.cs =================================================================== diff -u -rda4d097a3f50554dda0bb688e187c2be8003de9f -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.Designer.cs (.../ActivityProgressDialog.Designer.cs) (revision da4d097a3f50554dda0bb688e187c2be8003de9f) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.Designer.cs (.../ActivityProgressDialog.Designer.cs) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03) @@ -71,9 +71,9 @@ this.labelActivityDescription.AutoSize = true; this.labelActivityDescription.Location = new System.Drawing.Point(36, 20); this.labelActivityDescription.Name = "labelActivityDescription"; - this.labelActivityDescription.Size = new System.Drawing.Size(87, 13); + this.labelActivityDescription.Size = new System.Drawing.Size(77, 13); this.labelActivityDescription.TabIndex = 3; - this.labelActivityDescription.Text = "Uitvoeren \"taak\""; + this.labelActivityDescription.Text = "Uitvoeren taak"; // // pictureBoxActivityDescription // @@ -98,9 +98,9 @@ this.labelActivityProgressText.AutoSize = true; this.labelActivityProgressText.Location = new System.Drawing.Point(61, 40); this.labelActivityProgressText.Name = "labelActivityProgressText"; - this.labelActivityProgressText.Size = new System.Drawing.Size(74, 13); + this.labelActivityProgressText.Size = new System.Drawing.Size(128, 13); this.labelActivityProgressText.TabIndex = 6; - this.labelActivityProgressText.Text = "Stap 1 van 10"; + this.labelActivityProgressText.Text = "Stap 1 van 10 | Subtaak"; // // ActivityProgressDialog // Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -r46a0af591207211cdc9949098422b9ce9e87c0ac -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03) @@ -131,7 +131,11 @@ labelActivityProgressText.Visible = !progressTextNullOrEmpty; // Update the activity progress text label - labelActivityProgressText.Text = progressTextNullOrEmpty ? "" : activity.ProgressText; + labelActivityProgressText.Text = !progressTextNullOrEmpty + ? activity.ProgressText.Length <= 75 + ? activity.ProgressText + : activity.ProgressText.Take(75) + "..." + : ""; }); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r495647ee1c652fecc15eea7fefeab29ae01347fe -rb7997551e4a2a68b9d3a91876dc21ae23d594e03 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 495647ee1c652fecc15eea7fefeab29ae01347fe) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b7997551e4a2a68b9d3a91876dc21ae23d594e03) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.18063 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated.